Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc: C29XPCIE: Remove macro CONFIG_C29XPCIE

Browse source 
Use CONFIG_TARGET_C29XPCIE instead.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-16 11:51:24 -08:00
parent 4fd64746b0
commit ebccf25518
7 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/powerpc/include/asm/fsl_secure_boot.h
View file

@ -18,7 +18,7 @@
#define CONFIG_SYS_PBI_FLASH_BASE 0xc0000000 #define CONFIG_SYS_PBI_FLASH_BASE 0xc0000000
#elif defined(CONFIG_TARGET_BSC9132QDS) #elif defined(CONFIG_TARGET_BSC9132QDS)
#define CONFIG_SYS_PBI_FLASH_BASE 0xc8000000 #define CONFIG_SYS_PBI_FLASH_BASE 0xc8000000
#elif defined(CONFIG_C29XPCIE) #elif defined(CONFIG_TARGET_C29XPCIE)
#define CONFIG_SYS_PBI_FLASH_BASE 0xcc000000 #define CONFIG_SYS_PBI_FLASH_BASE 0xcc000000
#else #else
#define CONFIG_SYS_PBI_FLASH_BASE 0xce000000 #define CONFIG_SYS_PBI_FLASH_BASE 0xce000000
@ -54,7 +54,7 @@
#endif #endif
#endif #endif
#if defined(CONFIG_C29XPCIE) #if defined(CONFIG_TARGET_C29XPCIE)
#define CONFIG_KEY_REVOCATION #define CONFIG_KEY_REVOCATION
#endif #endif
@ -140,7 +140,7 @@
#define CONFIG_BOOTSCRIPT_HDR_ADDR 0xe8e00000 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xe8e00000
#elif defined(CONFIG_TARGET_BSC9132QDS) #elif defined(CONFIG_TARGET_BSC9132QDS)
#define CONFIG_BOOTSCRIPT_HDR_ADDR 0x88020000 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0x88020000
#elif defined(CONFIG_C29XPCIE) #elif defined(CONFIG_TARGET_C29XPCIE)
#define CONFIG_BOOTSCRIPT_HDR_ADDR 0xec020000 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xec020000
#else #else
#define CONFIG_BOOTSCRIPT_HDR_ADDR 0xee020000 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xee020000

2
configs/C29XPCIE_NAND_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,NAND" CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SPL=y CONFIG_SPL=y

2
configs/C29XPCIE_NOR_SECBOOT_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

2
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,SPIFLASH,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SECURE_BOOT"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

2
configs/C29XPCIE_SPIFLASH_defconfig
View file

@ -5,7 +5,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,SPIFLASH" CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/C29XPCIE_defconfig
View file

@ -5,7 +5,6 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
scripts/config_whitelist.txt
View file

@ -467,7 +467,6 @@ CONFIG_BUILD_ENVCRC
CONFIG_BUILD_TARGET CONFIG_BUILD_TARGET
CONFIG_BUS_WIDTH CONFIG_BUS_WIDTH
CONFIG_BZIP2 CONFIG_BZIP2
CONFIG_C29XPCIE
CONFIG_CACHELINE_ALIGNED_L1 CONFIG_CACHELINE_ALIGNED_L1
CONFIG_CADDY2 CONFIG_CADDY2
CONFIG_CALXEDA_XGMAC CONFIG_CALXEDA_XGMAC