Use TARGET_P1020UTM instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and config macros.
Remove macro CONFIG_P1020UTM.
Signed-off-by: York Sun york.sun@nxp.com ---
arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ board/freescale/p1_p2_rdb_pc/Kconfig | 3 ++- board/freescale/p1_p2_rdb_pc/ddr.c | 2 +- configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 4 ++-- configs/P1020UTM-PC_36BIT_defconfig | 3 +-- configs/P1020UTM-PC_SDCARD_defconfig | 4 ++-- configs/P1020UTM-PC_defconfig | 3 +-- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 1 - 9 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index d7414e2..14ef053 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -130,6 +130,10 @@ config TARGET_P1020RDB_PD select SUPPORT_SPL select SUPPORT_TPL
+config TARGET_P1020UTM + bool "Support P1020UTM" + select SUPPORT_SPL + select SUPPORT_TPL
config TARGET_P1_P2_RDB_PC bool "Support p1_p2_rdb_pc" diff --git a/board/freescale/p1_p2_rdb_pc/Kconfig b/board/freescale/p1_p2_rdb_pc/Kconfig index c46e04e..7deb2ae 100644 --- a/board/freescale/p1_p2_rdb_pc/Kconfig +++ b/board/freescale/p1_p2_rdb_pc/Kconfig @@ -1,7 +1,8 @@ if TARGET_P1_P2_RDB_PC || \ TARGET_P1020MBG || \ TARGET_P1020RDB_PC || \ - TARGET_P1020RDB_PD + TARGET_P1020RDB_PD || \ + TARGET_P1020UTM
config SYS_BOARD default "p1_p2_rdb_pc" diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c index 8291c18..6dc3957 100644 --- a/board/freescale/p1_p2_rdb_pc/ddr.c +++ b/board/freescale/p1_p2_rdb_pc/ddr.c @@ -16,7 +16,7 @@ #ifdef CONFIG_SYS_DDR_RAW_TIMING #if defined(CONFIG_P1020RDB_PROTO) || \ defined(CONFIG_P1021RDB) || \ - defined(CONFIG_P1020UTM) + defined(CONFIG_TARGET_P1020UTM) /* Micron MT41J256M8_187E */ dimm_params_t ddr_raw_timing = { .n_ranks = 1, diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig index 1e7c608..19e448d 100644 --- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig +++ b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig @@ -6,13 +6,13 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P1020UTM=y CONFIG_PHYS_64BIT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig index 7044b78..aa266f9 100644 --- a/configs/P1020UTM-PC_36BIT_defconfig +++ b/configs/P1020UTM-PC_36BIT_defconfig @@ -1,12 +1,11 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P1020UTM=y CONFIG_PHYS_64BIT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P1020UTM" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig index 20353a7..c03c7c5 100644 --- a/configs/P1020UTM-PC_SDCARD_defconfig +++ b/configs/P1020UTM-PC_SDCARD_defconfig @@ -6,12 +6,12 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P1020UTM=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig index 9f70afd..c47d514 100644 --- a/configs/P1020UTM-PC_defconfig +++ b/configs/P1020UTM-PC_defconfig @@ -1,11 +1,10 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P1020UTM=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P1020UTM" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 010a9ed..97a0b19 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -21,7 +21,7 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif
-#if defined(CONFIG_P1020UTM) +#if defined(CONFIG_TARGET_P1020UTM) #define CONFIG_BOARDNAME "P1020UTM-PC" #define CONFIG_P1020 #define __SW_BOOT_MASK 0x03 @@ -409,7 +409,7 @@ #if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_TARGET_P1020RDB_PD)) #define CONFIG_SYS_MAX_FLASH_SECT 512 /* 64M */ #define CONFIG_SYS_FLASH_BASE 0xec000000 -#elif defined(CONFIG_P1020UTM) +#elif defined(CONFIG_TARGET_P1020UTM) #define CONFIG_SYS_MAX_FLASH_SECT 256 /* 32M */ #define CONFIG_SYS_FLASH_BASE 0xee000000 #else diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6d7b5ff..3b70543 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3384,7 +3384,6 @@ CONFIG_OS_ENV_ADDR CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_P1020 -CONFIG_P1020UTM CONFIG_P1021 CONFIG_P1021RDB CONFIG_P1024