Move existing use of CONFIG_SPL_DM to Kconfig
authorSimon Glass <sjg@chromium.org>
Tue, 13 Sep 2016 05:18:28 +0000 (23:18 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 16 Sep 2016 21:03:41 +0000 (17:03 -0400)
A few boards define this in a header file which is incorrect. It means that
Kconfig options that rely on this cannot be used. Move it.

Note that quite a few boards defined this options but do not appear to
actually use SPL:

BSC9132QDS_NOR_DDRCLK100_SECURE
BSC9132QDS_NOR_DDRCLK133_SECURE
BSC9132QDS_SDCARD_DDRCLK100_SECURE
BSC9132QDS_SDCARD_DDRCLK133_SECURE
BSC9132QDS_SPIFLASH_DDRCLK100_SECURE
BSC9132QDS_SPIFLASH_DDRCLK133_SECURE
C29XPCIE_NOR_SECBOOT
P1010RDB-PA_36BIT_NAND_SECBOOT
P1010RDB-PA_36BIT_SPIFLASH_SECBOOT
P1010RDB-PA_NAND_SECBOOT
P1010RDB-PA_NOR_SECBOOT
P1010RDB-PB_36BIT_NOR_SECBOOT
P1010RDB-PB_36BIT_SPIFLASH_SECBOOT
P1010RDB-PB_NAND_SECBOOT
P1010RDB-PB_NOR_SECBOOT
P3041DS_SECURE_BOOT
P4080DS_SECURE_BOOT
P5020DS_NAND_SECURE_BOOT
P5040DS_SECURE_BOOT
T1023RDB_SECURE_BOOT
T1024QDS_DDR4_SECURE_BOOT
T1024QDS_SECURE_BOOT
T1024RDB_SECURE_BOOT
T1040RDB_SECURE_BOOT
T1042D4RDB_SECURE_BOOT
T1042RDB_SECURE_BOOT
T2080QDS_SECURE_BOOT
T2080RDB_SECURE_BOOT
T4160QDS_SECURE_BOOT
T4240QDS_SECURE_BOOT
ls1021aqds_nor_SECURE_BOOT
ls1021atwr_nor_SECURE_BOOT
ls1043ardb_SECURE_BOOT

For these boards CONFIG_SPL_DM will no-longer be defined in SPL. But since
they apparently don't have an SPL, this should not matter.

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/arm/include/asm/fsl_secure_boot.h
arch/powerpc/include/asm/fsl_secure_boot.h
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig

index 1d379c7ff0e7716b8e1c011953c6b181e1eb24b8..fd25e1567120b650a4fa4f945e73f2f2a85eeb50 100644 (file)
@@ -27,7 +27,6 @@
 #endif
 
 #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_DM                  1
 #define CONFIG_SPL_CRYPTO_SUPPORT
 #define CONFIG_SPL_HASH_SUPPORT
 #define CONFIG_SPL_RSA
index 01255d82dbf22d272a3bdd4e4546e87a45af6470..e8da4c7d7a5bee175e594fc1f7f3987dee4d3a30 100644 (file)
@@ -80,7 +80,6 @@
 
 #ifdef CONFIG_CHAIN_OF_TRUST
 
-#define CONFIG_SPL_DM                  1
 #define CONFIG_SPL_CRYPTO_SUPPORT
 #define CONFIG_SPL_HASH_SUPPORT
 #define CONFIG_SPL_RSA
index 06815e9d1924456c9a84365b0cf2fadcac46c2af..86387aa912e3d07ee7f50420c8b0ffd670b78737 100644 (file)
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
+CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
index 797605a0c5c16aabb797bc1cff08a09b848dca62..e0926f31504e82b5bc4acdbfda74484392bf8380 100644 (file)
@@ -21,6 +21,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
+CONFIG_SPL_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y