From 008fb3fb7460c1f485b0f28080b1b356949bc9ac Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 28 Sep 2021 10:02:52 +0200 Subject: [PATCH] Bump to U-Boot 2021.10-rc5 (#1556) The bump to U-Boot 2021.10-rc5 also makes quite some patches obsolete since they are already part of U-Boot. This also removes a patch which disables framebuffer support on Raspberry Pi: Framebuffer support seems to work fine in todays U-Boot/Linux combination. It can help debug boot problems on Raspberry Pi devices. Without the patch framebuffer support will be enabled by default. --- ...01-SPL-modify-load-address-of-U-Boot.patch | 10 +-- ...mic-enable-LDO2-vcc33_mipi-at-bootup.patch | 10 +-- ...001-HACK-mmc-meson-gx-limit-to-24MHz.patch | 6 +- ...-odroidc2-readd-PHY-reset-properties.patch | 38 ----------- ...FIG_OF_BOARD-instead-of-CONFIG_EMBED.patch | 16 ++--- ...i-Disable-simple-framebuffer-support.patch | 65 ------------------- ...sb-xhci-reset-endpoint-on-USB-stall.patch} | 14 ++-- ...ge-the-virtual-address-of-the-XHCI-P.patch | 49 -------------- ...fer-overflow-in-iomux_replace_device.patch | 44 ------------- .../configs/khadas_vim3_defconfig | 2 +- .../configs/odroid_c2_defconfig | 2 +- .../configs/odroid_c4_defconfig | 2 +- .../configs/odroid_n2_defconfig | 2 +- .../configs/odroid_xu4_defconfig | 2 +- buildroot-external/configs/rpi0_w_defconfig | 2 +- buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi4_64_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/configs/rpi_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 2 +- ...1-CMD-read-string-from-fileinto-env.patch} | 23 ++++--- 23 files changed, 52 insertions(+), 249 deletions(-) delete mode 100644 buildroot-external/board/hardkernel/patches/uboot/0002-arm64-dts-meson-odroidc2-readd-PHY-reset-properties.patch delete mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch rename buildroot-external/board/raspberrypi/patches/uboot/{0005-usb-xhci-reset-endpoint-on-USB-stall.patch => 0002-usb-xhci-reset-endpoint-on-USB-stall.patch} (86%) delete mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0003-ARM-bcm283x-change-the-virtual-address-of-the-XHCI-P.patch delete mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0004-IOMUX-Fix-buffer-overflow-in-iomux_replace_device.patch rename buildroot-external/patches/uboot/{2021.04/0001-cmd-read-string-from-file-into-env.patch => 2021.10-rc5/0001-CMD-read-string-from-fileinto-env.patch} (77%) diff --git a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch index 22e8b88dc..51e6de45f 100644 --- a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch +++ b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch @@ -1,5 +1,5 @@ -From 983121a741192153492a61befc0e0fc61b9f8b14 Mon Sep 17 00:00:00 2001 -Message-Id: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch> +From e18419a214ba872d14462354886148f976312e3c Mon Sep 17 00:00:00 2001 +Message-Id: From: Pascal Vizeli Date: Fri, 24 Apr 2020 12:41:50 +0000 Subject: [PATCH 1/2] SPL: modify load address of U-Boot @@ -15,7 +15,7 @@ Signed-off-by: Stefan Agner 2 files changed, 2 insertions(+) diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig -index 8686a66d13..c3363821dd 100644 +index 3ac314ab89..67ca98c383 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -88,3 +88,4 @@ CONFIG_VIDEO_ROCKCHIP=y @@ -24,7 +24,7 @@ index 8686a66d13..c3363821dd 100644 CONFIG_ERRNO_STR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000 diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig -index 22714833cc..f5dd23577c 100644 +index 35e84b7088..93cfe4f094 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -90,3 +90,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y @@ -33,5 +33,5 @@ index 22714833cc..f5dd23577c 100644 CONFIG_ERRNO_STR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000 -- -2.31.1 +2.33.0 diff --git a/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch index eed276890..eaf270df0 100644 --- a/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch +++ b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch @@ -1,7 +1,7 @@ -From f9195bc5cb18f71117f6efc1c352209e62c53706 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch> -References: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch> +From 4c09e7741c219ef28be912e97a986b6402290c9b Mon Sep 17 00:00:00 2001 +Message-Id: <4c09e7741c219ef28be912e97a986b6402290c9b.1632758899.git.stefan@agner.ch> +In-Reply-To: +References: From: Pascal Vizeli Date: Fri, 24 Apr 2020 11:37:55 +0000 Subject: [PATCH 2/2] pmic: enable LDO2 vcc33_mipi at bootup @@ -64,5 +64,5 @@ index f85209c649..6fa1bb0c66 100644 +} +#endif -- -2.31.1 +2.33.0 diff --git a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch index 3f94359b1..a0bdf25a1 100644 --- a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch +++ b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -1,5 +1,5 @@ -From 8511fa06c13a9761e53ed72fe7111f5c3e3514a0 Mon Sep 17 00:00:00 2001 -Message-Id: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617731946.git.stefan@agner.ch> +From ff82d04354784cd982ab1a912c08d3eb22f82d13 Mon Sep 17 00:00:00 2001 +Message-Id: From: Neil Armstrong Date: Mon, 2 Sep 2019 15:42:04 +0200 Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz @@ -23,5 +23,5 @@ index fcf4f03d1e..6ded4b619b 100644 cfg->name = dev->name; -- -2.31.1 +2.33.0 diff --git a/buildroot-external/board/hardkernel/patches/uboot/0002-arm64-dts-meson-odroidc2-readd-PHY-reset-properties.patch b/buildroot-external/board/hardkernel/patches/uboot/0002-arm64-dts-meson-odroidc2-readd-PHY-reset-properties.patch deleted file mode 100644 index 4be7ff6d6..000000000 --- a/buildroot-external/board/hardkernel/patches/uboot/0002-arm64-dts-meson-odroidc2-readd-PHY-reset-properties.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e194459c7459a1c6f9d1183e05186d164f0c6715 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617807077.git.stefan@agner.ch> -References: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617807077.git.stefan@agner.ch> -From: Stefan Agner -Date: Thu, 1 Apr 2021 14:33:57 +0200 -Subject: [PATCH 2/2] arm64: dts: meson: odroidc2: readd PHY reset properties - -The sync of the device tree and dt-bindings from Linux v5.6-rc2 -11a48a5a18c6 ("Linux 5.6-rc2") causes Ethernet to break on some -ODROID-C2. The PHY seems to need proper reset timing to be functional -in U-Boot and Linux afterwards. Readd the old PHY reset bindings for -dwmac until we support the new bindings in the PHY node. - -Fixes: dd5f2351e99a ("arm64: dts: meson: sync dt and bindings from v5.6-rc2") -Signed-off-by: Stefan Agner ---- - arch/arm/dts/meson-gxbb-odroidc2.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/dts/meson-gxbb-odroidc2.dts b/arch/arm/dts/meson-gxbb-odroidc2.dts -index 70fcfb7b06..8b80bbc90b 100644 ---- a/arch/arm/dts/meson-gxbb-odroidc2.dts -+++ b/arch/arm/dts/meson-gxbb-odroidc2.dts -@@ -188,6 +188,10 @@ - phy-handle = <ð_phy0>; - phy-mode = "rgmii"; - -+ snps,reset-gpio = <&gpio GPIOZ_14 0>; -+ snps,reset-delays-us = <0 10000 1000000>; -+ snps,reset-active-low; -+ - amlogic,tx-delay-ns = <2>; - - mdio { --- -2.31.1 - diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch index ed79e31b7..11193d704 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch @@ -1,8 +1,8 @@ -From 9cb97076d98f7f68534abb3d1f596644ae730841 Mon Sep 17 00:00:00 2001 -Message-Id: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> +From fe8e09815b4ae3ef12937f81cfb08e50f972f7b0 Mon Sep 17 00:00:00 2001 +Message-Id: From: Pascal Vizeli Date: Tue, 10 Dec 2019 09:48:46 +0000 -Subject: [PATCH 1/5] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED +Subject: [PATCH 1/2] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED Signed-off-by: Pascal Vizeli --- @@ -14,7 +14,7 @@ Signed-off-by: Pascal Vizeli 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index 01565991f5..c0a9b6c788 100644 +index d17e102052..e5cd7d4913 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -27,7 +27,7 @@ index 01565991f5..c0a9b6c788 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 1ad0626782..33e0ef6989 100644 +index 8b8affb777..8bda6e6aa9 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -40,7 +40,7 @@ index 1ad0626782..33e0ef6989 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index a14d7eefbc..15c62adc69 100644 +index b867b7fa7b..370495c9e4 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y @@ -53,7 +53,7 @@ index a14d7eefbc..15c62adc69 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index 4aedfb17cd..daeb6d1b64 100644 +index 3cebd657da..bb0a7ebcd5 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y @@ -66,7 +66,7 @@ index 4aedfb17cd..daeb6d1b64 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index 78638105f7..06b390d907 100644 +index af2189b8fe..f6517eb52a 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch b/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch deleted file mode 100644 index 2067765e3..000000000 --- a/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 69ac2930e69ca876f8da95d80f4a1cb8cc23bb6a Mon Sep 17 00:00:00 2001 -Message-Id: <69ac2930e69ca876f8da95d80f4a1cb8cc23bb6a.1632740631.git.stefan@agner.ch> -In-Reply-To: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -References: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -From: Florin Sarbu -Date: Thu, 12 Sep 2019 12:31:31 +0200 -Subject: [PATCH 2/5] raspberrypi: Disable simple framebuffer support - -On 4.19 kernels this u-boot driver clashes with bcm2708_fb. -So let's disable it from here so that we have bcm2708_fb -enabled in the kernel, just as Raspbian users might expect. -See https://github.com/raspberrypi/linux/issues/3139 - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Florin Sarbu ---- - board/raspberrypi/rpi/rpi.c | 2 +- - common/Makefile | 2 +- - include/configs/rpi.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index df52a4689f..bda53d8b25 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -502,7 +502,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) - * should be more intelligent, and e.g. only do this if no enabled DT - * node exists for the "real" graphics driver. - */ -- lcd_dt_simplefb_add_node(blob); -+ //lcd_dt_simplefb_add_node(blob); - - #ifdef CONFIG_EFI_LOADER - /* Reserve the spin table */ -diff --git a/common/Makefile b/common/Makefile -index daeea67cf2..09ddab0b4e 100644 ---- a/common/Makefile -+++ b/common/Makefile -@@ -50,7 +50,7 @@ ifndef CONFIG_DM_VIDEO - obj-$(CONFIG_LCD) += lcd.o lcd_console.o - endif - obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o --obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o -+//obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o - obj-$(CONFIG_LYNXKDI) += lynxkdi.o - obj-$(CONFIG_MENU) += menu.o - obj-$(CONFIG_UPDATE_COMMON) += update.o -diff --git a/include/configs/rpi.h b/include/configs/rpi.h -index 834f1cd236..19a0d611c4 100644 ---- a/include/configs/rpi.h -+++ b/include/configs/rpi.h -@@ -65,8 +65,8 @@ - /* GPIO */ - #define CONFIG_BCM2835_GPIO - /* LCD */ --#define CONFIG_LCD_DT_SIMPLEFB --#define CONFIG_VIDEO_BCM2835 -+//#define CONFIG_LCD_DT_SIMPLEFB -+//#define CONFIG_VIDEO_BCM2835 - - #ifdef CONFIG_CMD_USB - #define CONFIG_TFTP_TSIZE --- -2.33.0 - diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-reset-endpoint-on-USB-stall.patch b/buildroot-external/board/raspberrypi/patches/uboot/0002-usb-xhci-reset-endpoint-on-USB-stall.patch similarity index 86% rename from buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-reset-endpoint-on-USB-stall.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0002-usb-xhci-reset-endpoint-on-USB-stall.patch index 7387f624a..009950843 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-reset-endpoint-on-USB-stall.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0002-usb-xhci-reset-endpoint-on-USB-stall.patch @@ -1,10 +1,10 @@ -From 194a2cb0e38c8684e9c98aa66ba3d3a838fce9d6 Mon Sep 17 00:00:00 2001 -Message-Id: <194a2cb0e38c8684e9c98aa66ba3d3a838fce9d6.1632740631.git.stefan@agner.ch> -In-Reply-To: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -References: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> +From b9f62d571a79e9ea7be3c8327733bc5964336bae Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Stefan Agner Date: Mon, 27 Sep 2021 12:28:04 +0200 -Subject: [PATCH 5/5] usb: xhci: reset endpoint on USB stall +Subject: [PATCH 2/2] usb: xhci: reset endpoint on USB stall There are devices which cause a USB stall when trying to read strings. Specifically Arduino Mega R3 stalls when trying to read the product @@ -34,7 +34,7 @@ Signed-off-by: Stefan Agner 1 file changed, 31 insertions(+) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index 46c137f857..667e9fbf5e 100644 +index 35bd5cd29e..430823cb9d 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -481,6 +481,33 @@ union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected) @@ -71,7 +71,7 @@ index 46c137f857..667e9fbf5e 100644 /* * Stops transfer processing for an endpoint and throws away all unprocessed * TRBs by setting the xHC's dequeue pointer to our enqueue pointer. The next -@@ -931,6 +958,10 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, +@@ -928,6 +955,10 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, record_transfer_result(udev, event, length); xhci_acknowledge_event(ctrl); diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0003-ARM-bcm283x-change-the-virtual-address-of-the-XHCI-P.patch b/buildroot-external/board/raspberrypi/patches/uboot/0003-ARM-bcm283x-change-the-virtual-address-of-the-XHCI-P.patch deleted file mode 100644 index 8ba1434fa..000000000 --- a/buildroot-external/board/raspberrypi/patches/uboot/0003-ARM-bcm283x-change-the-virtual-address-of-the-XHCI-P.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 72619dd5d0be59e702fd7b7090916ee688c34180 Mon Sep 17 00:00:00 2001 -Message-Id: <72619dd5d0be59e702fd7b7090916ee688c34180.1632740631.git.stefan@agner.ch> -In-Reply-To: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -References: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -From: Marek Szyprowski -Date: Thu, 17 Jun 2021 11:22:03 +0200 -Subject: [PATCH 3/5] ARM: bcm283x: change the virtual address of the XHCI PCI - device base - -Move the XHCI PCI device base up in the virtual address space. This fixes -initialization failure observed with newer Raspberry Pi firmware, later -than 63b1922311 ("firmware: arm_loader: Update armstubs with those from -PR 117). It looks that chosing 0xff800000 as the XHCI PCI device base -conflicts with the updated ARM/VideoCore firmware. - -This also requires to reduce the size of the mapped PCI device region -from 8MiB to 4MiB to fit into 32bit address space. This is still enough -for the XHCI PCI device. - -Signed-off-by: Marek Szyprowski ---- - arch/arm/mach-bcm283x/init.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c -index 49027ce0a2..9803499985 100644 ---- a/arch/arm/mach-bcm283x/init.c -+++ b/arch/arm/mach-bcm283x/init.c -@@ -14,7 +14,7 @@ - #include - - #define BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS 0x600000000UL --#define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE 0x800000UL -+#define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE 0x400000UL - - #ifdef CONFIG_ARM64 - #include -@@ -148,7 +148,7 @@ int mach_cpu_init(void) - - #ifdef CONFIG_ARMV7_LPAE - #ifdef CONFIG_TARGET_RPI_4_32B --#define BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT 0xff800000UL -+#define BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT 0xffc00000UL - #include - #include - --- -2.33.0 - diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0004-IOMUX-Fix-buffer-overflow-in-iomux_replace_device.patch b/buildroot-external/board/raspberrypi/patches/uboot/0004-IOMUX-Fix-buffer-overflow-in-iomux_replace_device.patch deleted file mode 100644 index 1f6ac17e5..000000000 --- a/buildroot-external/board/raspberrypi/patches/uboot/0004-IOMUX-Fix-buffer-overflow-in-iomux_replace_device.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0a33e4e03b9266818d6f0a6d566bf12be55c657c Mon Sep 17 00:00:00 2001 -Message-Id: <0a33e4e03b9266818d6f0a6d566bf12be55c657c.1632740631.git.stefan@agner.ch> -In-Reply-To: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -References: <9cb97076d98f7f68534abb3d1f596644ae730841.1632740631.git.stefan@agner.ch> -From: Yuichiro Goto -Date: Mon, 26 Apr 2021 08:08:03 +0900 -Subject: [PATCH 4/5] IOMUX: Fix buffer overflow in iomux_replace_device() - -Use of strcat() against an uninitialized buffer would lead -to buffer overflow. This patch fixes it. - -Fixes: 694cd5618c ("IOMUX: Introduce iomux_replace_device()") -Signed-off-by: Yuichiro Goto -Cc: Peter Robinson -Cc: Andy Shevchenko -Cc: Nicolas Saenz Julienne -Reviewed-by: Andy Shevchenko -Tested-by: Peter Robinson ---- - common/iomux.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/common/iomux.c b/common/iomux.c -index b9088aa3b5..c428f7110a 100644 ---- a/common/iomux.c -+++ b/common/iomux.c -@@ -158,8 +158,12 @@ int iomux_replace_device(const int console, const char *old, const char *new) - return -ENOMEM; - } - -- strcat(tmp, ","); -- strcat(tmp, name); -+ if (arg) { -+ strcat(tmp, ","); -+ strcat(tmp, name); -+ } -+ else -+ strcpy(tmp, name); - - arg = tmp; - size = strlen(tmp) + 1; --- -2.33.0 - diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig index 550f30390..8d091df6c 100644 --- a/buildroot-external/configs/khadas_vim3_defconfig +++ b/buildroot-external/configs/khadas_vim3_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="khadas-vim3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 22fac4c8a..8258b9289 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 1d9d78522..819c64b21 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index ecee84937..ec378cf43 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index be90b6373..83ea78dab 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu3" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index cdb956837..67ae71e13 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -92,7 +92,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 0be4fb53d..c19af2ec1 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 5edaf7f60..4e367c867 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -92,7 +92,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index e1e815e4b..b0017dba1 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -92,7 +92,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 2ef851109..1ba29b4f1 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -95,7 +95,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index 4b7b09a6e..f1d017817 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -93,7 +93,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 21f4e9619..7f0046254 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index ac7a003d5..91bf064dd 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -93,7 +93,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot.config" BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y diff --git a/buildroot-external/patches/uboot/2021.04/0001-cmd-read-string-from-file-into-env.patch b/buildroot-external/patches/uboot/2021.10-rc5/0001-CMD-read-string-from-fileinto-env.patch similarity index 77% rename from buildroot-external/patches/uboot/2021.04/0001-cmd-read-string-from-file-into-env.patch rename to buildroot-external/patches/uboot/2021.10-rc5/0001-CMD-read-string-from-fileinto-env.patch index b32170329..b3312e32b 100644 --- a/buildroot-external/patches/uboot/2021.04/0001-cmd-read-string-from-file-into-env.patch +++ b/buildroot-external/patches/uboot/2021.10-rc5/0001-CMD-read-string-from-fileinto-env.patch @@ -1,11 +1,10 @@ -From 41bc5702b6a856b6a135f705e747fae737277b20 Mon Sep 17 00:00:00 2001 -Message-Id: <41bc5702b6a856b6a135f705e747fae737277b20.1619639299.git.stefan@agner.ch> +From d87c6d3bb3de5f574d472dc5390f3f162db81823 Mon Sep 17 00:00:00 2001 +Message-Id: From: Pascal Vizeli Date: Sun, 5 Aug 2018 20:43:03 +0000 -Subject: [PATCH] cmd: read string from file into env +Subject: [PATCH] CMD: read string from fileinto env Signed-off-by: Pascal Vizeli -Signed-off-by: Stefan Agner --- cmd/Kconfig | 5 +++++ cmd/Makefile | 1 + @@ -14,12 +13,12 @@ Signed-off-by: Stefan Agner create mode 100644 cmd/fileenv.c diff --git a/cmd/Kconfig b/cmd/Kconfig -index 863b7f9fda..5c67b6d719 100644 +index 3a857b3f6e..9dc88988ac 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -1397,6 +1397,11 @@ config CMD_SETEXPR - Also supports loading the value at a memory location into a variable. - If CONFIG_REGEX is enabled, setexpr also supports a gsub function. +@@ -1422,6 +1422,11 @@ config CMD_SETEXPR_FMT + Evaluate format string expression and store result in an environment + variable. +config CMD_FILEENV + bool "fileenv" @@ -30,13 +29,13 @@ index 863b7f9fda..5c67b6d719 100644 menu "Android support commands" diff --git a/cmd/Makefile b/cmd/Makefile -index 567e2b79d2..8804b70ca8 100644 +index ed3669411e..a11b4b692e 100644 --- a/cmd/Makefile +++ b/cmd/Makefile -@@ -140,6 +140,7 @@ obj-$(CONFIG_CMD_SF) += sf.o - obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o +@@ -142,6 +142,7 @@ obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o + obj-$(CONFIG_CMD_SETEXPR_FMT) += printf.o +obj-$(CONFIG_CMD_FILEENV) += fileenv.o obj-$(CONFIG_CMD_SPI) += spi.o obj-$(CONFIG_CMD_STRINGS) += strings.o @@ -94,5 +93,5 @@ index 0000000000..9891cb05ab + " - Read file from fat32 and store it as env." +); -- -2.31.1 +2.33.0