From db4080d56dec857a90367e2d5e4fa0ad0d2a37c3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 1 Jun 2019 14:20:25 -0400 Subject: configs: Migrate the various SPL_BOOT_xxx choices for PowerPC The non-CONFIG_SPL_FRAMEWORK SPL used on some PowerPC platforms have a choice between CONFIG_SPL_NAND_BOOT, CONFIG_SPL_MMC_BOOT and CONFIG_SPL_SPI_BOOT. Migrate this to Kconfig Signed-off-by: Tom Rini --- configs/T1040RDB_NAND_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configs/T1040RDB_NAND_defconfig') diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig index 2f32b67d1d..cebc178f89 100644 --- a/configs/T1040RDB_NAND_defconfig +++ b/configs/T1040RDB_NAND_defconfig @@ -11,13 +11,15 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_SPL_FRAMEWORK is not set +CONFIG_SPL_NAND_BOOT=y +CONFIG_SPL_FSL_PBL=y CONFIG_SPL_TEXT_BASE=0xFFFD8000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y -- cgit From d760a5efb94dadb5ea810c79830cef68de2a774f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 2 Jun 2019 08:57:32 -0400 Subject: configs: Migrate CONFIG_SYS_LDSCRIPT to Kconfig In order to migrate this symbol to Kconfig introduce a new symbol to guard it, CONFIG_SYS_CUSTOM_LDSCRIPT. When that is set we can then provide the exact final location o the script. Signed-off-by: Tom Rini --- configs/T1040RDB_NAND_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs/T1040RDB_NAND_defconfig') diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig index cebc178f89..82cec34336 100644 --- a/configs/T1040RDB_NAND_defconfig +++ b/configs/T1040RDB_NAND_defconfig @@ -7,6 +7,8 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T1040RDB=y +CONFIG_SYS_CUSTOM_LDSCRIPT=y +CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -- cgit