diff mbox series

[5/5] Convert CONFIG_MISC_INIT_F to Kconfig

Message ID 20210322051311.2904746-6-sjg@chromium.org
State Superseded
Delegated to: Tom Rini
Headers show
Series misc: Various misc patches | expand

Commit Message

Simon Glass March 22, 2021, 5:13 a.m. UTC 
This converts the following to Kconfig:
   CONFIG_MISC_INIT_F

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 common/Kconfig                       | 6 ++++++
 configs/MPC8349ITXGP_defconfig       | 1 +
 configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
 configs/MPC8349ITX_defconfig         | 1 +
 configs/kmcoge4_defconfig            | 1 +
 configs/sandbox64_defconfig          | 2 +-
 configs/sandbox_defconfig            | 1 +
 configs/sandbox_flattree_defconfig   | 2 +-
 configs/sandbox_spl_defconfig        | 2 ++
 configs/tools-only_defconfig         | 1 +
 include/configs/MPC8349ITX.h         | 2 --
 include/configs/kmp204x.h            | 2 --
 include/configs/sandbox.h            | 2 --
 scripts/config_whitelist.txt         | 1 -
 14 files changed, 16 insertions(+), 9 deletions(-)

Comments

Stefan Roese March 22, 2021, 5:45 a.m. UTC | #1 
On 22.03.21 06:13, Simon Glass wrote:
> This converts the following to Kconfig:
>     CONFIG_MISC_INIT_F
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> 
>   common/Kconfig                       | 6 ++++++
>   configs/MPC8349ITXGP_defconfig       | 1 +
>   configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
>   configs/MPC8349ITX_defconfig         | 1 +
>   configs/kmcoge4_defconfig            | 1 +
>   configs/sandbox64_defconfig          | 2 +-
>   configs/sandbox_defconfig            | 1 +
>   configs/sandbox_flattree_defconfig   | 2 +-
>   configs/sandbox_spl_defconfig        | 2 ++
>   configs/tools-only_defconfig         | 1 +
>   include/configs/MPC8349ITX.h         | 2 --
>   include/configs/kmp204x.h            | 2 --
>   include/configs/sandbox.h            | 2 --
>   scripts/config_whitelist.txt         | 1 -
>   14 files changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 482f1235347..0e36dfd2368 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -527,6 +527,12 @@ config LAST_STAGE_INIT
>   	  U-Boot calls last_stage_init() before the command-line interpreter is
>   	  started.
>   
> +config MISC_INIT_F
> +	bool "Execute pre-relocation misc init"
> +	help
> +	  Enabling this option calls the 'misc_init_f' function in the init
> +	  sequence just before DRAM is inited.
> +
>   config MISC_INIT_R
>   	bool "Execute Misc Init"
>   	default y if ARCH_KEYSTONE || ARCH_SUNXI || MPC85xx
> diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
> index 28e4ebf06f5..92f2093bb65 100644
> --- a/configs/MPC8349ITXGP_defconfig
> +++ b/configs/MPC8349ITXGP_defconfig
> @@ -154,6 +154,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000"
>   CONFIG_BOOTDELAY=6
>   CONFIG_USE_BOOTARGS=y
>   CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitxgp:eth0:off console=ttyS0,115200"
> +CONFIG_MISC_INIT_F=y
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> "
> diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
> index 46f7afc071f..cf1e90d6190 100644
> --- a/configs/MPC8349ITX_LOWBOOT_defconfig
> +++ b/configs/MPC8349ITX_LOWBOOT_defconfig
> @@ -153,6 +153,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
>   CONFIG_BOOTDELAY=6
>   CONFIG_USE_BOOTARGS=y
>   CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200"
> +CONFIG_MISC_INIT_F=y
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="MPC8349E-mITX> "
> diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
> index 1f70b756b0c..733e5d35996 100644
> --- a/configs/MPC8349ITX_defconfig
> +++ b/configs/MPC8349ITX_defconfig
> @@ -152,6 +152,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
>   CONFIG_BOOTDELAY=6
>   CONFIG_USE_BOOTARGS=y
>   CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200"
> +CONFIG_MISC_INIT_F=y
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="MPC8349E-mITX> "
> diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
> index ddc8f8a7f98..462e5677964 100644
> --- a/configs/kmcoge4_defconfig
> +++ b/configs/kmcoge4_defconfig
> @@ -20,6 +20,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   CONFIG_BOARD_EARLY_INIT_F=y
>   CONFIG_BOARD_EARLY_INIT_R=y
>   CONFIG_LAST_STAGE_INIT=y
> +CONFIG_MISC_INIT_F=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
> diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
> index cfda83474b6..4648808d516 100644
> --- a/configs/sandbox64_defconfig
> +++ b/configs/sandbox64_defconfig
> @@ -20,8 +20,8 @@ CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
>   CONFIG_CONSOLE_RECORD=y
>   CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
>   CONFIG_PRE_CONSOLE_BUFFER=y
> -CONFIG_LOG_SYSLOG=y
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_F=y
>   CONFIG_CMD_CPU=y
>   CONFIG_CMD_LICENSE=y
>   CONFIG_CMD_BOOTZ=y
> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
> index 713708e01c2..c9515a44783 100644
> --- a/configs/sandbox_defconfig
> +++ b/configs/sandbox_defconfig
> @@ -25,6 +25,7 @@ CONFIG_LOG=y
>   CONFIG_LOG_SYSLOG=y
>   CONFIG_LOG_ERROR_RETURN=y
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_F=y
>   CONFIG_ANDROID_AB=y
>   CONFIG_CMD_CPU=y
>   CONFIG_CMD_LICENSE=y
> diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
> index 4401f33f0ba..b68f938cb37 100644
> --- a/configs/sandbox_flattree_defconfig
> +++ b/configs/sandbox_flattree_defconfig
> @@ -17,8 +17,8 @@ CONFIG_BOOTSTAGE_STASH=y
>   CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
>   CONFIG_CONSOLE_RECORD=y
>   CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
> -CONFIG_LOG_SYSLOG=y
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_F=y
>   CONFIG_CMD_CPU=y
>   CONFIG_CMD_LICENSE=y
>   CONFIG_CMD_BOOTZ=y
> diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
> index ac71cab5f1e..0e40b17c624 100644
> --- a/configs/sandbox_spl_defconfig
> +++ b/configs/sandbox_spl_defconfig
> @@ -11,6 +11,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
>   CONFIG_SPL=y
>   CONFIG_BOOTSTAGE_STASH_ADDR=0x0
>   CONFIG_DEFAULT_DEVICE_TREE="sandbox"
> +CONFIG_TARGET_SANDBOX_SPL=y
>   CONFIG_SANDBOX_SPL=y
>   CONFIG_DEBUG_UART=y
>   CONFIG_DISTRO_DEFAULTS=y
> @@ -27,6 +28,7 @@ CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
>   CONFIG_CONSOLE_RECORD=y
>   CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_F=y
>   CONFIG_HANDOFF=y
>   CONFIG_SPL_BOARD_INIT=y
>   CONFIG_SPL_ENV_SUPPORT=y
> diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
> index a853abf2b8f..e16f702f00a 100644
> --- a/configs/tools-only_defconfig
> +++ b/configs/tools-only_defconfig
> @@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sandbox"
>   CONFIG_ANDROID_BOOT_IMAGE=y
>   CONFIG_FIT=y
>   CONFIG_FIT_SIGNATURE=y
> +CONFIG_MISC_INIT_F=y
>   # CONFIG_CMD_BOOTD is not set
>   # CONFIG_CMD_BOOTM is not set
>   # CONFIG_CMD_ELF is not set
> diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
> index f50cdd717cb..586c1e9ae84 100644
> --- a/include/configs/MPC8349ITX.h
> +++ b/include/configs/MPC8349ITX.h
> @@ -39,8 +39,6 @@
>   #ifndef __CONFIG_H
>   #define __CONFIG_H
>   
> -#define CONFIG_MISC_INIT_F
> -
>   /*
>    * On-board devices
>    */
> diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h
> index 90e3702bd80..af3b03be490 100644
> --- a/include/configs/kmp204x.h
> +++ b/include/configs/kmp204x.h
> @@ -177,8 +177,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
>   #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
>   #define CONFIG_SYS_OR1_PRELIM  CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
>   
> -#define CONFIG_MISC_INIT_F
> -
>   #define CONFIG_HWCONFIG
>   
>   /* define to use L1 as initial stack */
> diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
> index e0708fe5739..bbb7d12ad14 100644
> --- a/include/configs/sandbox.h
> +++ b/include/configs/sandbox.h
> @@ -130,6 +130,4 @@
>   
>   #define CONFIG_SYS_SATA_MAX_DEVICE	2
>   
> -#define CONFIG_MISC_INIT_F
> -
>   #endif
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 85857a746ca..b693925d20a 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1030,7 +1030,6 @@ CONFIG_MIPS_HUGE_TLB_SUPPORT
>   CONFIG_MIPS_MT_FPAFF
>   CONFIG_MIRQ_EN
>   CONFIG_MISC_COMMON
> -CONFIG_MISC_INIT_F
>   CONFIG_MIU_1BIT_INTERLEAVED
>   CONFIG_MIU_2BIT_21_7_INTERLEAVED
>   CONFIG_MIU_2BIT_INTERLEAVED
> 


Viele Grüße,
Stefan
diff mbox series

Patch

diff --git a/common/Kconfig b/common/Kconfig
index 482f1235347..0e36dfd2368 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -527,6 +527,12 @@  config LAST_STAGE_INIT
 	  U-Boot calls last_stage_init() before the command-line interpreter is
 	  started.
 
+config MISC_INIT_F
+	bool "Execute pre-relocation misc init"
+	help
+	  Enabling this option calls the 'misc_init_f' function in the init
+	  sequence just before DRAM is inited.
+
 config MISC_INIT_R
 	bool "Execute Misc Init"
 	default y if ARCH_KEYSTONE || ARCH_SUNXI || MPC85xx
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 28e4ebf06f5..92f2093bb65 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -154,6 +154,7 @@  CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000"
 CONFIG_BOOTDELAY=6
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitxgp:eth0:off console=ttyS0,115200"
+CONFIG_MISC_INIT_F=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> "
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 46f7afc071f..cf1e90d6190 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -153,6 +153,7 @@  CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200"
+CONFIG_MISC_INIT_F=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="MPC8349E-mITX> "
diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 1f70b756b0c..733e5d35996 100644
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -152,6 +152,7 @@  CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=6
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200"
+CONFIG_MISC_INIT_F=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="MPC8349E-mITX> "
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index ddc8f8a7f98..462e5677964 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -20,6 +20,7 @@  CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_LAST_STAGE_INIT=y
+CONFIG_MISC_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index cfda83474b6..4648808d516 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -20,8 +20,8 @@  CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
 CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_LOG_SYSLOG=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_F=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 713708e01c2..c9515a44783 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -25,6 +25,7 @@  CONFIG_LOG=y
 CONFIG_LOG_SYSLOG=y
 CONFIG_LOG_ERROR_RETURN=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_F=y
 CONFIG_ANDROID_AB=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
index 4401f33f0ba..b68f938cb37 100644
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -17,8 +17,8 @@  CONFIG_BOOTSTAGE_STASH=y
 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
-CONFIG_LOG_SYSLOG=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_F=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index ac71cab5f1e..0e40b17c624 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
 CONFIG_SPL=y
 CONFIG_BOOTSTAGE_STASH_ADDR=0x0
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
+CONFIG_TARGET_SANDBOX_SPL=y
 CONFIG_SANDBOX_SPL=y
 CONFIG_DEBUG_UART=y
 CONFIG_DISTRO_DEFAULTS=y
@@ -27,6 +28,7 @@  CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_F=y
 CONFIG_HANDOFF=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_ENV_SUPPORT=y
diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
index a853abf2b8f..e16f702f00a 100644
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -4,6 +4,7 @@  CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_MISC_INIT_F=y
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_ELF is not set
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index f50cdd717cb..586c1e9ae84 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -39,8 +39,6 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MISC_INIT_F
-
 /*
  * On-board devices
  */
diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h
index 90e3702bd80..af3b03be490 100644
--- a/include/configs/kmp204x.h
+++ b/include/configs/kmp204x.h
@@ -177,8 +177,6 @@  unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
 #define CONFIG_SYS_OR1_PRELIM  CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
 
-#define CONFIG_MISC_INIT_F
-
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index e0708fe5739..bbb7d12ad14 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -130,6 +130,4 @@ 
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 
-#define CONFIG_MISC_INIT_F
-
 #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 85857a746ca..b693925d20a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1030,7 +1030,6 @@  CONFIG_MIPS_HUGE_TLB_SUPPORT
 CONFIG_MIPS_MT_FPAFF
 CONFIG_MIRQ_EN
 CONFIG_MISC_COMMON
-CONFIG_MISC_INIT_F
 CONFIG_MIU_1BIT_INTERLEAVED
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED