powerpc: P1014: Drop configuration for P1014

P1014 is a variant of P1010. There is no P1014 target configured.
Drop related macros. P1014 SoC is still supported.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index 707d784ca82bb51996a87cb285fc6bc9ac0b1a52..b52cf7935a0dc11ea72d5446e5ec2b8b72f27647 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -74,7 +74,6 @@ obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o
 obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o
 obj-$(CONFIG_ARCH_P1010)       += p1010_serdes.o
 obj-$(CONFIG_ARCH_P1011)       += p1021_serdes.o
-obj-$(CONFIG_P1014)    += p1010_serdes.o
 obj-$(CONFIG_P1017)    += p1023_serdes.o
 obj-$(CONFIG_P1020)    += p1021_serdes.o
 obj-$(CONFIG_P1021)    += p1021_serdes.o

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 83fa04ce0fac3bafa7aa97c525a994cd4ed6d4fe..4e63859817f543e0a1753004adc786e9fec0d19e 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -707,8 +707,7 @@ int get_clocks (void)
 #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
        gd->arch.sdhc_clk = sys_info.freq_sdhc / 2;
 #else
-#if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_ARCH_P1010) ||\
-       defined(CONFIG_P1014)
+#if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_ARCH_P1010)
        gd->arch.sdhc_clk = gd->bus_clk;
 #else
        gd->arch.sdhc_clk = gd->bus_clk / 2;

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 5b6c872a0888355effc3a0d553250fc46a8d5e45..31723eaa99a081cb9dcb1bcf445f79952b799293 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -183,23 +183,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_A004508
 #define CONFIG_SYS_FSL_ERRATUM_A005125
 
-#elif defined(CONFIG_P1014)
-#define CONFIG_MAX_CPUS                        1
-#define CONFIG_FSL_SDHC_V2_3
-#define CONFIG_SYS_FSL_NUM_LAWS                12
-#define CONFIG_SYS_PPC_E500_DEBUG_TLB  3
-#define CONFIG_TSECV2
-#define CONFIG_SYS_FSL_SEC_COMPAT      4
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
-#define CONFIG_NUM_DDR_CONTROLLERS     1
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
-#define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000
-#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
-#define CONFIG_SYS_FSL_ERRATUM_IFC_A002769
-#define CONFIG_SYS_FSL_ERRATUM_P1010_A003549
-#define CONFIG_SYS_FSL_ERRATUM_IFC_A003399
-#define CONFIG_SYS_FSL_ERRATUM_A004508
-
 /* P1017 is single core version of P1023 */
 #elif defined(CONFIG_P1017)
 #define CONFIG_MAX_CPUS                        1

diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index c82daab6ee58bf2ea0d79556c0d311a469e67114..222bb4c949fd58f67bf94573069bfb8c113dc25a 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2222,7 +2222,7 @@ typedef struct ccsr_gur {
        u32     gpindr;         /* General-purpose input data */
        u8      res5[12];
        u32     pmuxcr;         /* Alt. function signal multiplex control */
-#if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014)
+#if defined(CONFIG_ARCH_P1010)
 #define MPC85xx_PMUXCR_TSEC1_0_1588            0x40000000
 #define MPC85xx_PMUXCR_TSEC1_0_RES             0xC0000000
 #define MPC85xx_PMUXCR_TSEC1_1_1588_TRIG       0x10000000
@@ -2350,7 +2350,7 @@ typedef struct ccsr_gur {
 #define MPC85xx_PMUXCR_SPI_GPIO                        0x00000100
 #endif
        u32     pmuxcr2;        /* Alt. function signal multiplex control 2 */
-#if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014)
+#if defined(CONFIG_ARCH_P1010)
 #define MPC85xx_PMUXCR2_UART_GPIO              0x40000000
 #define MPC85xx_PMUXCR2_UART_TDM               0x80000000
 #define MPC85xx_PMUXCR2_UART_RES               0xC0000000

diff --git a/doc/README.mpc85xx-sd-spi-boot b/doc/README.mpc85xx-sd-spi-boot
index a08db92154650adc9a68b4d34038e5026c14e738..b7d57be382518dfca7b61738e233ffc139305bd0 100644 (file)
--- a/doc/README.mpc85xx-sd-spi-boot
+++ b/doc/README.mpc85xx-sd-spi-boot
@@ -67,7 +67,6 @@ P2010RDB      config_ddr3_1gb_64bit_p2020rdb_pc.dat
 P1020RDB       config_ddr3_1gb_p1_p2_rdb_pc_800M.dat
 P1011RDB       config_ddr3_1gb_p1_p2_rdb_pc_800M.dat
 P1010RDB       config_ddr3_1gb_p1010rdb_800M.dat
-P1014RDB       config_ddr3_1gb_p1014rdb_800M.dat
 P1021RDB       config_ddr3_1gb_p1_p2_rdb_pc_800M.dat
 P1022DS                config_ddr3_2gb_p1022ds.dat
 P1024RDB       config_ddr3_1gb_p1_p2_rdb_pc_667M.dat