From fedae6ebafa79555693e5af1953aacb637ec24b9 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 13:12:38 -0800 Subject: powerpc: P1020MBG: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020MBG instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and other macros. Remove macro CONFIG_P1020MBG. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 523af5265f..25f19674de 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -10,7 +10,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#if defined(CONFIG_P1020MBG) +#if defined(CONFIG_TARGET_P1020MBG) #define CONFIG_BOARDNAME "P1020MBG-PC" #define CONFIG_P1020 #define CONFIG_VSC7385_ENET @@ -336,7 +336,7 @@ #define SPD_EEPROM_ADDRESS 0x52 #undef CONFIG_FSL_DDR_INTERACTIVE -#if (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) +#if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_P1020RDB_PD)) #define CONFIG_SYS_SDRAM_SIZE_LAW LAW_SIZE_2G #define CONFIG_CHIP_SELECTS_PER_CTRL 2 #else @@ -406,7 +406,7 @@ /* * Local Bus Definitions */ -#if (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) +#if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_P1020RDB_PD)) #define CONFIG_SYS_MAX_FLASH_SECT 512 /* 64M */ #define CONFIG_SYS_FLASH_BASE 0xec000000 #elif defined(CONFIG_P1020UTM) -- cgit v1.2.1 From aa14620c2ef46d6e3094a20189d819a05de67cd0 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 13:52:44 -0800 Subject: powerpc: P1020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig 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 --- include/configs/p1_p2_rdb_pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 25f19674de..edb5395f28 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -30,7 +30,7 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif -#if defined(CONFIG_P1020RDB_PC) +#if defined(CONFIG_TARGET_P1020RDB_PC) #define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 -- cgit v1.2.1 From f404b66ce118343b77ae58f78cccd6381b329dd1 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 13:53:33 -0800 Subject: powerpc: P1020RDB-PD: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020RDB_PD instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1020RDB_PD. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index edb5395f28..010a9edb93 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -58,7 +58,7 @@ * 010001 800 800 400 667 NAND Core0 boot; Core1 hold-off * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off */ -#if defined(CONFIG_P1020RDB_PD) +#if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_BOARDNAME "P1020RDB-PD" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 @@ -336,7 +336,7 @@ #define SPD_EEPROM_ADDRESS 0x52 #undef CONFIG_FSL_DDR_INTERACTIVE -#if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_P1020RDB_PD)) +#if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_TARGET_P1020RDB_PD)) #define CONFIG_SYS_SDRAM_SIZE_LAW LAW_SIZE_2G #define CONFIG_CHIP_SELECTS_PER_CTRL 2 #else @@ -406,7 +406,7 @@ /* * Local Bus Definitions */ -#if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_P1020RDB_PD)) +#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) @@ -455,7 +455,7 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_CMD_NAND -#if defined(CONFIG_P1020RDB_PD) +#if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #else #define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024) @@ -466,7 +466,7 @@ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */ -#if defined(CONFIG_P1020RDB_PD) +#if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_SYS_NAND_OR_PRELIM (OR_AM_32KB \ | OR_FCM_PGS /* Large Page*/ \ | OR_FCM_CSCT \ @@ -853,7 +853,7 @@ #endif #endif -#if defined(CONFIG_P1020RDB_PD) +#if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif -- cgit v1.2.1 From e9bc8a8fc1d53e8d674f85631578d33a40f2ddd8 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 13:53:54 -0800 Subject: powerpc: P1020UTM: Separate from P1_P2_RDB_P2 in Kconfig 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 --- include/configs/p1_p2_rdb_pc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 010a9edb93..97a0b19b68 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 -- cgit v1.2.1 From da439db35a556dc866bc25ce9eb47d7e4c6931f3 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 13:43:18 -0800 Subject: powerpc: P1021RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1021RDB instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and macros. Remove macro CONFIG_P1021RDB. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 97a0b19b68..f68feb3100 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -83,7 +83,7 @@ "57088k(fs),1m(vsc7385-firmware),1280k(u-boot)" #endif -#if defined(CONFIG_P1021RDB) +#if defined(CONFIG_TARGET_P1021RDB) #define CONFIG_BOARDNAME "P1021RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1021 -- cgit v1.2.1 From 4eedabfe9327ec5d8dc34a9f337a54022491baeb Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 13:48:39 -0800 Subject: powerpc: P1024RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1024RDB instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and macros. Remove macro CONFIG_P1024RDB. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index f68feb3100..eb885766d4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -118,7 +118,7 @@ #endif #endif -#if defined(CONFIG_P1024RDB) +#if defined(CONFIG_TARGET_P1024RDB) #define CONFIG_BOARDNAME "P1024RDB" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1024 -- cgit v1.2.1 From b0c98b4b9f2eb8180eb1c4cc4164294267d8ec27 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 14:10:14 -0800 Subject: powerpc: P1025RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1025RDB instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1025RDB. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index eb885766d4..6c2fdd1d79 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -131,7 +131,7 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif -#if defined(CONFIG_P1025RDB) +#if defined(CONFIG_TARGET_P1025RDB) #define CONFIG_BOARDNAME "P1025RDB" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1025 @@ -755,7 +755,7 @@ #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #endif /* CONFIG_QE */ -#ifdef CONFIG_P1025RDB +#ifdef CONFIG_TARGET_P1025RDB /* * QE UEC ethernet configuration */ @@ -789,7 +789,7 @@ #define CONFIG_SYS_UEC5_INTERFACE_TYPE PHY_INTERFACE_MODE_RMII #define CONFIG_SYS_UEC5_INTERFACE_SPEED 100 #endif /* CONFIG_UEC_ETH5 */ -#endif /* CONFIG_P1025RDB */ +#endif /* CONFIG_TARGET_P1025RDB */ /* * Environment -- cgit v1.2.1 From 8435aa777e35dedba79756194aa7bad8c549ea46 Mon Sep 17 00:00:00 2001 From: York Sun Date: Thu, 17 Nov 2016 14:19:18 -0800 Subject: powerpc: P2020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P2020RDB_PC instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P2020RDB. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 6c2fdd1d79..fa7d059156 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -148,8 +148,8 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif -#if defined(CONFIG_P2020RDB) -#define CONFIG_BOARDNAME "P2020RDB-PCA" +#if defined(CONFIG_TARGET_P2020RDB) +#define CONFIG_BOARDNAME "P2020RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P2020 #define CONFIG_VSC7385_ENET @@ -292,7 +292,7 @@ #define CONFIG_LIBATA #define CONFIG_LBA48 -#if defined(CONFIG_P2020RDB) +#if defined(CONFIG_TARGET_P2020RDB) #define CONFIG_SYS_CLK_FREQ 100000000 #else #define CONFIG_SYS_CLK_FREQ 66666666 @@ -351,7 +351,7 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Default settings for DDR3 */ -#ifndef CONFIG_P2020RDB +#ifndef CONFIG_TARGET_P2020RDB #define CONFIG_SYS_DDR_CS0_BNDS 0x0000003f #define CONFIG_SYS_DDR_CS0_CONFIG 0x80014302 #define CONFIG_SYS_DDR_CS0_CONFIG_2 0x00000000 @@ -584,7 +584,7 @@ #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024) #define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10) #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024) -#if defined(CONFIG_P2020RDB) +#if defined(CONFIG_TARGET_P2020RDB) #define CONFIG_SPL_RELOC_MALLOC_SIZE (364 << 10) #else #define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10) -- cgit v1.2.1 From 484fff6478cef43d78af7ed8e8865bd7750183de Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 10:02:14 -0800 Subject: powerpc: P1020: Remove macro CONFIG_P1020 Replace CONFIG_P1020 with ARCH_P1020 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index fa7d059156..c9191faa58 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -12,7 +12,6 @@ #if defined(CONFIG_TARGET_P1020MBG) #define CONFIG_BOARDNAME "P1020MBG-PC" -#define CONFIG_P1020 #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -23,7 +22,6 @@ #if defined(CONFIG_TARGET_P1020UTM) #define CONFIG_BOARDNAME "P1020UTM-PC" -#define CONFIG_P1020 #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0xe0 #define __SW_BOOT_SD 0x50 @@ -33,7 +31,6 @@ #if defined(CONFIG_TARGET_P1020RDB_PC) #define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P1020 #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -61,7 +58,6 @@ #if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_BOARDNAME "P1020RDB-PD" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P1020 #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 -- cgit v1.2.1 From a990799d5248d3bb92bf2a8919936e1562693b07 Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 10:59:02 -0800 Subject: powerpc: P1021: Remove macro CONFIG_P1021 Replace CONFIG_P1021 with ARCH_P1021 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index c9191faa58..5689113967 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -82,7 +82,6 @@ #if defined(CONFIG_TARGET_P1021RDB) #define CONFIG_BOARDNAME "P1021RDB-PC" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P1021 #define CONFIG_QE #define CONFIG_VSC7385_ENET #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Implement conversion of -- cgit v1.2.1 From 52b6f13d2c9c69d2841572e10515880bc59fed48 Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 11:00:57 -0800 Subject: powerpc: P1024: Remove CONFIG_P1024 Replace CONFIG_P1024 with ARCH_P1024 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 5689113967..119bd102ab 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -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 -- cgit v1.2.1 From 4167a67d5dfae995740bf5b7a7061756d8d985ad Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 11:05:38 -0800 Subject: powerpc: P1025: Remove macro CONFIG_P1025 Replace CONFIG_P1025 with ARCH_P1025 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 119bd102ab..3320a7e933 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -128,7 +128,6 @@ #if defined(CONFIG_TARGET_P1025RDB) #define CONFIG_BOARDNAME "P1025RDB" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P1025 #define CONFIG_QE #define CONFIG_SLIC -- cgit v1.2.1 From 4593637b135b6f8f46a086f73b6ee10849de11bf Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 11:08:43 -0800 Subject: powerpc: P2020: Remove macro CONFIG_P2020 Replace CONFIG_P2020 with ARCH_P2020 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- include/configs/p1_p2_rdb_pc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 3320a7e933..77f3d81593 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -144,7 +144,6 @@ #if defined(CONFIG_TARGET_P2020RDB) #define CONFIG_BOARDNAME "P2020RDB-PC" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P2020 #define CONFIG_VSC7385_ENET #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0xc8 -- cgit v1.2.1