diff options
author | Tom Rini | 2021-11-07 22:59:41 -0500 |
---|---|---|
committer | Tom Rini | 2021-11-12 14:18:17 -0500 |
commit | 406257ae4162adefa46951ff673ae9bbe03756fe (patch) | |
tree | 4c3b6cd4924cd7763857c9e91ab680a7f9712d8f | |
parent | 53b3df4e0c78a1662b9d2eeba05da17df2f7756e (diff) |
Convert CONFIG_MISC_INIT_F et al to Kconfig
This converts the following to Kconfig:
CONFIG_MISC_INIT_F
CONFIG_MISC_INIT_R
Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r-- | configs/kmcent2_defconfig | 1 | ||||
-rw-r--r-- | configs/ls1088aqds_tfa_defconfig | 1 | ||||
-rw-r--r-- | configs/sama5d2_icp_mmc_defconfig | 1 | ||||
-rw-r--r-- | configs/sama5d2_icp_qspiflash_defconfig | 1 | ||||
-rw-r--r-- | configs/socfpga_secu1_defconfig | 1 | ||||
-rw-r--r-- | include/configs/kmcent2.h | 1 | ||||
-rw-r--r-- | include/configs/ls1088aqds.h | 4 | ||||
-rw-r--r-- | include/configs/sama5d2_icp.h | 2 | ||||
-rw-r--r-- | include/configs/socfpga_arria5_secu1.h | 3 |
9 files changed, 5 insertions, 10 deletions
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig index 16ec0fadcfb..d02782831ae 100644 --- a/configs/kmcent2_defconfig +++ b/configs/kmcent2_defconfig @@ -17,6 +17,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y 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_DM=y CONFIG_CMD_I2C=y diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig index 4f0bfa6c48c..42c29f279d7 100644 --- a/configs/ls1088aqds_tfa_defconfig +++ b/configs/ls1088aqds_tfa_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21 # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_MISC_INIT_R=y CONFIG_CMD_GREPENV=y CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5 CONFIG_CMD_MEMINFO=y diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig index f821dcd2627..2e699a71807 100644 --- a/configs/sama5d2_icp_mmc_defconfig +++ b/configs/sama5d2_icp_mmc_defconfig @@ -30,6 +30,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_MISC_INIT_R=y CONFIG_SPL_DISPLAY_PRINT=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_SPL_RAM_SUPPORT=y diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig index 153c9e46826..7722a5e8937 100644 --- a/configs/sama5d2_icp_qspiflash_defconfig +++ b/configs/sama5d2_icp_qspiflash_defconfig @@ -25,6 +25,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlycon earlyprintk=serial,ttyS0, ignore_loglevel root=/dev/mmcblk0p2 memtest=0 rootfstype=ext4 rw rootwait" CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CONFIG=y CONFIG_CMD_BOOTZ=y diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig index 7bcc8899914..db480068421 100644 --- a/configs/socfpga_secu1_defconfig +++ b/configs/socfpga_secu1_defconfig @@ -26,6 +26,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_MISC_INIT_R=y CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 8274dd349bf..4dbd53c3877 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -335,7 +335,6 @@ #define CONFIG_SYS_CS2_FTIM2 SYS_QRIO_FTIM2 #define CONFIG_SYS_CS2_FTIM3 SYS_QRIO_FTIM3 -#define CONFIG_MISC_INIT_F #define CONFIG_HWCONFIG /* define to use L1 as initial stack */ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 8923e329577..9b26fbc354e 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -13,10 +13,6 @@ unsigned long get_board_sys_clk(void); #endif -#ifdef CONFIG_TFABOOT -#define CONFIG_MISC_INIT_R -#endif - #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_QIXIS_I2C_ACCESS #define SYS_NO_FLASH diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index e7ccfeaef74..53113f03799 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -14,8 +14,6 @@ #undef CONFIG_SYS_AT91_MAIN_CLOCK #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_MISC_INIT_R - /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index fc1d451b8f8..21e70c282a7 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -9,9 +9,6 @@ #include <asm/arch/base_addr_ac5.h> #include <linux/stringify.h> -/* Call misc_init_r */ -#define CONFIG_MISC_INIT_R - #define CONFIG_HUSH_INIT_VAR /* Eternal oscillator */ #define CONFIG_SYS_TIMER_RATE 40000000 |