提交 e5d5f5a8 编写于 作者: Y York Sun

powerpc: T1024: Remove macro CONFIG_PPC_T1024

Replace CONFIG_PPC_T1024 with ARCH_T1024 in Kconfig and clean up
existing macros.
Signed-off-by: NYork Sun <york.sun@nxp.com>
上级 6f53bd47
...@@ -191,6 +191,7 @@ config TARGET_QEMU_PPCE500 ...@@ -191,6 +191,7 @@ config TARGET_QEMU_PPCE500
config TARGET_T1024QDS config TARGET_T1024QDS
bool "Support T1024QDS" bool "Support T1024QDS"
select ARCH_T1024
select SUPPORT_SPL select SUPPORT_SPL
select PHYS_64BIT select PHYS_64BIT
...@@ -202,6 +203,7 @@ config TARGET_T1023RDB ...@@ -202,6 +203,7 @@ config TARGET_T1023RDB
config TARGET_T1024RDB config TARGET_T1024RDB
bool "Support T1024RDB" bool "Support T1024RDB"
select ARCH_T1024
select SUPPORT_SPL select SUPPORT_SPL
select PHYS_64BIT select PHYS_64BIT
...@@ -358,6 +360,9 @@ config ARCH_QEMU_E500 ...@@ -358,6 +360,9 @@ config ARCH_QEMU_E500
config ARCH_T1023 config ARCH_T1023
bool bool
config ARCH_T1024
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"
......
...@@ -54,7 +54,7 @@ obj-$(CONFIG_PPC_T1042) += t1040_ids.o ...@@ -54,7 +54,7 @@ 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_ARCH_T1023) += t1024_ids.o obj-$(CONFIG_ARCH_T1023) += t1024_ids.o
obj-$(CONFIG_PPC_T1024) += t1024_ids.o obj-$(CONFIG_ARCH_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
...@@ -97,7 +97,7 @@ obj-$(CONFIG_PPC_T1042) += t1040_serdes.o ...@@ -97,7 +97,7 @@ 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_ARCH_T1023) += t1024_serdes.o obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o
obj-$(CONFIG_PPC_T1024) += t1024_serdes.o obj-$(CONFIG_ARCH_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
......
...@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info) ...@@ -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_ARCH_T1023) #elif defined(CONFIG_ARCH_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) ...@@ -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_ARCH_T1023) #if defined(CONFIG_ARCH_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]);
......
...@@ -730,7 +730,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) ...@@ -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_ARCH_T1023) ||\ #elif defined(CONFIG_ARCH_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) ...@@ -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_ARCH_T1023) #if defined(CONFIG_ARCH_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
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
defined(CONFIG_T104xRDB) || \ defined(CONFIG_T104xRDB) || \
defined(CONFIG_T104xD4RDB) || \ defined(CONFIG_T104xD4RDB) || \
defined(CONFIG_ARCH_T1023) || \ defined(CONFIG_ARCH_T1023) || \
defined(CONFIG_PPC_T1024) defined(CONFIG_ARCH_T1024)
#ifndef CONFIG_SYS_RAMBOOT #ifndef CONFIG_SYS_RAMBOOT
#define CONFIG_SYS_CPC_REINIT_F #define CONFIG_SYS_CPC_REINIT_F
#endif #endif
......
...@@ -1797,7 +1797,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) ...@@ -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_ARCH_T1023) || \ #elif defined(CONFIG_ARCH_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
......
...@@ -152,7 +152,7 @@ static int board_mux_lane_to_slot(void) ...@@ -152,7 +152,7 @@ static int board_mux_lane_to_slot(void)
return 0; return 0;
} }
#ifdef CONFIG_PPC_T1024 #ifdef CONFIG_ARCH_T1024
static void board_mux_setup(void) static void board_mux_setup(void)
{ {
u8 brdcfg15; u8 brdcfg15;
...@@ -332,7 +332,7 @@ unsigned long get_board_ddr_clk(void) ...@@ -332,7 +332,7 @@ unsigned long get_board_ddr_clk(void)
#define NUM_SRDS_PLL 2 #define NUM_SRDS_PLL 2
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CONFIG_PPC_T1024 #ifdef CONFIG_ARCH_T1024
board_mux_setup(); board_mux_setup();
#endif #endif
return 0; return 0;
......
...@@ -7,7 +7,7 @@ CONFIG_FIT=y ...@@ -7,7 +7,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_T1024,SYS_FSL_DDR4,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -6,7 +6,7 @@ CONFIG_FIT=y ...@@ -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_T1024,SYS_FSL_DDR4" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -13,7 +13,7 @@ CONFIG_FIT=y ...@@ -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_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -13,7 +13,7 @@ CONFIG_FIT=y ...@@ -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_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -7,7 +7,7 @@ CONFIG_FIT=y ...@@ -7,7 +7,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_T1024,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -14,7 +14,7 @@ CONFIG_FIT=y ...@@ -14,7 +14,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_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -6,7 +6,6 @@ CONFIG_FIT=y ...@@ -6,7 +6,6 @@ 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_T1024"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
......
...@@ -12,7 +12,7 @@ CONFIG_FIT=y ...@@ -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_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_SYS_EXTRA_OPTIONS="T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
......
...@@ -12,7 +12,7 @@ CONFIG_FIT=y ...@@ -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_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_SYS_EXTRA_OPTIONS="T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
......
...@@ -6,7 +6,7 @@ CONFIG_FIT=y ...@@ -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_T1024,T1024RDB,SECURE_BOOT" CONFIG_SYS_EXTRA_OPTIONS="T1024RDB,SECURE_BOOT"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
......
...@@ -13,7 +13,7 @@ CONFIG_FIT=y ...@@ -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_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_SYS_EXTRA_OPTIONS="T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
......
...@@ -5,7 +5,7 @@ CONFIG_FIT=y ...@@ -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_T1024,T1024RDB" CONFIG_SYS_EXTRA_OPTIONS="T1024RDB"
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
......
...@@ -29,7 +29,7 @@ obj-$(CONFIG_PPC_T1042) += t1040.o ...@@ -29,7 +29,7 @@ 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_ARCH_T1023) += t1024.o obj-$(CONFIG_ARCH_T1023) += t1024.o
obj-$(CONFIG_PPC_T1024) += t1024.o obj-$(CONFIG_ARCH_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
obj-$(CONFIG_PPC_T4240) += t4240.o obj-$(CONFIG_PPC_T4240) += t4240.o
......
...@@ -497,7 +497,7 @@ unsigned long get_board_ddr_clk(void); ...@@ -497,7 +497,7 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* Video */ /* Video */
#ifdef CONFIG_PPC_T1024 /* no DIU on T1023 */ #ifdef CONFIG_ARCH_T1024 /* no DIU on T1023 */
#define CONFIG_FSL_DIU_FB #define CONFIG_FSL_DIU_FB
#ifdef CONFIG_FSL_DIU_FB #ifdef CONFIG_FSL_DIU_FB
#define CONFIG_FSL_DIU_CH7301 #define CONFIG_FSL_DIU_CH7301
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
/* support deep sleep */ /* support deep sleep */
#ifdef CONFIG_PPC_T1024 #ifdef CONFIG_ARCH_T1024
#define CONFIG_DEEP_SLEEP #define CONFIG_DEEP_SLEEP
#endif #endif
#if defined(CONFIG_DEEP_SLEEP) #if defined(CONFIG_DEEP_SLEEP)
...@@ -858,7 +858,7 @@ unsigned long get_board_ddr_clk(void); ...@@ -858,7 +858,7 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define __USB_PHY_TYPE utmi #define __USB_PHY_TYPE utmi
#ifdef CONFIG_PPC_T1024 #ifdef CONFIG_ARCH_T1024
#define CONFIG_BOARDNAME t1024rdb #define CONFIG_BOARDNAME t1024rdb
#define BANK_INTLV cs0_cs1 #define BANK_INTLV cs0_cs1
#else #else
......
...@@ -3640,7 +3640,6 @@ CONFIG_PPC4xx_EMAC ...@@ -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_T1024
CONFIG_PPC_T1040 CONFIG_PPC_T1040
CONFIG_PPC_T1042 CONFIG_PPC_T1042
CONFIG_PPC_T2080 CONFIG_PPC_T2080
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册