Instead of defining ourself the config options in the config header, let's use the new Kconfig options for it.
Signed-off-by: Fabien Parent fparent@baylibre.com --- configs/omapl138_lcdk_defconfig | 1 + include/configs/omapl138_lcdk.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 52681c92d0..7199d90ae9 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5 +CONFIG_SPL_SELECT_BOOT_MEDIA=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 7c2f4141c9..f0b786f394 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -138,7 +138,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#ifdef CONFIG_USE_SPIFLASH -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x30000 #endif @@ -198,7 +197,6 @@ #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_SIMPLE -#define CONFIG_SPL_NAND_LOAD #endif
#ifdef CONFIG_SYS_USE_NOR