leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: T1023: Remove macro CONFIG_PPC_T1023

Browse Source 
Replace CONFIG_PPC_T1023 with ARCH_T1023 in Kconfig and clean up
existing macros.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-18 12:35:47 -08:00
parent 08c752920d
commit 5ff3f41d04
13 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,6 +196,7 @@ config TARGET_T102XQDS
config TARGET_T1023RDB config TARGET_T1023RDB
bool "Support T1023RDB" bool "Support T1023RDB"
select ARCH_T1023
select SUPPORT_SPL select SUPPORT_SPL
select PHYS_64BIT select PHYS_64BIT
@ -354,6 +355,9 @@ config ARCH_P5040
config ARCH_QEMU_E500 config ARCH_QEMU_E500
bool bool
config ARCH_T1023
bool
source "board/freescale/b4860qds/Kconfig" source "board/freescale/b4860qds/Kconfig"
source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9131rdb/Kconfig"
source "board/freescale/bsc9132qds/Kconfig" source "board/freescale/bsc9132qds/Kconfig"

4
arch/powerpc/cpu/mpc85xx/Makefile
View File

@ -53,7 +53,7 @@ obj-$(CONFIG_PPC_T1040) += t1040_ids.o
obj-$(CONFIG_PPC_T1042) += t1040_ids.o obj-$(CONFIG_PPC_T1042) += t1040_ids.o
obj-$(CONFIG_PPC_T1020) += t1040_ids.o obj-$(CONFIG_PPC_T1020) += t1040_ids.o
obj-$(CONFIG_PPC_T1022) += t1040_ids.o obj-$(CONFIG_PPC_T1022) += t1040_ids.o
obj-$(CONFIG_PPC_T1023) += t1024_ids.o obj-$(CONFIG_ARCH_T1023) += t1024_ids.o
obj-$(CONFIG_PPC_T1024) += t1024_ids.o obj-$(CONFIG_PPC_T1024) += t1024_ids.o
obj-$(CONFIG_PPC_T2080) += t2080_ids.o obj-$(CONFIG_PPC_T2080) += t2080_ids.o
obj-$(CONFIG_PPC_T2081) += t2080_ids.o obj-$(CONFIG_PPC_T2081) += t2080_ids.o
@ -96,7 +96,7 @@ obj-$(CONFIG_PPC_T1040) += t1040_serdes.o
obj-$(CONFIG_PPC_T1042) += t1040_serdes.o obj-$(CONFIG_PPC_T1042) += t1040_serdes.o
obj-$(CONFIG_PPC_T1020) += t1040_serdes.o obj-$(CONFIG_PPC_T1020) += t1040_serdes.o
obj-$(CONFIG_PPC_T1022) += t1040_serdes.o obj-$(CONFIG_PPC_T1022) += t1040_serdes.o
obj-$(CONFIG_PPC_T1023) += t1024_serdes.o obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o
obj-$(CONFIG_PPC_T1024) += t1024_serdes.o obj-$(CONFIG_PPC_T1024) += t1024_serdes.o
obj-$(CONFIG_PPC_T2080) += t2080_serdes.o obj-$(CONFIG_PPC_T2080) += t2080_serdes.o
obj-$(CONFIG_PPC_T2081) += t2080_serdes.o obj-$(CONFIG_PPC_T2081) += t2080_serdes.o

4
arch/powerpc/cpu/mpc85xx/speed.c
View File

@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081)
#define FM1_CLK_SEL 0xe0000000 #define FM1_CLK_SEL 0xe0000000
#define FM1_CLK_SHIFT 29 #define FM1_CLK_SHIFT 29
#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) #elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023)
#define FM1_CLK_SEL 0x00000007 #define FM1_CLK_SEL 0x00000007
#define FM1_CLK_SHIFT 0 #define FM1_CLK_SHIFT 0
#else #else
@ -216,7 +216,7 @@ void get_sys_info(sys_info_t *sys_info)
#define FM1_CLK_SHIFT 26 #define FM1_CLK_SHIFT 26
#endif #endif
#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) #if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
#if defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) #if defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023)
rcw_tmp = in_be32(&gur->rcwsr[15]) - 4; rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
#else #else
rcw_tmp = in_be32(&gur->rcwsr[7]); rcw_tmp = in_be32(&gur->rcwsr[7]);

4
arch/powerpc/include/asm/config_mpc85xx.h
View File

@ -730,7 +730,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
#define CONFIG_SYS_FSL_ERRATUM_A008378 #define CONFIG_SYS_FSL_ERRATUM_A008378
#define CONFIG_SYS_FSL_ERRATUM_A009663 #define CONFIG_SYS_FSL_ERRATUM_A009663
#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) ||\ #elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023) ||\
defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
#define CONFIG_E5500 #define CONFIG_E5500
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
@ -741,7 +741,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
#ifdef CONFIG_SYS_FSL_DDR4 #ifdef CONFIG_SYS_FSL_DDR4
#define CONFIG_SYS_FSL_DDRC_GEN4 #define CONFIG_SYS_FSL_DDRC_GEN4
#endif #endif
#if defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) #if defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023)
#define CONFIG_MAX_CPUS 2 #define CONFIG_MAX_CPUS 2
#elif defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #elif defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
#define CONFIG_MAX_CPUS 1 #define CONFIG_MAX_CPUS 1

2
arch/powerpc/include/asm/fsl_secure_boot.h
View File

@ -34,7 +34,7 @@
defined(CONFIG_T104xD4QDS) || \ defined(CONFIG_T104xD4QDS) || \
defined(CONFIG_T104xRDB) || \ defined(CONFIG_T104xRDB) || \
defined(CONFIG_T104xD4RDB) || \ defined(CONFIG_T104xD4RDB) || \
defined(CONFIG_PPC_T1023) || \ defined(CONFIG_ARCH_T1023) || \
defined(CONFIG_PPC_T1024) defined(CONFIG_PPC_T1024)
#ifndef CONFIG_SYS_RAMBOOT #ifndef CONFIG_SYS_RAMBOOT
#define CONFIG_SYS_CPC_REINIT_F #define CONFIG_SYS_CPC_REINIT_F

2
arch/powerpc/include/asm/immap_85xx.h
View File

@ -1797,7 +1797,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
#define PXCKEN_MASK 0x80000000 #define PXCKEN_MASK 0x80000000
#define PXCK_MASK 0x00FF0000 #define PXCK_MASK 0x00FF0000
#define PXCK_BITS_START 16 #define PXCK_BITS_START 16
#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) || \ #elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023) || \
defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
#define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xff800000 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xff800000
#define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 23 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 23

2
configs/T1023RDB_NAND_defconfig
View File

@ -12,7 +12,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="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SPL=y CONFIG_SPL=y

2
configs/T1023RDB_SDCARD_defconfig
View File

@ -12,7 +12,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="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SPL=y CONFIG_SPL=y

2
configs/T1023RDB_SECURE_BOOT_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="PPC_T1023,T1023RDB,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,SECURE_BOOT"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

2
configs/T1023RDB_SPIFLASH_defconfig
View File

@ -13,7 +13,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="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SPL=y CONFIG_SPL=y

2
configs/T1023RDB_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="PPC_T1023,T1023RDB" CONFIG_SYS_EXTRA_OPTIONS="T1023RDB"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

2
drivers/net/fm/Makefile
View File

@ -28,7 +28,7 @@ obj-$(CONFIG_PPC_T1040) += t1040.o
obj-$(CONFIG_PPC_T1042) += t1040.o obj-$(CONFIG_PPC_T1042) += t1040.o
obj-$(CONFIG_PPC_T1020) += t1040.o obj-$(CONFIG_PPC_T1020) += t1040.o
obj-$(CONFIG_PPC_T1022) += t1040.o obj-$(CONFIG_PPC_T1022) += t1040.o
obj-$(CONFIG_PPC_T1023) += t1024.o obj-$(CONFIG_ARCH_T1023) += t1024.o
obj-$(CONFIG_PPC_T1024) += t1024.o obj-$(CONFIG_PPC_T1024) += t1024.o
obj-$(CONFIG_PPC_T2080) += t2080.o obj-$(CONFIG_PPC_T2080) += t2080.o
obj-$(CONFIG_PPC_T2081) += t2080.o obj-$(CONFIG_PPC_T2081) += t2080.o

1
scripts/config_whitelist.txt
View File

@ -3640,7 +3640,6 @@ CONFIG_PPC4xx_EMAC
CONFIG_PPC64BRIDGE CONFIG_PPC64BRIDGE
CONFIG_PPC_CLUSTER_START CONFIG_PPC_CLUSTER_START
CONFIG_PPC_SPINTABLE_COMPATIBLE CONFIG_PPC_SPINTABLE_COMPATIBLE
CONFIG_PPC_T1023
CONFIG_PPC_T1024 CONFIG_PPC_T1024
CONFIG_PPC_T1040 CONFIG_PPC_T1040
CONFIG_PPC_T1042 CONFIG_PPC_T1042