From c9e6c13deb65acdb0faf72d0367d22ef0e15dbf5 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 1 Oct 2019 10:33:43 -0400 Subject: [PATCH 01/13] arm: K3: Increase default SYSFW image size allocation The memory allocated to store the FIT image containing SYSFW and board configuration data is statically defined to the largest size expected. This was 269000 bytes but now needs to be grown to 276000 to make room for the signatures attached to the board configuration data on High Security devices. Signed-off-by: Andrew F. Davis --- arch/arm/mach-k3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 9652c96a78a..de1c1cc73f3 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -98,7 +98,7 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART config K3_SYSFW_IMAGE_SIZE_MAX int "Amount of memory dynamically allocated for loading SYSFW blob" depends on K3_LOAD_SYSFW - default 269000 + default 276000 help Amount of memory (in bytes) reserved through dynamic allocation at runtime for loading the combined System Firmware and configuration image From fc8db754c289e00b9d4ae06eb20185042b537e7d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 2 Oct 2019 15:53:12 +0200 Subject: [PATCH 02/13] Makefile: Fix typo around CONFIG_SPL_FIT_SOURCE Trivial fix. Signed-off-by: Michal Simek --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1d9ade948ba..60ae53d6388 100644 --- a/Makefile +++ b/Makefile @@ -1232,7 +1232,7 @@ ifndef CONFIG_SYS_UBOOT_START CONFIG_SYS_UBOOT_START := 0 endif -# Boards with more complex image requirments can provide an .its source file +# Boards with more complex image requirements can provide an .its source file # or a generator script ifneq ($(CONFIG_SPL_FIT_SOURCE),"") U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) From d4c51412c5d386f27f483e8c486f9e1f5b1da4eb Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 3 Oct 2019 16:45:29 +0000 Subject: [PATCH 03/13] Makefile: mrproper should remove *.pyc files *.pyc files contain compiled Python bytecode. 'make mrproper' should remove them. Removing *.pyc files helps for instance sometimes when running into an error "binman: Unknown entry type 'blob' in node '/binman/blob'". Signed-off-by: Heinrich Schuchardt Reviewed-by: Bin Meng --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 60ae53d6388..ac0b8882ad3 100644 --- a/Makefile +++ b/Makefile @@ -1875,7 +1875,7 @@ clean: $(clean-dirs) $(call cmd,rmfiles) @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ - -o -name '*.ko.*' -o -name '*.su' \ + -o -name '*.ko.*' -o -name '*.su' -o -name '*.pyc' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.lex.c' -o -name '*.tab.[ch]' \ -o -name '*.symtypes' -o -name 'modules.order' \ From 12e800cdab629beec634d30b9bfe6d655ea14cc9 Mon Sep 17 00:00:00 2001 From: Ley Foon Tan Date: Fri, 4 Oct 2019 16:43:50 +0800 Subject: [PATCH 04/13] MAINTAINERS, git-mailrc: Update the maintainer for socfpga This updates MAINTAINERS and git-mailrc to add me as maintainer for socfpga. Signed-off-by: Ley Foon Tan Acked-by: Marek Vasut --- MAINTAINERS | 1 + doc/git-mailrc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e752e4b3de0..a9a1049eafc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -111,6 +111,7 @@ F: cmd/arm/ ARM ALTERA SOCFPGA M: Marek Vasut M: Simon Goldschmidt +M: Ley Foon Tan S: Maintainted T: git https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga.git F: arch/arm/mach-socfpga/ diff --git a/doc/git-mailrc b/doc/git-mailrc index 6f383b1f605..fdfec859282 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -28,6 +28,7 @@ alias jaehoon Jaehoon Chung alias jagan Jagan Teki alias jhersh Joe Hershberger alias kevery Kever Yang +alias leyfoon Ley Foon Tan alias lukma Lukasz Majewski alias macpaul Macpaul Lin alias marex Marek Vasut @@ -66,7 +67,7 @@ alias s3c samsung alias s5pc samsung alias samsung uboot, prom alias snapdragon uboot, mateusz -alias socfpga uboot, marex, dinh, simongoldschmidt +alias socfpga uboot, marex, dinh, simongoldschmidt, leyfoon alias sunxi uboot, jagan, maxime alias tegra uboot, sjg, Tom Warren , Stephen Warren alias tegra2 tegra From dd2d9899720895881e5c60fb38f91f22c53c97cc Mon Sep 17 00:00:00 2001 From: AKASHI Takahiro Date: Thu, 12 Sep 2019 15:31:22 +0900 Subject: [PATCH 05/13] autoboot: add necessary dependency at AUTOBOOT_MENU_SHOW Otherwise, menu_show() will be undefined in bootdelay_process(). Signed-off-by: AKASHI Takahiro --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 98647f58b7a..c61c8516229 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -172,6 +172,7 @@ config AUTOBOOT_MENUKEY config AUTOBOOT_MENU_SHOW bool "Show a menu on boot" + depends on CMD_BOOTMENU help This enables the boot menu, controlled by environment variables defined by the board. The menu starts after running the 'preboot' From 29c9db4d98711606c48d130f328f848fa7adae55 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 17 Sep 2019 17:15:40 -0400 Subject: [PATCH 06/13] board: ti: am654: Disable TRNG node for HS devices On HS devices the access to TRNG is restricted on the non-secure ARM side, disable the node in DT to prevent firewall violations. Signed-off-by: Andrew F. Davis Reviewed-by: Lokesh Vutla --- arch/arm/mach-k3/common.c | 20 ++++++++++++++++++++ arch/arm/mach-k3/include/mach/sys_proto.h | 2 ++ board/ti/am65x/evm.c | 15 +++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 3e36d90acef..c16afc654fb 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -137,6 +137,26 @@ int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name) return 0; } + +int fdt_disable_node(void *blob, char *node_path) +{ + int offs; + int ret; + + offs = fdt_path_offset(blob, node_path); + if (offs < 0) { + debug("Node %s not found.\n", node_path); + return 0; + } + ret = fdt_setprop_string(blob, offs, "status", "disabled"); + if (ret < 0) { + printf("Could not add status property to node %s: %s\n", + node_path, fdt_strerror(ret)); + return ret; + } + return 0; +} + #endif #ifndef CONFIG_SYSRESET diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h index 45832b45a16..3c825aa3d1f 100644 --- a/arch/arm/mach-k3/include/mach/sys_proto.h +++ b/arch/arm/mach-k3/include/mach/sys_proto.h @@ -14,4 +14,6 @@ struct ti_sci_handle *get_ti_sci_handle(void); int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name); int do_board_detect(void); void release_resources_for_core_shutdown(void); +int fdt_disable_node(void *blob, char *node_path); + #endif diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index e01adcd642f..ad333ad8839 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -96,10 +96,21 @@ int ft_board_setup(void *blob, bd_t *bd) int ret; ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000", "sram@70000000"); - if (ret) + if (ret) { printf("%s: fixing up msmc ram failed %d\n", __func__, ret); + return ret; + } - return ret; +#if defined(CONFIG_TI_SECURE_DEVICE) + /* Make HW RNG reserved for secure world use */ + ret = fdt_disable_node(blob, "/interconnect@100000/trng@4e10000"); + if (ret) { + printf("%s: disabling TRGN failed %d\n", __func__, ret); + return ret; + } +#endif + + return 0; } #endif From 46f0d9c46b790d8eb1903e1da69ee375efbbe21a Mon Sep 17 00:00:00 2001 From: Jean-Jacques Hiblot Date: Tue, 17 Sep 2019 17:18:25 -0400 Subject: [PATCH 07/13] ARM: keystone2: update the default addresses of the secure monitor To accommodate the growth of u-boot, we need to shift the location of the secure monitor. Moving it 64kB further. Signed-off-by: Jean-Jacques Hiblot --- include/configs/ti_armv7_keystone2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index d7bb1efcbf5..ba12428dbe6 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -217,8 +217,8 @@ "addr_secdb_key=0xc000000\0" \ "name_kern=zImage\0" \ "addr_mon=0x87000000\0" \ - "addr_non_sec_mon=0x0c087fc0\0" \ - "addr_load_sec_bm=0x0c08c000\0" \ + "addr_non_sec_mon=0x0c097fc0\0" \ + "addr_load_sec_bm=0x0c09c000\0" \ "run_mon=mon_install ${addr_mon}\0" \ "run_mon_hs=mon_install ${addr_non_sec_mon} " \ "${addr_load_sec_bm}\0" \ From 400b9554cc3ef6d301940d43a2a6f9c098df5fb9 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Fri, 20 Sep 2019 15:59:18 +0200 Subject: [PATCH 08/13] cmd: part: number: return hexadecimal value At this point we are using part number sub-command to retrieve UUID of the partition using it's name. e.g.: part number mmc $mmcdev system_a system_a_index part uuid mmc $mmcdev:${system_a_index} system_a_uuid Since 'part uuid' sub-command expects partition index in hex format and 'part number' returns decimal value, 'part uuid' command will provide wrong UUID or fail. Fixes: be683756f62034 ("cmd: part: Add 'number' sub-command") Cc: Dirk Behme Reported-by: Pontus Fuchs Signed-off-by: Roman Stratiienko Signed-off-by: Eugeniu Rosca Reviewed-by: Tom Rini Reviewed-by: Igor Opaniuk --- cmd/part.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/part.c b/cmd/part.c index 6cfb67b2795..5e4e45ca6d8 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -152,7 +152,7 @@ static int do_part_info(int argc, char * const argv[], enum cmd_part_info param) snprintf(buf, sizeof(buf), LBAF, info.size); break; case CMD_PART_INFO_NUMBER: - snprintf(buf, sizeof(buf), "%d", part); + snprintf(buf, sizeof(buf), "0x%x", part); break; default: printf("** Unknown cmd_part_info value: %d\n", param); From 4b0bcfa7c4ecd5d5e02c5e7d10d128a7da53414b Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 20 Sep 2019 17:36:50 -0400 Subject: [PATCH 09/13] Kconfig: Migrate CONFIG_BOOTM_* options Migrate all of the existing OS support options that are under CONFIG_BOOTM_* to Kconfig. Signed-off-by: Tom Rini --- cmd/Kconfig | 48 ++++++++++++++++++++++++++++ configs/apalis-imx8qm_defconfig | 1 + configs/brsmarc1_defconfig | 3 ++ configs/brxre1_defconfig | 3 ++ configs/cl-som-imx7_defconfig | 3 ++ configs/colibri-imx6ull_defconfig | 2 ++ configs/colibri-imx8qxp_defconfig | 1 + configs/colibri_imx7_defconfig | 2 ++ configs/colibri_imx7_emmc_defconfig | 2 ++ configs/imx8mq_evk_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/mx7dsabresd_defconfig | 3 ++ configs/mx7dsabresd_qspi_defconfig | 3 ++ include/config_defaults.h | 7 ---- include/configs/apalis-imx8.h | 2 -- include/configs/brsmarc1.h | 5 --- include/configs/brxre1.h | 5 --- include/configs/cl-som-imx7.h | 4 --- include/configs/colibri-imx6ull.h | 3 -- include/configs/colibri-imx8x.h | 2 -- include/configs/colibri_imx7.h | 3 -- include/configs/imx8mq_evk.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/mx7dsabresd.h | 4 --- include/configs/xilinx_versal_mini.h | 3 -- include/configs/xilinx_zynqmp_mini.h | 3 -- include/configs/zynq_cse.h | 2 -- scripts/config_whitelist.txt | 7 ---- 30 files changed, 74 insertions(+), 53 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index c61c8516229..8fcb1b84741 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -268,6 +268,54 @@ config CMD_BOOTEFI help Boot an EFI image from memory. +config BOOTM_LINUX + bool "Support booting Linux OS images" + depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI + default y + help + Support booting the Linux kernel directly via a command such as bootm + or booti or bootz. + +config BOOTM_NETBSD + bool "Support booting NetBSD (non-EFI) loader images" + depends on CMD_BOOTM + default y + help + Support booting NetBSD via the bootm command. + +config BOOTM_OPENRTOS + bool "Support booting OPENRTOS / FreeRTOS images" + depends on CMD_BOOTM + help + Support booting OPENRTOS / FreeRTOS via the bootm command. + +config BOOTM_OSE + bool "Support booting Enea OSE images" + depends on CMD_BOOTM + help + Support booting Enea OSE images via the bootm command. + +config BOOTM_PLAN9 + bool "Support booting Plan9 OS images" + depends on CMD_BOOTM + default y + help + Support booting Plan9 images via the bootm command. + +config BOOTM_RTEMS + bool "Support booting RTEMS OS images" + depends on CMD_BOOTM + default y + help + Support booting RTEMS images via the bootm command. + +config BOOTM_VXWORKS + bool "Support booting VxWorks OS images" + depends on CMD_BOOTM + default y + help + Support booting VxWorks images via the bootm command. + config CMD_BOOTEFI_HELLO_COMPILE bool "Compile a standard EFI hello world binary for testing" depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig index 6a259381c24..071e4706201 100644 --- a/configs/apalis-imx8qm_defconfig +++ b/configs/apalis-imx8qm_defconfig @@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig index 8863a2d5ccd..d0faa4058cd 100644 --- a/configs/brsmarc1_defconfig +++ b/configs/brsmarc1_defconfig @@ -41,6 +41,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTZ=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index d4169c03275..d9b0e320f58 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -36,6 +36,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTZ=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index 20d23a0ae31..5914bbd6c22 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -26,6 +26,9 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CL-SOM-iMX7 # " CONFIG_CMD_BOOTZ=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EXPORTENV is not set diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 8c21ff4d6ef..99b3deb8a14 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -16,6 +16,8 @@ CONFIG_VERSION_VARIABLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOUNCE_BUFFER=y CONFIG_SYS_PROMPT="Colibri iMX6ULL # " +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_ELF is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig index a223a16ddd8..b809905ce5d 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8qxp_defconfig @@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index c1bee450f6e..a9149dd15c7 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -19,6 +19,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOUNCE_BUFFER=y CONFIG_SYS_PROMPT="Colibri iMX7 # " # CONFIG_CMD_BOOTD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_ASKENV=y diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index 1a012d851e4..c5de2e7b1cc 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -20,6 +20,8 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SYS_PROMPT="Colibri iMX7 # " # CONFIG_CMD_BOOTD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_ASKENV=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index e45731edda7..59ba4bcb520 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_SPL_BOARD_INIT=y CONFIG_HUSH_PARSER=y +# CONFIG_BOOTM_NETBSD is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_CACHE=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 3294931ef8f..42591c77812 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -24,6 +24,7 @@ CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index d7974e8fad4..f4cc86ec1d0 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -27,6 +27,7 @@ CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y CONFIG_CMD_DM=y diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 1107507b51f..b4123589957 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -14,6 +14,9 @@ CONFIG_BOUNCE_BUFFER=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTZ=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EXPORTENV is not set diff --git a/configs/mx7dsabresd_qspi_defconfig b/configs/mx7dsabresd_qspi_defconfig index b8ced1994a0..7223290e59c 100644 --- a/configs/mx7dsabresd_qspi_defconfig +++ b/configs/mx7dsabresd_qspi_defconfig @@ -13,6 +13,9 @@ CONFIG_BOUNCE_BUFFER=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTZ=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EXPORTENV is not set diff --git a/include/config_defaults.h b/include/config_defaults.h index 4ed09683b65..d211a41ef29 100644 --- a/include/config_defaults.h +++ b/include/config_defaults.h @@ -9,11 +9,4 @@ #ifndef _CONFIG_DEFAULTS_H_ #define _CONFIG_DEFAULTS_H_ -/* Support bootm-ing different OSes */ -#define CONFIG_BOOTM_LINUX 1 -#define CONFIG_BOOTM_NETBSD 1 -#define CONFIG_BOOTM_PLAN9 1 -#define CONFIG_BOOTM_RTEMS 1 -#define CONFIG_BOOTM_VXWORKS 1 - #endif diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 6eb8395162b..3a8d2d40d77 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -13,8 +13,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index c3eb5baacc4..19e796edb12 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -61,11 +61,6 @@ BUR_COMMON_ENV \ " bootm ${loadaddr} - ${dtbaddr}\0" #endif /* !CONFIG_SPL_BUILD*/ -/* undefine command which we not need here */ -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* Support both device trees and ATAGs. */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 7309e7d4831..c6e308b04d0 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -58,11 +58,6 @@ BUR_COMMON_ENV \ #define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default" -/* undefine command which we not need here */ -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* Support both device trees and ATAGs. */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 7f3fdea039f..67c52d76e72 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -38,10 +38,6 @@ #define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 736717486bf..0a4f30fbaf4 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 6f3c34d1ad9..69a876fee35 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -13,8 +13,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 49cdd610387..4677e09b475 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -35,9 +35,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #endif -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index c2113439c30..1ceec5ab5ab 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -69,7 +69,6 @@ #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_CRC32 -#undef CONFIG_BOOTM_NETBSD /* ENET Config */ /* ENET1 */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 5a9fd57060b..7a790ef1581 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -45,7 +45,6 @@ #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_CRC32 -#undef CONFIG_BOOTM_NETBSD #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 02c4e9f8f67..c357c7bbe6a 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -44,7 +44,6 @@ #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_CRC32 -#undef CONFIG_BOOTM_NETBSD #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 77856a8f3a4..e1f92da48ca 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -30,10 +30,6 @@ /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index 4b3691b4073..d30a697a57e 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -21,9 +21,6 @@ #undef CONFIG_ZLIB #undef CONFIG_GZIP #undef CONFIG_CMD_ENV -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_VXWORKS -#undef CONFIG_BOOTM_LINUX /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 7138851daef..a6922896e0e 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -24,9 +24,6 @@ #undef CONFIG_GZIP #undef CONFIG_CMD_ENV #undef CONFIG_SYS_INIT_SP_ADDR -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_VXWORKS -#undef CONFIG_BOOTM_LINUX /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index daf7d75d300..917f35b24c5 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -19,8 +19,6 @@ #undef CONFIG_GZIP #undef CONFIG_SYS_CBSIZE -#undef CONFIG_BOOTM_VXWORKS -#undef CONFIG_BOOTM_LINUX #define CONFIG_SYS_CBSIZE 1024 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b06a77ebd66..5a007d37091 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -128,13 +128,6 @@ CONFIG_BOOGER CONFIG_BOOTBLOCK CONFIG_BOOTFILE CONFIG_BOOTMODE -CONFIG_BOOTM_LINUX -CONFIG_BOOTM_NETBSD -CONFIG_BOOTM_OPENRTOS -CONFIG_BOOTM_OSE -CONFIG_BOOTM_PLAN9 -CONFIG_BOOTM_RTEMS -CONFIG_BOOTM_VXWORKS CONFIG_BOOTP_ CONFIG_BOOTP_BOOTFILE CONFIG_BOOTP_BOOTFILESIZE From 60a9aebdc3a77bfd00391992a3b8b722c73c4618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 23 Sep 2019 22:43:41 +0100 Subject: [PATCH 10/13] Kconfig: fix a typo in the description of bmp command. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrius Štikonas --- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 8fcb1b84741..4e61565aab1 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1517,7 +1517,7 @@ config CMD_BMP bool "Enable 'bmp' command" depends on LCD || DM_VIDEO || VIDEO help - This provides a way to obtain information about a BMP-format iamge + This provides a way to obtain information about a BMP-format image and to display it. BMP (which presumably stands for BitMaP) is a file format defined by Microsoft which supports images of various depths, formats and compression methods. Headers on the file From fa840f13f5444cc0f3a435e3d2d48b1b1b6d63b9 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Wed, 25 Sep 2019 14:10:54 +0300 Subject: [PATCH 11/13] initcall.h: initcall_run_list(): Improve debug output Existing debug output is mixed with the function name: initcall_run_list() initcall: 25263initcall_run_list() (relocated to 425263) Turn it to: initcall_run_list() initcall: 25263 (relocated to 425263) Signed-off-by: Ovidiu Panait --- include/initcall.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/initcall.h b/include/initcall.h index 78d15afe69b..b5acdd01bdb 100644 --- a/include/initcall.h +++ b/include/initcall.h @@ -30,11 +30,13 @@ static inline int initcall_run_list(const init_fnc_t init_sequence[]) #ifdef CONFIG_EFI_APP reloc_ofs = (unsigned long)image_base; #endif - debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs); if (reloc_ofs) - debug(" (relocated to %p)\n", (char *)*init_fnc_ptr); + debug("initcall: %p (relocated to %p)\n", + (char *)*init_fnc_ptr - reloc_ofs, + (char *)*init_fnc_ptr); else - debug("\n"); + debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs); + ret = (*init_fnc_ptr)(); if (ret) { printf("initcall sequence %p failed at call %p (err=%d)\n", From 5ff1963da31767521cbb755c0aa1f8ed2e361efd Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Wed, 7 Aug 2019 10:16:33 -0500 Subject: [PATCH 12/13] ARM: dts: imx6q-logicpd: Add missing imx6q-logicpd-u-boot for SPL The SPL device tree is missing the entires for gpio1, uart1, usdhc1 and usdhc2. This creates the missing imx6q-logicpd-u-boot.dtsi file which will enable these functions so SPL can properly setup UART, detect microSD card, and startup. Fixes: 8f4691e31a18 ("ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init") Signed-off-by: Adam Ford --- arch/arm/dts/imx6q-logicpd-u-boot.dtsi | 18 ++++++++++++++++++ board/logicpd/imx6/MAINTAINERS | 1 + 2 files changed, 19 insertions(+) create mode 100644 arch/arm/dts/imx6q-logicpd-u-boot.dtsi diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi new file mode 100644 index 00000000000..625bed8f7d7 --- /dev/null +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Logic PD + */ + +#include "imx6qdl-u-boot.dtsi" + +&uart1 { + u-boot,dm-spl; +}; + +&usdhc1 { + u-boot,dm-spl; +}; + +&usdhc2 { + u-boot,dm-spl; +}; diff --git a/board/logicpd/imx6/MAINTAINERS b/board/logicpd/imx6/MAINTAINERS index 20ec5918e48..4280315269d 100644 --- a/board/logicpd/imx6/MAINTAINERS +++ b/board/logicpd/imx6/MAINTAINERS @@ -7,3 +7,4 @@ F: configs/imx6q_logic_defconfig F: arch/arm/dts/imx6-logicpd-baseboard.dtsi F: arch/arm/dts/imx6-logicpd-som.dtsi F: arch/arm/dts/imx6q-logicpd.dts +F: arch/arm/dts/imx6q-logicpd-u-boot.dtsi From d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 4 Oct 2019 12:21:33 -0400 Subject: [PATCH 13/13] Revert "env: solve compilation error in SPL" This reverts commit 7d4776545b0f8a8827e5d061206faf61c9ba6ea9. The changes here break environment validation and furthermore do not seem to be required. Signed-off-by: Tom Rini --- env/common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/env/common.c b/env/common.c index 3fb60509dd8..4daaa6faea6 100644 --- a/env/common.c +++ b/env/common.c @@ -24,10 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; #include struct hsearch_data env_htab = { -#if CONFIG_IS_ENABLED(ENV_SUPPORT) - /* defined in flags.c, only compile with ENV_SUPPORT */ .change_ok = env_flags_validate, -#endif }; /* @@ -229,9 +226,7 @@ void env_relocate(void) #if defined(CONFIG_NEEDS_MANUAL_RELOC) env_reloc(); env_fix_drivers(); - - if (env_htab.change_ok) - env_htab.change_ok += gd->reloc_off; + env_htab.change_ok += gd->reloc_off; #endif if (gd->env_valid == ENV_INVALID) { #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)