explicitly disable the bcm283x serial driver support in the rpi versions

of u-boot so that they won't interfere with our rpi-rf-mode dtbo. This should allow to remove the stdout-path workaround to prevent u-boot from crashing in case the rpi-rf-mod.dtbo is enabled in config.txt. (cf. home-assistant/operating-system#2919)
jens-maus · Nov 17, 2023 · 1e8c11a · 1e8c11a
1 parent e62eaed
commit 1e8c11a
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 32 deletions.
diff --git a/buildroot-external/board/rpi0/uboot.config b/buildroot-external/board/rpi0/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c

diff --git a/buildroot-external/board/rpi2/uboot.config b/buildroot-external/board/rpi2/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c

diff --git a/buildroot-external/board/rpi3/uboot.config b/buildroot-external/board/rpi3/uboot.config
@@ -1,5 +1,9 @@
 CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
 
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c

diff --git a/buildroot-external/board/rpi4/uboot.config b/buildroot-external/board/rpi4/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_CMD_NVME=y
 
 CONFIG_USB_STORAGE=y

diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config
@@ -27,8 +27,8 @@ CONFIG_SPL_SILENT_CONSOLE=y
 CONFIG_TPL_SILENT_CONSOLE=y
 CONFIG_SILENT_U_BOOT_ONLY=y
 CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_NULLDEV_SERIAL=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+# CONFIG_SERIAL_PRESENT is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y

diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts
@@ -65,14 +65,4 @@
             pivccu,rtc = <&rpi_rf_mod_rtc>;  // RPI-RF-MOD
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@4 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts
@@ -46,14 +46,4 @@
             pivccu,reset-gpios = <&gpio 18 0>; // HM-MOD-RPI-PCB
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@3 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts
@@ -84,14 +84,4 @@
             pivccu,rtc = <&rpi_rf_mod_rtc>;       // RPI-RF-MOD
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@4 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
@@ -11,7 +11,7 @@
 #
 ################################################################################
 
-RPI_RF_MOD_VERSION = 1.13.1
+RPI_RF_MOD_VERSION = 1.13.2
 RPI_RF_MOD_SITE = $(BR2_EXTERNAL_EQ3_PATH)/package/rpi-rf-mod
 RPI_RF_MOD_SITE_METHOD = local
 RPI_RF_MOD_LICENSE = Apache-2.0