March 2022 - U-Boot

[PATCH v3 0/2] usb: dwc3: Enable PHY support
by Michal Simek 25 Apr '22

25 Apr '22

Hi, I am sending two patches for adding PHY support for DWC3 driver. For getting this work one header patch is required to fix issue with am57xx_hs_evm_usb_defconfig which enabled CONFIG_PHY and DWC3 drivers for U-Boot proper but doesn't enable CONFIG_SPL_PHY support. That's why there is a need to use CONFIG_IS_ENABLED macro to also properly handle SPL builds. Marek: Please take both of these patches via your usb tree. Thanks, Michal Changes in v3: - Add cover letter Changes in v2: - based on bug reported by Marek https://lore.kernel.org/all/d7adc9a4-f505-eaab-8cd9-45f778bc3b4a@denx.de/ - Add missing header Michal Simek (2): generic-phy: s/CONFIG_PHY/CONFIG_IS_ENABLED(PHY)/ usb: dwc3: Add support for usb3-phy PHY configuration drivers/usb/dwc3/dwc3-generic.c | 18 ++++++++++++++++++ include/generic-phy.h | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) -- 2.35.1

3 10

[PATCH] arm: sunxi: dram: restore previous value in DRAM
by Andrei Lalaev 24 Apr '22

24 Apr '22

It's better to restore previous value at offset because otherwise the function can corrupt memory reserved by Linux (e.g. ramoops). Signed-off-by: Andrei Lalaev <andrei.lalaev(a)emlid.com> --- arch/arm/mach-sunxi/dram_helpers.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c index 2c873192e6..ed6db14f3c 100644 --- a/arch/arm/mach-sunxi/dram_helpers.c +++ b/arch/arm/mach-sunxi/dram_helpers.c @@ -32,12 +32,20 @@ void mctl_await_completion(u32 *reg, u32 mask, u32 val) #ifndef CONFIG_MACH_SUNIV bool mctl_mem_matches(u32 offset) { + ulong addr = CONFIG_SYS_SDRAM_BASE + offset; + u32 prev_val = readl(addr); + bool ret = false; + /* Try to write different values to RAM at two addresses */ writel(0, CONFIG_SYS_SDRAM_BASE); - writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset); + writel(0xaa55aa55, addr); dsb(); /* Check if the same value is actually observed when reading back */ - return readl(CONFIG_SYS_SDRAM_BASE) == - readl((ulong)CONFIG_SYS_SDRAM_BASE + offset); + ret = readl(CONFIG_SYS_SDRAM_BASE) == readl(addr); + + /* Restore previous value */ + writel(prev_val, addr); + + return ret; } #endif -- 2.25.1

2 1

[PATCH 0/7] binman: Fix replacing FIT subentries
by Alper Nebi Yasak 23 Apr '22

23 Apr '22

Converting the binman FIT entry type to a section ended up breaking the ability to replace these in images. The conversion to section partially enables extracting and replacing the subentries, but that also doesn't work as intended. This series gets binman to a point where it can extract FIT subentries and replace their non-section leaf entries correctly. Replacing sections of any kind doesn't really work right now, so the final patch disables that by raising an error. Initially, I had managed to replace sections by propagating changes in ProcessContentsUpdate() to the child entries, but writing arbitrary data into entries representing data in a certain format quickly gets into weird (maybe even undecidable?) edge cases. Just recently I had a better idea. Instead of writing incompatible data into a section, we can replace the section entry/node with for example a blob-ext entry/node for the input file. I've got this working as a proof of concept, but I need to experiment more to see what works best. Alper Nebi Yasak (7): binman: Fix unique names having '/.' for images read from files binman: Collect bintools for images when replacing entries binman: Don't reset offset/size if image doesn't allow repacking binman: Remove '/images/' fragment from FIT subentry paths binman: Create FIT subentries in the FIT section, not its parent binman: Test replacing non-section entries in FIT subsections binman: Refuse to replace sections for now tools/binman/control.py | 3 +- tools/binman/entry.py | 2 +- tools/binman/etype/_testing.py | 36 ++++ tools/binman/etype/fit.py | 15 +- tools/binman/etype/section.py | 3 + tools/binman/ftest.py | 179 ++++++++++++++++++ tools/binman/test/230_unique_names.dts | 34 ++++ tools/binman/test/231_unique_names_multi.dts | 38 ++++ .../binman/test/232_replace_with_bintool.dts | 39 ++++ tools/binman/test/233_fit_extract_replace.dts | 74 ++++++++ .../test/234_replace_section_simple.dts | 23 +++ 11 files changed, 438 insertions(+), 8 deletions(-) create mode 100644 tools/binman/test/230_unique_names.dts create mode 100644 tools/binman/test/231_unique_names_multi.dts create mode 100644 tools/binman/test/232_replace_with_bintool.dts create mode 100644 tools/binman/test/233_fit_extract_replace.dts create mode 100644 tools/binman/test/234_replace_section_simple.dts -- 2.35.1

2 14

[PATCH] Allow colon in PXE bootfile URLs
by Lyle Franklin 23 Apr '22

23 Apr '22

From: Lyle Franklin <lylejfranklin(a)gmail.com> Date: Sun, 15 Aug 2021 07:17:14 -0400 Subject: [PATCH] Allow colon in PXE bootfile URLs - U-boot's PXE flow supports prefixing your bootfile name with an IP address to fetch from a server other than the DHCP server, e.g. `hostIPaddr:bootfilename`: https://github.com/u-boot/u-boot/commit/a93907c43f847f076dd0e34ee3b69b5e8e6… - However, this breaks bootfile paths which contain a colon, e.g. `f0:ad:4e:10:1b:87/7/pxelinux.cfg/default` - This patch checks whether the `hostIPaddr` prefix is a valid IP address before overriding the serverIP otherwise the whole bootfile path is preserved Signed-off-by: Lyle Franklin <lylejfranklin(a)gmail.com> --- net/net.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/net.c b/net/net.c index c2992a0908..30fc0a29d7 100644 --- a/net/net.c +++ b/net/net.c @@ -1540,14 +1540,18 @@ int is_serverip_in_cmd(void) int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len) { char *colon; + struct in_addr ip; if (net_boot_file_name[0] == '\0') return 0; colon = strchr(net_boot_file_name, ':'); if (colon) { - if (ipaddr) - *ipaddr = string_to_ip(net_boot_file_name); + ip = string_to_ip(net_boot_file_name); + if (ipaddr && ip.s_addr) + *ipaddr = ip; + } + if (ip.s_addr) { strncpy(filename, colon + 1, max_len); } else { strncpy(filename, net_boot_file_name, max_len); -- 2.31.1

3 6

[PATCH] fdt: Add -q option to fdt addr for distro_bootcmd
by Peter Hoyes 23 Apr '22

23 Apr '22

From: Peter Hoyes <Peter.Hoyes(a)arm.com> distro_bootcmd uses this construct a few times to test $fdt_addr_r, and fall back on $fdtcontroladdr if not set/invalid: if fdt addr ${fdt_addr_r}; then ... else ... fi If the `fdt addr` test fails, it prints the following message on the console, suggesting there is an error when there is not: libfdt fdt_check_header(): FDT_ERR_BADMAGIC To remove this potentially confusing error message, this patch adds -q as a 'quiet' option for fdt addr, and uses this flag in config_distro_bootcmd.h Signed-off-by: Peter Hoyes <Peter.Hoyes(a)arm.com> --- cmd/fdt.c | 30 +++++++++++++++++++++++------- include/config_distro_bootcmd.h | 6 +++--- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/cmd/fdt.c b/cmd/fdt.c index 2a207bf2b5..fc2fddfb3c 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -119,13 +119,27 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (strncmp(argv[1], "ad", 2) == 0) { unsigned long addr; int control = 0; + int quiet = 0; struct fdt_header *blob; /* Set the address [and length] of the fdt */ argc -= 2; argv += 2; - if (argc && !strcmp(*argv, "-c")) { - control = 1; + while (argc > 0 && **argv == '-') { + char *arg = *argv; + + while (*++arg) { + switch (*arg) { + case 'c': + control = 1; + break; + case 'q': + quiet = 1; + break; + default: + return CMD_RET_USAGE; + } + } argc--; argv++; } @@ -145,7 +159,8 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) addr = hextoul(argv[0], NULL); blob = map_sysmem(addr, 0); - if (!fdt_valid(&blob)) + if ((quiet && fdt_check_header(blob)) || + (!quiet && !fdt_valid(&blob))) return 1; if (control) gd->fdt_blob = blob; @@ -159,12 +174,13 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* Optional new length */ len = hextoul(argv[1], NULL); if (len < fdt_totalsize(blob)) { - printf("New length %d < existing length %d, ignoring\n", - len, fdt_totalsize(blob)); + if (!quiet) + printf("New length %d < existing length %d, ignoring\n", + len, fdt_totalsize(blob)); } else { /* Open in place with a new length */ err = fdt_open_into(blob, blob, len); - if (err != 0) { + if (!quiet && err != 0) { printf("libfdt fdt_open_into(): %s\n", fdt_strerror(err)); } @@ -1055,7 +1071,7 @@ static int fdt_print(const char *pathp, char *prop, int depth) /********************************************************************/ #ifdef CONFIG_SYS_LONGHELP static char fdt_help_text[] = - "addr [-c] <addr> [<length>] - Set the [control] fdt location to <addr>\n" + "addr [-cq] <addr> [<length>] - Set the [control] fdt location to <addr>\n" #ifdef CONFIG_OF_LIBFDT_OVERLAY "fdt apply <addr> - Apply overlay to the DT\n" #endif diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 2f90929178..c55023889c 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -126,7 +126,7 @@ #ifdef CONFIG_CMD_BOOTEFI_BOOTMGR #define BOOTENV_EFI_BOOTMGR \ "boot_efi_bootmgr=" \ - "if fdt addr ${fdt_addr_r}; then " \ + "if fdt addr -q ${fdt_addr_r}; then " \ "bootefi bootmgr ${fdt_addr_r};" \ "else " \ "bootefi bootmgr;" \ @@ -141,7 +141,7 @@ "boot_efi_binary=" \ "load ${devtype} ${devnum}:${distro_bootpart} " \ "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \ - "if fdt addr ${fdt_addr_r}; then " \ + "if fdt addr -q ${fdt_addr_r}; then " \ "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "else " \ "bootefi ${kernel_addr_r} ${fdtcontroladdr};" \ @@ -360,7 +360,7 @@ "setenv bootp_arch " BOOTENV_EFI_PXE_ARCH ";" \ "if dhcp ${kernel_addr_r}; then " \ "tftpboot ${fdt_addr_r} dtb/${efi_fdtfile};" \ - "if fdt addr ${fdt_addr_r}; then " \ + "if fdt addr -q ${fdt_addr_r}; then " \ "bootefi ${kernel_addr_r} ${fdt_addr_r}; " \ "else " \ "bootefi ${kernel_addr_r} ${fdtcontroladdr};" \ -- 2.25.1

2 1

[PATCH 01/25] Convert CONFIG_BOARD_SIZE_LIMIT to Kconfig
by Tom Rini 22 Apr '22

22 Apr '22

This converts the following to Kconfig: CONFIG_BOARD_SIZE_LIMIT To do this, introduce CONFIG_HAS_BOARD_SIZE_LIMIT. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Kconfig | 17 +++++++++++++++++ README | 5 ----- configs/bk4r1_defconfig | 2 ++ configs/colibri_pxa270_defconfig | 2 ++ configs/colibri_vf_defconfig | 2 ++ configs/ea-lpc3250devkitv2_defconfig | 2 ++ configs/gardena-smart-gateway-mt7688_defconfig | 2 ++ configs/guruplug_defconfig | 2 ++ configs/linkit-smart-7688_defconfig | 2 ++ configs/mx51evk_defconfig | 2 ++ configs/mx53loco_defconfig | 2 ++ configs/mx7ulp_com_defconfig | 2 ++ configs/openrd_base_defconfig | 2 ++ configs/openrd_client_defconfig | 2 ++ configs/openrd_ultimate_defconfig | 2 ++ configs/pcm052_defconfig | 2 ++ configs/pico-dwarf-imx6ul_defconfig | 2 ++ configs/pico-dwarf-imx7d_defconfig | 2 ++ configs/pico-hobbit-imx6ul_defconfig | 2 ++ configs/pico-hobbit-imx7d_defconfig | 2 ++ configs/pico-imx6_defconfig | 2 ++ configs/pico-imx6ul_defconfig | 2 ++ configs/pico-imx7d_bl33_defconfig | 2 ++ configs/pico-imx7d_defconfig | 2 ++ configs/pico-nymph-imx7d_defconfig | 2 ++ configs/pico-pi-imx6ul_defconfig | 2 ++ configs/pico-pi-imx7d_defconfig | 2 ++ configs/sheevaplug_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/vf610twr_defconfig | 2 ++ configs/vf610twr_nand_defconfig | 2 ++ configs/warp7_bl33_defconfig | 2 ++ configs/warp7_defconfig | 2 ++ include/configs/bk4r1.h | 3 --- include/configs/colibri_pxa270.h | 2 -- include/configs/colibri_vf.h | 3 --- include/configs/ea-lpc3250devkitv2.h | 5 ----- include/configs/gardena-smart-gateway-mt7688.h | 6 ------ include/configs/guruplug.h | 5 ----- include/configs/linkit-smart-7688.h | 6 ------ include/configs/mx51evk.h | 13 ------------- include/configs/mx53loco.h | 12 ------------ include/configs/mx7ulp_com.h | 10 ---------- include/configs/openrd.h | 5 ----- include/configs/pcm052.h | 3 --- include/configs/pico-imx6.h | 12 ------------ include/configs/pico-imx6ul.h | 11 ----------- include/configs/pico-imx7d.h | 10 ---------- include/configs/rcar-gen3-common.h | 3 --- include/configs/sheevaplug.h | 5 ----- include/configs/sunxi-common.h | 9 --------- include/configs/tbs2910.h | 2 -- include/configs/vf610twr.h | 3 --- include/configs/warp7.h | 13 ------------- 54 files changed, 79 insertions(+), 146 deletions(-) diff --git a/Kconfig b/Kconfig index 112745440b5a..5a19fc99deb6 100644 --- a/Kconfig +++ b/Kconfig @@ -395,6 +395,23 @@ config BUILD_TARGET special image will be automatically built upon calling make / buildman. +config HAS_BOARD_SIZE_LIMIT + bool "Define a maximum size for the U-Boot image" + default y if RCAR_GEN3 + help + In some cases, we need to enforce a hard limit on how big the U-Boot + image itself can be. + +config BOARD_SIZE_LIMIT + int "Maximum size of the U-Boot image in bytes" + default 1048576 if RCAR_GEN3 + depends on HAS_BOARD_SIZE_LIMIT + help + Maximum size of the U-Boot image. When defined, the build system + checks that the actual size does not exceed it. This does not + include SPL nor TPL, on platforms that use that functionality, they + have a separate option to restict size. + config SYS_CUSTOM_LDSCRIPT bool "Use a custom location for the U-Boot linker script" help diff --git a/README b/README index f31fcd73f196..04e3fad0b8b6 100644 --- a/README +++ b/README @@ -2183,11 +2183,6 @@ use the "saveenv" command to store a valid environment. later, once stdio is running and output goes to the LCD, if present. -- CONFIG_BOARD_SIZE_LIMIT: - Maximum size of the U-Boot image. When defined, the - build system checks that the actual size does not - exceed it. - Low Level (hardware related) configuration options: --------------------------------------------------- diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index d41a19c88ee4..d00333995a46 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -17,6 +17,8 @@ CONFIG_ENV_OFFSET_REDUND=0x220000 CONFIG_TARGET_BK4R1=y CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_FIT=y CONFIG_BOOTDELAY=3 diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index c2c0a2bc4a20..e629c318576a 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=262144 CONFIG_SYS_LOAD_ADDR=0xa0000000 CONFIG_TIMESTAMP=y CONFIG_SYS_MONITOR_BASE=0x00000000 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index ce6b3315e3e4..43d8023426d0 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -14,6 +14,8 @@ CONFIG_TARGET_COLIBRI_VF=y CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x80008000 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/ea-lpc3250devkitv2_defconfig b/configs/ea-lpc3250devkitv2_defconfig index 8d9a905c4271..ba8c79668605 100644 --- a/configs/ea-lpc3250devkitv2_defconfig +++ b/configs/ea-lpc3250devkitv2_defconfig @@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_TARGET_EA_LPC3250DEVKITV2=y CONFIG_DEFAULT_DEVICE_TREE="lpc3250-ea3250" CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=1048575 CONFIG_SYS_LOAD_ADDR=0x80100000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set # CONFIG_AUTOBOOT is not set diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index 2bd302f76be0..2b8ede6745a9 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -22,6 +22,8 @@ CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y # CONFIG_MIPS_BOOT_ENV_LEGACY is not set CONFIG_MIPS_BOOT_FDT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=655360 CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 7116c77cd58a..4f7e39cfa571 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -12,6 +12,8 @@ CONFIG_ENV_OFFSET=0xE0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" CONFIG_IDENT_STRING="\nMarvell-GuruPlug" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=917504 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig index eedc3a204506..a68b3ba8a024 100644 --- a/configs/linkit-smart-7688_defconfig +++ b/configs/linkit-smart-7688_defconfig @@ -19,6 +19,8 @@ CONFIG_MIPS_CACHE_DISABLE=y CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y # CONFIG_MIPS_BOOT_ENV_LEGACY is not set CONFIG_MIPS_BOOT_FDT=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 6cf3c5931c60..134cb0cf35b1 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -9,6 +9,8 @@ CONFIG_TARGET_MX51EVK=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx51-babbage" # CONFIG_CMD_BMODE is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_SYS_LOAD_ADDR=0x92000000 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi" diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index e7a4797bd0c3..9b70a55a2b7c 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -13,6 +13,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx53-qsb" # CONFIG_CMD_BMODE is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_SYS_LOAD_ADDR=0x72000000 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/mx7ulp_com_defconfig b/configs/mx7ulp_com_defconfig index 2f860f61fda3..4e51a791a437 100644 --- a/configs/mx7ulp_com_defconfig +++ b/configs/mx7ulp_com_defconfig @@ -9,6 +9,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-com" CONFIG_LDO_ENABLED_MODE=y CONFIG_TARGET_MX7ULP_COM=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_SYS_LOAD_ADDR=0x60800000 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run loadimage; then run mmcboot; fi" diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index 3f0de34850b8..73ba408d84dc 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -13,6 +13,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base" CONFIG_IDENT_STRING="\nOpenRD-Base" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index 50f66c5487f4..faf51464e5e9 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -14,6 +14,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client" CONFIG_IDENT_STRING="\nOpenRD-Client" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index f552234be0c8..597e694a16d5 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -14,6 +14,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate" CONFIG_IDENT_STRING="\nOpenRD-Ultimate" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index ca56f9310251..292b6b2cd4c5 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -13,6 +13,8 @@ CONFIG_ENV_OFFSET_REDUND=0xC0000 CONFIG_TARGET_PCM052=y CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig index 3a03081247e6..8e1c25def99e 100644 --- a/configs/pico-dwarf-imx6ul_defconfig +++ b/configs/pico-dwarf-imx6ul_defconfig @@ -19,6 +19,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-dwarf.dtb" diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig index c0d2bfe694bd..90b607b90dff 100644 --- a/configs/pico-dwarf-imx7d_defconfig +++ b/configs/pico-dwarf-imx7d_defconfig @@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" CONFIG_SPL_I2C=y diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index 0c5555e2e472..28414666851b 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -20,6 +20,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb" diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index d708f2043a3b..1342d8501171 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" CONFIG_SPL_I2C=y diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig index 44d9295444b4..0bd66135d965 100644 --- a/configs/pico-imx6_defconfig +++ b/configs/pico-imx6_defconfig @@ -18,6 +18,8 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_FIT=y CONFIG_SPL_FIT_PRINT=y CONFIG_SPL_LOAD_FIT=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index 6a26174f0ce0..c198a660ea33 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -20,6 +20,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig index 56df161d9bfe..09117e9a4ea8 100644 --- a/configs/pico-imx7d_bl33_defconfig +++ b/configs/pico-imx7d_bl33_defconfig @@ -19,6 +19,8 @@ CONFIG_SPL=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 2f07308cff44..6473aaaede4c 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" CONFIG_SPL_I2C=y diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig index c0d2bfe694bd..90b607b90dff 100644 --- a/configs/pico-nymph-imx7d_defconfig +++ b/configs/pico-nymph-imx7d_defconfig @@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" CONFIG_SPL_I2C=y diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index 690c1b4d3385..31f37dab26fd 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -20,6 +20,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-pi.dtb" diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index cd759a81385f..812aa24b0910 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" CONFIG_SPL_I2C=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index db941872cfb8..483b5ca1907b 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -13,6 +13,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 4d6ca4f20b87..993997ba7abd 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -15,6 +15,8 @@ CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x2f400000 CONFIG_LTO=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=392192 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index 787ce4d9b4a7..4d2aaeeecef1 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -13,6 +13,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="vf610-twr" CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index 0063575e53a8..f282a1df92d9 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -13,6 +13,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="vf610-twr" CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 306c7a4ec345..949790c865d1 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -10,6 +10,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_HAB=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 5f4f8d010d9c..ab7299c9880a 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -15,6 +15,8 @@ CONFIG_IMX_BOOTAUX=y CONFIG_IMX_HAB=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 762d1980bda4..bd07b4b031b4 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -62,9 +62,6 @@ #define CONFIG_SYS_FSL_QSPI_LE #endif -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 - /* boot command, including the target-defined one if any */ /* Extra env settings (including the target-defined ones if any) */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 99645f3f7ad4..a5ba916279a3 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -12,8 +12,6 @@ /* * High Level Board Configuration Options */ -/* Avoid overwriting factory configuration block */ -#define CONFIG_BOARD_SIZE_LIMIT 0x40000 /* * Environment settings diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 2e7b640357ec..24851494f5cc 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -23,9 +23,6 @@ #define CONFIG_FDTADDR 0x84000000 -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 - #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \ diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index 220c3c44d6bc..2d0e78787990 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -10,11 +10,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h> -/* - * SoC and board defines - */ -#define CONFIG_BOARD_SIZE_LIMIT 0x000fffff /* maximum allowable size for full U-Boot binary */ - /* * RAM */ diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index 8b80841cdb67..269bb93272c5 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -46,10 +46,4 @@ /* Environment settings */ -/* - * Environment is right behind U-Boot in flash. Make sure U-Boot - * doesn't grow into the environment area. - */ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET - #endif /* __CONFIG_GARDENA_SMART_GATEWAY_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 25c5a97c69d7..d5655e4ada69 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -18,11 +18,6 @@ * max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -/* - * Environment is right behind U-Boot in flash. Make sure U-Boot - * doesn't grow into the environment area. - */ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET /* * Default environment variables diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index 4a19fb881da4..86bad6fa0363 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -47,10 +47,4 @@ /* Environment settings */ -/* - * Environment is right behind U-Boot in flash. Make sure U-Boot - * doesn't grow into the environment area. - */ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET - #endif /* __CONFIG_LINKIT_SMART_7688_H */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index f299cc06d327..ccfe292f6c69 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -130,17 +130,4 @@ * environment organization */ -/* - * Environment starts at CONFIG_ENV_OFFSET=0xC0000 = 768k = 768 * 1024 = 786432 - * - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 785408 - #endif diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 43455aa531ff..8b9f0a290179 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -106,18 +106,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Environment starts at 768k = 768 * 1024 = 786432 */ -/* - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 785408 - #ifdef CONFIG_CMD_SATA #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index d3ba1449279a..ce6afcde2a01 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -17,16 +17,6 @@ #define CONFIG_SYS_BOOTM_LEN 0x1000000 -/* - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot-dtb.imx offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 785408 #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* Using ULP WDOG for reset */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 7dad002f3b84..006f06e6af5c 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -22,11 +22,6 @@ * max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -/* - * Environment is right behind U-Boot in flash. Make sure U-Boot - * doesn't grow into the environment area. - */ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET /* * Default environment variables diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index fd4a0b1aa863..79b69dfe175a 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -16,9 +16,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 - /* if no target-specific extra environment settings were defined by the target, define an empty one */ #ifndef PCM052_EXTRA_ENV_SETTINGS diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 536e07b4da88..855d79934860 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -116,18 +116,6 @@ /* Environment organization */ -/* Environment starts at 768k = 768 * 1024 = 786432 */ -/* - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 715776 - /* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 1 diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 2646f19cef7c..39be43357091 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -116,17 +116,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ -/* Environment starts at 768k = 768 * 1024 = 786432 */ -/* - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 715776 #ifdef CONFIG_DM_VIDEO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index a90befc0116d..06fd78f9da60 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -122,16 +122,6 @@ /* FLASH and environment organization */ /* Environment starts at 768k = 768 * 1024 = 786432 */ -/* - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 715776 #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 2422f0379208..c3759ed19bf0 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -44,9 +44,6 @@ #define CONFIG_SYS_MONITOR_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 << 20) -/* The HF/QSPI layout permits up to 1 MiB large bootloader blob */ -#define CONFIG_BOARD_SIZE_LIMIT 1048576 - /* ENV setting */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 4499a63aed24..0cc58c3a7d98 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -18,11 +18,6 @@ * max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -/* - * Environment is right behind U-Boot in flash. Make sure U-Boot - * doesn't grow into the environment area. - */ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET /* * Default environment variables diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index c467e9bd15bc..a9031035d743 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -98,15 +98,6 @@ /* mmc config */ #define CONFIG_MMC_SUNXI_SLOT 0 -#if defined(CONFIG_ENV_IS_IN_MMC) -/* - * This is actually (CONFIG_ENV_OFFSET - - * (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)), but the value will be used - * directly in a makefile, without the preprocessor expansion. - */ -#define CONFIG_BOARD_SIZE_LIMIT 0x7e000 -#endif - #define CONFIG_SYS_MMC_MAX_DEVICE 4 /* diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 065b406e2e7e..b7a94812f354 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -55,8 +55,6 @@ #endif /* CONFIG_CMD_USB_MASS_STORAGE */ #endif /* CONFIG_CMD_USB */ -#define CONFIG_BOARD_SIZE_LIMIT 392192 /* (CONFIG_ENV_OFFSET - 1024) */ - #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index ebae8223fe2c..db7c8be7ce04 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -29,9 +29,6 @@ /* I2C Configs */ #define CONFIG_SYS_SPD_BUS_NUM 0 -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 - /* * We do have 128MB of memory on the Vybrid Tower board. Leave the last * 16MB alone to avoid conflicts with Cortex-M4 firmwares running from diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 83ee1784ce91..b3c9f14c8f4e 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -94,19 +94,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* - * Environment starts at CONFIG_ENV_OFFSET= 0xC0000 = 768k = 768*1024 = 786432 - * - * Detect overlap between U-Boot image and environment area in build-time - * - * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset - * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 - * - * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so - * write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 785408 - /* environment organization */ #define CONFIG_SYS_FSL_USDHC_NUM 1 -- 2.25.1

9 65

[PATCH] doc: device-tree-bindings: watchdog: document common properties
by Philippe Reynes 22 Apr '22

22 Apr '22

Adds simple documentation about common properties for watchdog in the device tree. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- doc/device-tree-bindings/watchdog/common.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/device-tree-bindings/watchdog/common.txt diff --git a/doc/device-tree-bindings/watchdog/common.txt b/doc/device-tree-bindings/watchdog/common.txt new file mode 100644 index 0000000000..9db6dd6146 --- /dev/null +++ b/doc/device-tree-bindings/watchdog/common.txt @@ -0,0 +1,12 @@ +Common watchdog properties. + +Optional properties: +- timeout-sec : Timeout of the watchdog in seconds + If this timeout is not defined, the value of WATCHDOG_TIMEOUT_MSECS will + be used instead. +- hw_margin_ms : Period used to reset the watchdog in ms + If this period is not defined, the default value is 1000. +- u-boot,noautostart : Specify that this watchdog should not autostart + When the config option WATCHDOG_AUTOSTART is set, all enabled + watchdogs are started. This property allows specifying that this + watchdog should NOT be started. -- 2.17.1

2 2

[PATCH v2] ARM: imx: imx8mn-evk: change environment address variables
by Heiko Thiery 22 Apr '22

22 Apr '22

Currently the space between kernel_addr_r and the fdt_addr_r is only 32MB. To have enough space to load kernel images bigger than 32MB change the variables to a feasible value. The new environment variables layout is based on the scheme from "include/configs/ti_armv7_common.h". The CONFIG_SYS_LOAD_ADDR value is set to 0x42000000. With that we have the same value as for the kernel_addr_r. Signed-off-by: Heiko Thiery <heiko.thiery(a)gmail.com> Reviewed-by: Peng Fan <peng.fan(a)nxp.com> --- v2: - fixed typo and removed added empty lines (thanks to Peng Fan) configs/imx8mn_ddr4_evk_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- include/configs/imx8mn_evk.h | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 27bf5ec05a..c13885ab5e 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 807d126b21..95ac6f85fa 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -20,7 +20,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 142fc3e4ff..3796fe2851 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -39,19 +39,27 @@ #endif /* Initial environment variables */ +/* see include/configs/ti_armv7_common.h */ +#define ENV_MEM_LAYOUT_SETTINGS \ + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_addr_r=0x42000000\0" \ + "fdt_addr_r=0x48000000\0" \ + "fdtoverlay_addr_r=0x49000000\0" \ + "ramdisk_addr_r=0x48080000\0" \ + "initrd_addr=0x48080000\0" \ + "scriptaddr=0x40000000\0" \ + "pxefile_addr_r=0x40100000\0" + #define CONFIG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ - "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "console=ttymxc1,115200\0" \ - "fdt_addr_r=0x43000000\0" \ "boot_fit=no\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + ENV_MEM_LAYOUT_SETTINGS /* Link Definitions */ -- 2.30.2

2 1

[PATCH v3 1/4] arm: mvebu: dts: uDPU: update DTS
by Robert Marko 21 Apr '22

21 Apr '22

Update the uDPU DTS to the version that is pending upstream [1][2]. [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220322105857.… [2] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220322105857.… Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> --- arch/arm/dts/armada-3720-uDPU.dts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index 95d46e8d08..1f534c0c65 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -99,7 +99,7 @@ pinctrl-names = "default"; pinctrl-0 = <&spi_quad_pins>; - m25p80@0 { + spi-flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <54000000>; @@ -108,10 +108,15 @@ compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; - /* only bootloader is located on the SPI */ + partition@0 { - label = "uboot"; - reg = <0 0x400000>; + label = "firmware"; + reg = <0x0 0x180000>; + }; + + partition@180000 { + label = "u-boot-env"; + reg = <0x180000 0x10000>; }; }; }; @@ -148,15 +153,15 @@ scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - lm75@48 { + nct375@48 { status = "okay"; - compatible = "lm75"; + compatible = "ti,tmp75c"; reg = <0x48>; }; - lm75@49 { + nct375@49 { status = "okay"; - compatible = "lm75"; + compatible = "ti,tmp75c"; reg = <0x49>; }; }; -- 2.35.1

4 14

[PATCH u-boot-mvebu 0/5] arm: mvebu: a37xx: Add support for reading OTP
by Pali Rohár 21 Apr '22

21 Apr '22

Add support for reading NB fuse OTP, SB fuse OTP and Security OTP values via U-Boot fuse API on Armada 37xx boards. Pali Rohár (5): arm: mvebu: a37xx: Add support for reading NB and SB fuse OTP value arm: mvebu: a37xx: Enable fuse command on all Armada 3720 boards arm: mvebu: a37xx: Move generic mbox code to arch/arm/mach-mvebu arm: mvebu: a37xx: Extend mbox_do_cmd() code arm: mvebu: a37xx: Add support for reading Security OTP values arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/Makefile | 3 + arch/arm/mach-mvebu/armada3700/Makefile | 3 +- arch/arm/mach-mvebu/armada3700/efuse.c | 172 ++++++++++++++++++++ arch/arm/mach-mvebu/armada3700/mbox.c | 79 +++++++++ arch/arm/mach-mvebu/include/mach/mbox.h | 40 +++++ board/CZ.NIC/turris_mox/mox_sp.c | 73 +-------- configs/mvebu_db-88f3720_defconfig | 2 + configs/mvebu_espressobin-88f3720_defconfig | 2 + configs/turris_mox_defconfig | 2 + configs/uDPU_defconfig | 2 + 11 files changed, 308 insertions(+), 71 deletions(-) create mode 100644 arch/arm/mach-mvebu/armada3700/efuse.c create mode 100644 arch/arm/mach-mvebu/armada3700/mbox.c create mode 100644 arch/arm/mach-mvebu/include/mach/mbox.h -- 2.20.1

3 40