No target in the tree selects ARCH_P1024, and the variant is unmaintained. Its timing branch and SoC defaults still hang around in the shared P1020 code.
Drop those paths. Signed-off-by: Bradley Morgan <[email protected]> --- arch/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 27 -------------------- arch/powerpc/cpu/mpc85xx/Makefile | 1 - arch/powerpc/cpu/mpc8xxx/cpu.c | 1 - arch/powerpc/include/asm/processor.h | 1 - board/nxp/p1_p2_rdb_pc/README | 1 - board/nxp/p1_p2_rdb_pc/ddr.c | 37 ---------------------------- doc/README.mpc85xx-sd-spi-boot | 1 - 8 files changed, 1 insertion(+), 70 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 8ea591cba4f..cb808df07f4 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -470,7 +470,7 @@ config SYS_IMMR default 0xE0000000 if MPC83xx default 0x01000000 if ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3 default 0xFFE00000 if ARCH_P1010 || ARCH_P1020 || \ - ARCH_P1021 || ARCH_P1024 || \ + ARCH_P1021 || \ ARCH_P2020 default SYS_CCSRBAR_DEFAULT help diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index fe1592d75aa..6cb37b8a378 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -392,29 +392,6 @@ config ARCH_P1021 imply CMD_REGINFO imply SATA_SIL -config ARCH_P1024 - 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 FSL_PCIE_RESET - select SYS_FSL_HAS_DDR3 - select SYS_FSL_HAS_SEC - select SYS_FSL_RMU - select SYS_FSL_SEC_BE - select SYS_FSL_SEC_COMPAT_2 - select SYS_PPC_E500_USE_DEBUG_TLB - select FSL_ELBC - imply CMD_EEPROM - imply CMD_NAND - imply SATA - imply CMD_PCI - imply CMD_REGINFO - imply SATA_SIL - config ARCH_P2020 bool select BTB @@ -710,7 +687,6 @@ config MAX_CPUS default 2 if ARCH_B4420 || \ ARCH_P1020 || \ ARCH_P1021 || \ - ARCH_P1024 || \ ARCH_P2020 || \ ARCH_T1024 default 1 @@ -728,7 +704,6 @@ config SYS_CCSRBAR_DEFAULT ARCH_P1010 || \ ARCH_P1020 || \ ARCH_P1021 || \ - ARCH_P1024 || \ ARCH_P2020 default 0xfe000000 if ARCH_B4420 || \ ARCH_B4860 || \ @@ -933,7 +908,6 @@ config SYS_FSL_NUM_LAWS ARCH_P1010 || \ ARCH_P1020 || \ ARCH_P1021 || \ - ARCH_P1024 || \ ARCH_P2020 default 10 if ARCH_MPC8544 help @@ -1042,7 +1016,6 @@ config SYS_PPC_E500_DEBUG_TLB default 0 if ARCH_MPC8544 default 2 if ARCH_P1020 || \ ARCH_P1021 || \ - ARCH_P1024 || \ ARCH_P2020 default 3 if ARCH_P1010 help diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 9b7c02eae5f..5861f4bbe63 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -55,7 +55,6 @@ obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o obj-$(CONFIG_ARCH_P1021) += p1021_serdes.o -obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o obj-$(CONFIG_ARCH_T4240) += t4240_serdes.o diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 046ab063700..3840cb42b76 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -45,7 +45,6 @@ static struct cpu_type cpu_type_list[] = { CPU_TYPE_ENTRY(P1020, P1020, 2), CPU_TYPE_ENTRY(P1021, P1021, 2), CPU_TYPE_ENTRY(P1022, P1022, 2), - CPU_TYPE_ENTRY(P1024, P1024, 2), CPU_TYPE_ENTRY(P2010, P2010, 1), CPU_TYPE_ENTRY(P2020, P2020, 2), CPU_TYPE_ENTRY(P2040, P2040, 4), diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 01228bee20f..6c274c9ceef 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1033,7 +1033,6 @@ #define SVR_P1020 0x80E400 #define SVR_P1021 0x80E401 #define SVR_P1022 0x80E600 -#define SVR_P1024 0x80E402 #define SVR_P2010 0x80E300 #define SVR_P2020 0x80E200 #define SVR_P2040 0x821000 diff --git a/board/nxp/p1_p2_rdb_pc/README b/board/nxp/p1_p2_rdb_pc/README index 5bf27816ab2..73226bd1a53 100644 --- a/board/nxp/p1_p2_rdb_pc/README +++ b/board/nxp/p1_p2_rdb_pc/README @@ -5,7 +5,6 @@ P1_P2_RDB_PC represents a set of boards including P1020RDB-PC P1020RDB-PD P1021RDB-PC - P1024RDB They have similar design of P1020RDB but have DDR3 instead of DDR2. diff --git a/board/nxp/p1_p2_rdb_pc/ddr.c b/board/nxp/p1_p2_rdb_pc/ddr.c index 74c9c78c4e1..17138d92b0b 100644 --- a/board/nxp/p1_p2_rdb_pc/ddr.c +++ b/board/nxp/p1_p2_rdb_pc/ddr.c @@ -114,43 +114,6 @@ dimm_params_t ddr_raw_timing = { .refresh_rate_ps = 7800000, .tfaw_ps = 37500, }; -#elif defined(CONFIG_TARGET_P1024RDB) -/* - * Samsung K4B2G0846C-HCH9 - * The following timing are for "downshift" - * i.e. to use CL9 part as CL7 - * otherwise, tAA, tRCD, tRP will be 13500ps - * and tRC will be 49500ps - */ -dimm_params_t ddr_raw_timing = { - .n_ranks = 1, - .rank_density = 1073741824u, - .capacity = 1073741824u, - .primary_sdram_width = 32, - .ec_sdram_width = 0, - .registered_dimm = 0, - .mirrored_dimm = 0, - .n_row_addr = 15, - .n_col_addr = 10, - .n_banks_per_sdram_device = 8, - .edc_config = 0, - .burst_lengths_bitmask = 0x0c, - - .tckmin_x_ps = 1500, - .caslat_x = 0x3e << 4, /* 5,6,7,8,9 */ - .taa_ps = 13125, - .twr_ps = 15000, - .trcd_ps = 13125, - .trrd_ps = 6000, - .trp_ps = 13125, - .tras_ps = 36000, - .trc_ps = 49125, - .trfc_ps = 160000, - .twtr_ps = 7500, - .trtp_ps = 7500, - .refresh_rate_ps = 7800000, - .tfaw_ps = 30000, -}; #else #error Missing raw timing data for this board #endif diff --git a/doc/README.mpc85xx-sd-spi-boot b/doc/README.mpc85xx-sd-spi-boot index c382e9bf7aa..ace40b2c7cf 100644 --- a/doc/README.mpc85xx-sd-spi-boot +++ b/doc/README.mpc85xx-sd-spi-boot @@ -63,6 +63,5 @@ P1020RDB 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 -P1024RDB config_ddr3_1gb_p1_p2_rdb_pc_667M.dat P1020UTM config_ddr3_1gb_p1_p2_rdb_pc_800M.dat P1020MBG config_ddr3_1gb_p1_p2_rdb_pc_800M.dat -- 2.47.3
