From: Tom Rini Date: Mon, 8 Nov 2021 03:59:41 +0000 (-0500) Subject: Convert CONFIG_MISC_INIT_F et al to Kconfig X-Git-Tag: v2022.01~48^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=406257ae4162adefa46951ff673ae9bbe03756fe;p=platform%2Fkernel%2Fu-boot.git 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 --- diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig index 16ec0fa..d027828 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 4f0bfa6..42c29f2 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 f821dcd..2e699a7 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 153c9e4..7722a5e 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 7bcc889..db48006 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 8274dd3..4dbd53c 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 8923e32..9b26fbc 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 e7ccfea..53113f0 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 fc1d451..21e70c2 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -9,9 +9,6 @@ #include #include -/* Call misc_init_r */ -#define CONFIG_MISC_INIT_R - #define CONFIG_HUSH_INIT_VAR /* Eternal oscillator */ #define CONFIG_SYS_TIMER_RATE 40000000