Commit 3433a693a9cf143b6e5f0d7190b4df4d1c82418e

Authored by Simon Glass
Committed by Tom Rini
1 parent f73329ee82

Move existing use of CONFIG_SPL_DM to Kconfig

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>

Showing 4 changed files with 2 additions and 2 deletions Side-by-side Diff

arch/arm/include/asm/fsl_secure_boot.h
... ... @@ -27,7 +27,6 @@
27 27 #endif
28 28  
29 29 #define CONFIG_SPL_BOARD_INIT
30   -#define CONFIG_SPL_DM 1
31 30 #define CONFIG_SPL_CRYPTO_SUPPORT
32 31 #define CONFIG_SPL_HASH_SUPPORT
33 32 #define CONFIG_SPL_RSA
arch/powerpc/include/asm/fsl_secure_boot.h
... ... @@ -80,7 +80,6 @@
80 80  
81 81 #ifdef CONFIG_CHAIN_OF_TRUST
82 82  
83   -#define CONFIG_SPL_DM 1
84 83 #define CONFIG_SPL_CRYPTO_SUPPORT
85 84 #define CONFIG_SPL_HASH_SUPPORT
86 85 #define CONFIG_SPL_RSA
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
... ... @@ -20,6 +20,7 @@
20 20 CONFIG_CMD_EXT2=y
21 21 CONFIG_CMD_FAT=y
22 22 CONFIG_DM=y
  23 +CONFIG_SPL_DM=y
23 24 CONFIG_SPI_FLASH=y
24 25 CONFIG_SPI_FLASH_STMICRO=y
25 26 CONFIG_NETDEVICES=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
... ... @@ -21,6 +21,7 @@
21 21 CONFIG_CMD_EXT2=y
22 22 CONFIG_CMD_FAT=y
23 23 CONFIG_DM=y
  24 +CONFIG_SPL_DM=y
24 25 CONFIG_NETDEVICES=y
25 26 CONFIG_E1000=y
26 27 CONFIG_SYS_NS16550=y