Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: P1020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig

Browse Source 
Use TARGET_P1020RDB_PC instead of sharing with TARGET_P1_P2_RDB_PC
to simplify Kconfig and config macros.

Remove macro CONFIG_P1020RDB_PC.

Signed-off-by: York Sun <york.sun@nxp.com>
master
York Sun 9 years ago
parent fedae6ebaf
commit aa14620c2e
14 changed files with 26 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      arch/powerpc/cpu/mpc85xx/Kconfig
  2. 5
      board/freescale/p1_p2_rdb_pc/Kconfig
  3. 2
      board/freescale/p1_p2_rdb_pc/ddr.c
  4. 4
      board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
  5. 4
      configs/P1020RDB-PC_36BIT_NAND_defconfig
  6. 4
      configs/P1020RDB-PC_36BIT_SDCARD_defconfig
  7. 4
      configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
  8. 3
      configs/P1020RDB-PC_36BIT_defconfig
  9. 4
      configs/P1020RDB-PC_NAND_defconfig
  10. 4
      configs/P1020RDB-PC_SDCARD_defconfig
  11. 4
      configs/P1020RDB-PC_SPIFLASH_defconfig
  12. 3
      configs/P1020RDB-PC_defconfig
  13. 2
      include/configs/p1_p2_rdb_pc.h
  14. 1
      scripts/config_whitelist.txt

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

@ -120,6 +120,11 @@ config TARGET_P1020MBG
bool "Support P1020MBG-PC" bool "Support P1020MBG-PC"
select SUPPORT_SPL select SUPPORT_SPL
select SUPPORT_TPL select SUPPORT_TPL
config TARGET_P1020RDB_PC
bool "Support P1020RDB-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"

5
board/freescale/p1_p2_rdb_pc/Kconfig
Unescape View File

@ -1,5 +1,6 @@
if TARGET_P1_P2_RDB_PC || \ if TARGET_P1_P2_RDB_PC || \
TARGET_P1020MBG TARGET_P1020MBG || \
TARGET_P1020RDB_PC
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
Unescape View File

@ -109,7 +109,7 @@ dimm_params_t ddr_raw_timing = {
.refresh_rate_ps = 7800000, .refresh_rate_ps = 7800000,
.tfaw_ps = 37500, .tfaw_ps = 37500,
}; };
#elif defined(CONFIG_P1020RDB_PC) #elif defined(CONFIG_TARGET_P1020RDB_PC)
/* /*
* Samsung K4B2G0846C-HCF8 * Samsung K4B2G0846C-HCF8
* The following timing are for "downshift" * The following timing are for "downshift"

4
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
Unescape View File

@ -428,7 +428,7 @@ int ft_board_setup(void *blob, bd_t *bd)
{ {
phys_addr_t base; phys_addr_t base;
phys_size_t size; phys_size_t size;
#if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_P1020RDB_PC) #if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_TARGET_P1020RDB_PC)
const char *soc_usb_compat = "fsl-usb2-dr"; const char *soc_usb_compat = "fsl-usb2-dr";
int usb_err, usb1_off, usb2_off; int usb_err, usb1_off, usb2_off;
#endif #endif
@ -478,7 +478,7 @@ int ft_board_setup(void *blob, bd_t *bd)
} }
#endif #endif
#if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_P1020RDB_PC) #if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_TARGET_P1020RDB_PC)
/* Delete USB2 node as it is muxed with eLBC */ /* Delete USB2 node as it is muxed with eLBC */
usb1_off = fdt_node_offset_by_compatible(blob, -1, usb1_off = fdt_node_offset_by_compatible(blob, -1,
soc_usb_compat); soc_usb_compat);

4
configs/P1020RDB-PC_36BIT_NAND_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC,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/P1020RDB-PC_36BIT_SDCARD_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC,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/P1020RDB-PC_36BIT_SPIFLASH_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC,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/P1020RDB-PC_36BIT_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

4
configs/P1020RDB-PC_NAND_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC,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/P1020RDB-PC_SDCARD_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC,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/P1020RDB-PC_SPIFLASH_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC,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/P1020RDB-PC_defconfig
Unescape 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_P1020RDB_PC=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="P1020RDB_PC"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

2
include/configs/p1_p2_rdb_pc.h
Unescape View File

@ -30,7 +30,7 @@
#define CONFIG_SYS_L2_SIZE (256 << 10) #define CONFIG_SYS_L2_SIZE (256 << 10)
#endif #endif
#if defined(CONFIG_P1020RDB_PC) #if defined(CONFIG_TARGET_P1020RDB_PC)
#define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_BOARDNAME "P1020RDB-PC"
#define CONFIG_NAND_FSL_ELBC #define CONFIG_NAND_FSL_ELBC
#define CONFIG_P1020 #define CONFIG_P1020

1
scripts/config_whitelist.txt
Unescape View File

@ -3384,7 +3384,6 @@ CONFIG_OS_ENV_ADDR
CONFIG_OTHBOOTARGS CONFIG_OTHBOOTARGS
CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_OVERWRITE_ETHADDR_ONCE
CONFIG_P1020 CONFIG_P1020
CONFIG_P1020RDB_PC
CONFIG_P1020RDB_PD CONFIG_P1020RDB_PD
CONFIG_P1020UTM CONFIG_P1020UTM
CONFIG_P1021 CONFIG_P1021

Write Preview
Loading…
Cancel
Save