From eabbf801c643baaf4e6bcb0590bdfec9ec0e2134 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 16 Jun 2020 19:06:11 -0400 Subject: Convert CONFIG_BOARD_EARLY_INIT_F et al to Kconfig This converts the following to Kconfig: CONFIG_BOARD_EARLY_INIT_F CONFIG_BOARD_EARLY_INIT_R Signed-off-by: Tom Rini --- configs/giedi_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/giedi_defconfig') diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 4e22a02aacd..5dd34227af0 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -23,6 +23,7 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y -- cgit v1.2.3 From 53355d53a48f9b91ec6f45b727cb25b13671e7da Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 16 Jun 2020 19:06:15 -0400 Subject: arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al to Kconfig This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_LIMIT Cc: Anatolij Gustschin Signed-off-by: Tom Rini --- configs/deneb_defconfig | 2 ++ configs/giedi_defconfig | 2 ++ include/configs/capricorn-common.h | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'configs/giedi_defconfig') diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 31a68f82402..5377b4fed51 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 5dd34227af0..dfac924bbb0 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index c2e9d0f11f9..b107e0ce3f9 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -138,9 +138,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 -#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_BOOTCOUNT_ENV - /* Environment organisation */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1, eMMC */ -- cgit v1.2.3 From f399e838cfdce0c477ad6f6eb13b9021aba3bc0e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 16 Jun 2020 19:06:27 -0400 Subject: Convert CONFIG_BOOTM_NETBSD to Kconfig This converts the following to Kconfig: CONFIG_BOOTM_NETBSD Signed-off-by: Tom Rini --- configs/deneb_defconfig | 1 + configs/giedi_defconfig | 1 + configs/imx8qm_rom7720_a1_4G_defconfig | 1 + include/configs/capricorn-common.h | 4 ---- include/configs/imx8qm_rom7720.h | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-) (limited to 'configs/giedi_defconfig') diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 5377b4fed51..c0e7725f64e 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -37,6 +37,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_CRC32 is not set diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index dfac924bbb0..d2b0f13f61f 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -37,6 +37,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_CRC32 is not set diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 305c4e827c6..8af2b239d6e 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_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/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index b107e0ce3f9..38a56e897e8 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -42,10 +42,6 @@ #define CONFIG_REMAKE_ELF -/* Commands */ - -#undef CONFIG_BOOTM_NETBSD - /* ENET Config */ #define CONFIG_FEC_XCV_TYPE RMII #define FEC_QUIRK_ENET_MAC diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 9808e72474f..5621ba8232d 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -15,8 +15,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x00128000 #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_FSL_USDHC #define CONFIG_SYS_BOOTMAPSZ (256 << 20) #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -- cgit v1.2.3