No board in the tree selects ARCH_P1011, and the SoC lacks active community maintenance. Remove the unused SoC configuration, CPU identification, and stale boot documentation entry.
Signed-off-by: Bradley Morgan <[email protected]> --- arch/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 20 +------------------- arch/powerpc/cpu/mpc85xx/Makefile | 1 - arch/powerpc/cpu/mpc8xxx/cpu.c | 1 - arch/powerpc/include/asm/processor.h | 1 - doc/README.mpc85xx-sd-spi-boot | 1 - 6 files changed, 2 insertions(+), 24 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 8d63afeb138..07214f2af7c 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -470,7 +470,7 @@ config SYS_IMMR default 0xF0000000 if ARCH_MPC8313 default 0xE0000000 if MPC83xx && !ARCH_MPC8313 default 0x01000000 if ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3 - default 0xFFE00000 if ARCH_P1010 || ARCH_P1011 || ARCH_P1020 || \ + default 0xFFE00000 if ARCH_P1010 || ARCH_P1020 || \ ARCH_P1021 || ARCH_P1024 || ARCH_P1025 || \ ARCH_P2020 default SYS_CCSRBAR_DEFAULT diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index b1b134ca990..ab66ffadebd 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -399,21 +399,6 @@ config ARCH_P1010 imply FSL_SATA imply TIMESTAMP -config ARCH_P1011 - bool - select FSL_LAW - select SYS_FSL_ERRATUM_A004508 - select SYS_FSL_ERRATUM_A005125 - select SYS_FSL_ERRATUM_ELBC_A001 - select SYS_FSL_ERRATUM_ESDHC111 - select FSL_PCIE_DISABLE_ASPM - select SYS_FSL_HAS_DDR3 - select SYS_FSL_HAS_SEC - select SYS_FSL_SEC_BE - select SYS_FSL_SEC_COMPAT_2 - select SYS_PPC_E500_USE_DEBUG_TLB - select FSL_ELBC - config ARCH_P1020 bool select BTB @@ -831,7 +816,6 @@ config SYS_CCSRBAR_DEFAULT ARCH_MPC8544 || \ ARCH_MPC8560 || \ ARCH_P1010 || \ - ARCH_P1011 || \ ARCH_P1020 || \ ARCH_P1021 || \ ARCH_P1024 || \ @@ -1041,7 +1025,6 @@ config SYS_FSL_NUM_LAWS ARCH_BSC9132 || \ ARCH_MPC8536 || \ ARCH_P1010 || \ - ARCH_P1011 || \ ARCH_P1020 || \ ARCH_P1021 || \ ARCH_P1023 || \ @@ -1156,8 +1139,7 @@ config SYS_PPC_E500_DEBUG_TLB depends on SYS_PPC_E500_USE_DEBUG_TLB default 0 if ARCH_MPC8544 default 1 if ARCH_MPC8536 - default 2 if ARCH_P1011 || \ - ARCH_P1020 || \ + default 2 if ARCH_P1020 || \ ARCH_P1021 || \ ARCH_P1024 || \ ARCH_P1025 || \ diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 93b0c28ca03..f78131dd61a 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -54,7 +54,6 @@ obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS2) += fsl_corenet2_serdes.o obj-$(CONFIG_ARCH_MPC8536) += mpc8536_serdes.o obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o -obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o obj-$(CONFIG_ARCH_P1021) += p1021_serdes.o obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 47daf51fc1b..641d2a199f8 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -41,7 +41,6 @@ static struct cpu_type cpu_type_list[] = { CPU_TYPE_ENTRY(8569, 8569, 1), CPU_TYPE_ENTRY(8572, 8572, 2), CPU_TYPE_ENTRY(P1010, P1010, 1), - CPU_TYPE_ENTRY(P1011, P1011, 1), CPU_TYPE_ENTRY(P1012, P1012, 1), CPU_TYPE_ENTRY(P1013, P1013, 1), CPU_TYPE_ENTRY(P1014, P1014, 1), diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 1d6f960be94..36d8660cddc 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1033,7 +1033,6 @@ #define SVR_8569 0x808000 #define SVR_8572 0x80E000 #define SVR_P1010 0x80F100 -#define SVR_P1011 0x80E500 #define SVR_P1012 0x80E501 #define SVR_P1013 0x80E700 #define SVR_P1014 0x80F101 diff --git a/doc/README.mpc85xx-sd-spi-boot b/doc/README.mpc85xx-sd-spi-boot index 8e98fc9f659..086c8f9e49b 100644 --- a/doc/README.mpc85xx-sd-spi-boot +++ b/doc/README.mpc85xx-sd-spi-boot @@ -60,7 +60,6 @@ P2020DS config_sram_p2020ds.dat P1020RDB config_ddr2_1g_p1020rdb_533M.dat P1020RDB config_ddr2_1g_p1020rdb_667M.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 P1021RDB config_ddr3_1gb_p1_p2_rdb_pc_800M.dat P1022DS config_ddr3_2gb_p1022ds.dat -- 2.47.3
