From 9c6cb6e1f0c0bec0d52e8aeb8c2d618fb98e7439 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 7 Apr 2021 00:37:41 +0200 Subject: [PATCH] Update to U-Boot 2021.04 (#1300) * Re-add patches missed with U-Boot 2021.04-rc4 upgrade Also add patches for Raspberry Pi again. * Regenerate patches for U-Boot 2021.04 * Update to U-Boot 2021.04 --- ...01-SPL-modify-load-address-of-U-Boot.patch | 6 +- ...mic-enable-LDO2-vcc33_mipi-at-bootup.patch | 10 +- ...001-HACK-mmc-meson-gx-limit-to-24MHz.patch | 6 +- ...01-CMD-read-string-from-fileinto-env.patch | 96 +++++++++++++++++++ ...FIG_OF_BOARD-instead-of-CONFIG_EMBED.patch | 85 ++++++++++++++++ ...i-Disable-simple-framebuffer-support.patch | 65 +++++++++++++ .../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 +- 18 files changed, 269 insertions(+), 23 deletions(-) create mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch create mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch create mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch 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 49b13e0ab..22e8b88dc 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 2f197db1961f09dd264770ef081280a44a1a4809 Mon Sep 17 00:00:00 2001 -Message-Id: <2f197db1961f09dd264770ef081280a44a1a4809.1615892095.git.stefan@agner.ch> +From 983121a741192153492a61befc0e0fc61b9f8b14 Mon Sep 17 00:00:00 2001 +Message-Id: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch> From: Pascal Vizeli Date: Fri, 24 Apr 2020 12:41:50 +0000 Subject: [PATCH 1/2] SPL: modify load address of U-Boot @@ -33,5 +33,5 @@ index 22714833cc..f5dd23577c 100644 CONFIG_ERRNO_STR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000 -- -2.30.2 +2.31.1 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 a275f68ec..eed276890 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 68014c109ce917c2d3f6e204dd160dfc350ae7e7 Mon Sep 17 00:00:00 2001 -Message-Id: <68014c109ce917c2d3f6e204dd160dfc350ae7e7.1615892095.git.stefan@agner.ch> -In-Reply-To: <2f197db1961f09dd264770ef081280a44a1a4809.1615892095.git.stefan@agner.ch> -References: <2f197db1961f09dd264770ef081280a44a1a4809.1615892095.git.stefan@agner.ch> +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: 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.30.2 +2.31.1 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 45100e950..3f94359b1 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 1e68d462712e0d534059b09d41090c69d20807e0 Mon Sep 17 00:00:00 2001 -Message-Id: <1e68d462712e0d534059b09d41090c69d20807e0.1615894477.git.stefan@agner.ch> +From 8511fa06c13a9761e53ed72fe7111f5c3e3514a0 Mon Sep 17 00:00:00 2001 +Message-Id: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617731946.git.stefan@agner.ch> 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.30.2 +2.31.1 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch b/buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch new file mode 100644 index 000000000..b9bcd7324 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch @@ -0,0 +1,96 @@ +From 340ac75139cb193e7510ca997b2ebe4ebf9b7591 Mon Sep 17 00:00:00 2001 +Message-Id: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +From: Pascal Vizeli +Date: Sun, 5 Aug 2018 20:43:03 +0000 +Subject: [PATCH 1/3] CMD: read string from fileinto env + +Signed-off-by: Pascal Vizeli +--- + cmd/Kconfig | 5 +++++ + cmd/Makefile | 1 + + cmd/fileenv.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 51 insertions(+) + create mode 100644 cmd/fileenv.c + +diff --git a/cmd/Kconfig b/cmd/Kconfig +index 863b7f9fda..5c67b6d719 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. + ++config CMD_FILEENV ++ bool "fileenv" ++ help ++ Read a file into memory and store it to env. ++ + endmenu + + menu "Android support commands" +diff --git a/cmd/Makefile b/cmd/Makefile +index 567e2b79d2..8804b70ca8 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 + obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o + obj-$(CONFIG_CMD_SETEXPR) += setexpr.o ++obj-$(CONFIG_CMD_FILEENV) += fileenv.o + obj-$(CONFIG_CMD_SPI) += spi.o + obj-$(CONFIG_CMD_STRINGS) += strings.o + obj-$(CONFIG_CMD_SMC) += smccc.o +diff --git a/cmd/fileenv.c b/cmd/fileenv.c +new file mode 100644 +index 0000000000..af24d22d0e +--- /dev/null ++++ b/cmd/fileenv.c +@@ -0,0 +1,45 @@ ++#include ++#include ++#include ++#include ++ ++static char *fs_argv[5]; ++ ++int do_fileenv(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) ++{ ++ if (argc < 6) ++ return CMD_RET_USAGE; ++ ++ fs_argv[0] = "fatload"; ++ fs_argv[1] = argv[1]; ++ fs_argv[2] = argv[2]; ++ fs_argv[3] = argv[3]; ++ fs_argv[4] = argv[4]; ++ ++ if (do_fat_fsload(cmdtp, 0, 5, fs_argv) != 0) ++ return 1; ++ ++ char *addr = (char *)simple_strtoul(argv[3], NULL, 16); ++ size_t size = env_get_hex("filesize", 0); ++ ++ // Prepare string ++ addr[size] = 0x00; ++ char *s = addr; ++ while(*s != 0x00) { ++ if (isprint(*s)) { ++ s++; ++ } ++ else { ++ *s = 0x00; ++ } ++ } ++ ++ return env_set(argv[5], addr); ++} ++ ++U_BOOT_CMD( ++ fileenv, 6, 0, do_fileenv, ++ "Read file and store it into env.", ++ " \n" ++ " - Read file from fat32 and store it as env." ++); +-- +2.31.1 + diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch b/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch new file mode 100644 index 000000000..5d6f9a13e --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch @@ -0,0 +1,85 @@ +From 9cb97076d98f7f68534abb3d1f596644ae730841 Mon Sep 17 00:00:00 2001 +Message-Id: <9cb97076d98f7f68534abb3d1f596644ae730841.1617731519.git.stefan@agner.ch> +In-Reply-To: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +References: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +From: Pascal Vizeli +Date: Tue, 10 Dec 2019 09:48:46 +0000 +Subject: [PATCH 2/3] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED + +Signed-off-by: Pascal Vizeli +--- + configs/rpi_0_w_defconfig | 2 +- + configs/rpi_2_defconfig | 2 +- + configs/rpi_3_32b_defconfig | 2 +- + configs/rpi_3_defconfig | 2 +- + configs/rpi_defconfig | 2 +- + 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 +--- a/configs/rpi_0_w_defconfig ++++ b/configs/rpi_0_w_defconfig +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + 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 +--- a/configs/rpi_2_defconfig ++++ b/configs/rpi_2_defconfig +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + 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 +--- a/configs/rpi_3_32b_defconfig ++++ b/configs/rpi_3_32b_defconfig +@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + 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 +--- a/configs/rpi_3_defconfig ++++ b/configs/rpi_3_defconfig +@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + 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 +--- a/configs/rpi_defconfig ++++ b/configs/rpi_defconfig +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +-- +2.31.1 + diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch b/buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch new file mode 100644 index 000000000..c2d2aea12 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch @@ -0,0 +1,65 @@ +From 69ac2930e69ca876f8da95d80f4a1cb8cc23bb6a Mon Sep 17 00:00:00 2001 +Message-Id: <69ac2930e69ca876f8da95d80f4a1cb8cc23bb6a.1617731519.git.stefan@agner.ch> +In-Reply-To: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +References: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +From: Florin Sarbu +Date: Thu, 12 Sep 2019 12:31:31 +0200 +Subject: [PATCH 3/3] 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.31.1 + diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index d808a6d39..d118a1597 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -88,7 +88,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 123b35bd6..988601d25 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -88,7 +88,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 2d34def64..ad80589f0 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -88,7 +88,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 33c13f6f1..6222902e0 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -89,7 +89,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 615a041f5..94f1e99f8 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -87,7 +87,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 791c6571f..72e1f699b 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -89,7 +89,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 5d7f8b080..27715eb52 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -87,7 +87,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 0d931f3f5..09cf16f1c 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -87,7 +87,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 228f4f119..ce55236e9 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -90,7 +90,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 3e867ebd7..1b4d3a789 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -88,7 +88,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 9389f67d7..af4016063 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -89,7 +89,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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 0029e710b..9fa04b2d0 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -87,7 +87,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-rc4" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" 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