powerpc: P1024: Remove CONFIG_P1024

Replace CONFIG_P1024 with ARCH_P1024 in Kconfig and clean up
existing macros.

Signed-off-by: York Sun <york.sun@nxp.com>
master
York Sun 8 years ago
parent a990799d52
commit 52b6f13d2c
  1. 4
      arch/powerpc/cpu/mpc85xx/Kconfig
  2. 2
      arch/powerpc/cpu/mpc85xx/Makefile
  3. 2
      arch/powerpc/include/asm/config_mpc85xx.h
  4. 1
      include/configs/p1_p2_rdb_pc.h
  5. 1
      scripts/config_whitelist.txt

@ -150,6 +150,7 @@ config TARGET_P1024RDB
bool "Support P1024RDB"
select SUPPORT_SPL
select SUPPORT_TPL
select ARCH_P1024
config TARGET_P1025RDB
bool "Support P1025RDB"
@ -297,6 +298,9 @@ config ARCH_P1022
config ARCH_P1023
bool
config ARCH_P1024
bool
source "board/freescale/b4860qds/Kconfig"
source "board/freescale/bsc9131rdb/Kconfig"
source "board/freescale/bsc9132qds/Kconfig"

@ -78,7 +78,7 @@ obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1021) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o
obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o
obj-$(CONFIG_P1024) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o
obj-$(CONFIG_P1025) += p1021_serdes.o
obj-$(CONFIG_P2010) += p2020_serdes.o
obj-$(CONFIG_P2020) += p2020_serdes.o

@ -250,7 +250,7 @@
#define CONFIG_SYS_FSL_A004447_SVR_REV 0x11
/* P1024 is lower end variant of P1020 */
#elif defined(CONFIG_P1024)
#elif defined(CONFIG_ARCH_P1024)
#define CONFIG_MAX_CPUS 2
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 2

@ -116,7 +116,6 @@
#if defined(CONFIG_TARGET_P1024RDB)
#define CONFIG_BOARDNAME "P1024RDB"
#define CONFIG_NAND_FSL_ELBC
#define CONFIG_P1024
#define CONFIG_SLIC
#define __SW_BOOT_MASK 0xf3
#define __SW_BOOT_NOR 0x00

@ -3383,7 +3383,6 @@ CONFIG_OS2_ENV_ADDR
CONFIG_OS_ENV_ADDR
CONFIG_OTHBOOTARGS
CONFIG_OVERWRITE_ETHADDR_ONCE
CONFIG_P1024
CONFIG_P1025
CONFIG_P2020
CONFIG_P2041RDB

Loading…
Cancel
Save