V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

powerpc: P2020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig 

Use TARGET_P2020RDB_PC instead of sharing with P1_P2_RDB_PC to
simplify Kconfig and config macros.

Remove macro CONFIG_P2020RDB.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-17 14:19:18 -08:00
parent b0c98b4b9f
commit 8435aa777e
13 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/cpu/mpc85xx/Kconfig
View File

@ -150,6 +150,11 @@ config TARGET_P1025RDB
select SUPPORT_SPL select SUPPORT_SPL
select SUPPORT_TPL select SUPPORT_TPL
config TARGET_P2020RDB
bool "Support P2020RDB-PC"
select SUPPORT_SPL
select SUPPORT_TPL
config TARGET_P1_P2_RDB_PC config TARGET_P1_P2_RDB_PC
bool "Support p1_p2_rdb_pc" bool "Support p1_p2_rdb_pc"
select SUPPORT_SPL select SUPPORT_SPL

3
board/freescale/p1_p2_rdb_pc/Kconfig
View File

@ -5,7 +5,8 @@ if TARGET_P1_P2_RDB_PC || \
TARGET_P1020UTM || \ TARGET_P1020UTM || \
TARGET_P1021RDB || \ TARGET_P1021RDB || \
TARGET_P1024RDB || \ TARGET_P1024RDB || \
TARGET_P1025RDB TARGET_P1025RDB || \
TARGET_P2020RDB
config SYS_BOARD config SYS_BOARD
default "p1_p2_rdb_pc" default "p1_p2_rdb_pc"

2
board/freescale/p1_p2_rdb_pc/ddr.c
View File

@ -47,7 +47,7 @@ dimm_params_t ddr_raw_timing = {
.refresh_rate_ps = 7800000, .refresh_rate_ps = 7800000,
.tfaw_ps = 37500, .tfaw_ps = 37500,
}; };
#elif defined(CONFIG_P2020RDB) #elif defined(CONFIG_TARGET_P2020RDB)
/* Micron MT41J128M16_15E */ /* Micron MT41J128M16_15E */
dimm_params_t ddr_raw_timing = { dimm_params_t ddr_raw_timing = {
.n_ranks = 1, .n_ranks = 1,

4
configs/P2020RDB-PC_36BIT_NAND_defconfig
View File

@ -2,13 +2,13 @@ CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_PHYS_64BIT=y CONFIG_PHYS_64BIT=y
CONFIG_FIT=y 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="P2020RDB,NAND" CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_TPL=y CONFIG_TPL=y

4
configs/P2020RDB-PC_36BIT_SDCARD_defconfig
View File

@ -6,13 +6,13 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_PHYS_64BIT=y CONFIG_PHYS_64BIT=y
CONFIG_FIT=y 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="P2020RDB,SDCARD" CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

4
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
View File

@ -7,13 +7,13 @@ CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_PHYS_64BIT=y CONFIG_PHYS_64BIT=y
CONFIG_FIT=y 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="P2020RDB,SPIFLASH" CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

3
configs/P2020RDB-PC_36BIT_defconfig
View File

@ -1,12 +1,11 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_PHYS_64BIT=y CONFIG_PHYS_64BIT=y
CONFIG_FIT=y 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="P2020RDB"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

4
configs/P2020RDB-PC_NAND_defconfig
View File

@ -2,12 +2,12 @@ CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_FIT=y 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="P2020RDB,NAND" CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_TPL=y CONFIG_TPL=y

4
configs/P2020RDB-PC_SDCARD_defconfig
View File

@ -6,12 +6,12 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_FIT=y 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="P2020RDB,SDCARD" CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

4
configs/P2020RDB-PC_SPIFLASH_defconfig
View File

@ -7,12 +7,12 @@ CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_FIT=y 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="P2020RDB,SPIFLASH" CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

3
configs/P2020RDB-PC_defconfig
View File

@ -1,11 +1,10 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y CONFIG_TARGET_P2020RDB=y
CONFIG_FIT=y 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="P2020RDB"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

10
include/configs/p1_p2_rdb_pc.h
View File

@ -148,8 +148,8 @@
#define CONFIG_SYS_L2_SIZE (256 << 10) #define CONFIG_SYS_L2_SIZE (256 << 10)
#endif #endif
#if defined(CONFIG_P2020RDB) #if defined(CONFIG_TARGET_P2020RDB)
#define CONFIG_BOARDNAME "P2020RDB-PCA" #define CONFIG_BOARDNAME "P2020RDB-PC"
#define CONFIG_NAND_FSL_ELBC #define CONFIG_NAND_FSL_ELBC
#define CONFIG_P2020 #define CONFIG_P2020
#define CONFIG_VSC7385_ENET #define CONFIG_VSC7385_ENET
@ -292,7 +292,7 @@
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_LBA48 #define CONFIG_LBA48
#if defined(CONFIG_P2020RDB) #if defined(CONFIG_TARGET_P2020RDB)
#define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_SYS_CLK_FREQ 100000000
#else #else
#define CONFIG_SYS_CLK_FREQ 66666666 #define CONFIG_SYS_CLK_FREQ 66666666
@ -351,7 +351,7 @@
#define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1
/* Default settings for DDR3 */ /* Default settings for DDR3 */
#ifndef CONFIG_P2020RDB #ifndef CONFIG_TARGET_P2020RDB
#define CONFIG_SYS_DDR_CS0_BNDS 0x0000003f #define CONFIG_SYS_DDR_CS0_BNDS 0x0000003f
#define CONFIG_SYS_DDR_CS0_CONFIG 0x80014302 #define CONFIG_SYS_DDR_CS0_CONFIG 0x80014302
#define CONFIG_SYS_DDR_CS0_CONFIG_2 0x00000000 #define CONFIG_SYS_DDR_CS0_CONFIG_2 0x00000000
@ -584,7 +584,7 @@
#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024) #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024)
#define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10) #define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10)
#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024) #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024)
#if defined(CONFIG_P2020RDB) #if defined(CONFIG_TARGET_P2020RDB)
#define CONFIG_SPL_RELOC_MALLOC_SIZE (364 << 10) #define CONFIG_SPL_RELOC_MALLOC_SIZE (364 << 10)
#else #else
#define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10) #define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10)

1
scripts/config_whitelist.txt
View File

@ -3388,7 +3388,6 @@ CONFIG_P1021
CONFIG_P1024 CONFIG_P1024
CONFIG_P1025 CONFIG_P1025
CONFIG_P2020 CONFIG_P2020
CONFIG_P2020RDB
CONFIG_P2041RDB CONFIG_P2041RDB
CONFIG_P3041DS CONFIG_P3041DS
CONFIG_P4080DS CONFIG_P4080DS