This has not been converted to Generic Board, so should be removed. (See doc/README.generic-board for details.)
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Cc: Kumar Gala kumar.gala@freescale.com ---
arch/powerpc/cpu/mpc85xx/Kconfig | 4 - arch/powerpc/cpu/mpc85xx/cpu.c | 18 -- arch/powerpc/cpu/mpc85xx/speed.c | 7 +- arch/powerpc/include/asm/fsl_lbc.h | 4 +- board/freescale/mpc8560ads/Kconfig | 12 - board/freescale/mpc8560ads/MAINTAINERS | 6 - board/freescale/mpc8560ads/Makefile | 11 - board/freescale/mpc8560ads/ddr.c | 46 --- board/freescale/mpc8560ads/law.c | 42 --- board/freescale/mpc8560ads/mpc8560ads.c | 462 ------------------------------ board/freescale/mpc8560ads/tlb.c | 95 ------- configs/MPC8560ADS_defconfig | 3 - doc/README.scrapyard | 1 + include/configs/MPC8560ADS.h | 488 -------------------------------- 14 files changed, 4 insertions(+), 1195 deletions(-) delete mode 100644 board/freescale/mpc8560ads/Kconfig delete mode 100644 board/freescale/mpc8560ads/MAINTAINERS delete mode 100644 board/freescale/mpc8560ads/Makefile delete mode 100644 board/freescale/mpc8560ads/ddr.c delete mode 100644 board/freescale/mpc8560ads/law.c delete mode 100644 board/freescale/mpc8560ads/mpc8560ads.c delete mode 100644 board/freescale/mpc8560ads/tlb.c delete mode 100644 configs/MPC8560ADS_defconfig delete mode 100644 include/configs/MPC8560ADS.h
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index e0f0459..c6dec3d 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -46,9 +46,6 @@ config TARGET_P5040DS config TARGET_MPC8536DS bool "Support MPC8536DS"
-config TARGET_MPC8560ADS - bool "Support MPC8560ADS" - config TARGET_MPC8568MDS bool "Support MPC8568MDS"
@@ -142,7 +139,6 @@ source "board/freescale/bsc9132qds/Kconfig" source "board/freescale/c29xpcie/Kconfig" source "board/freescale/corenet_ds/Kconfig" source "board/freescale/mpc8536ds/Kconfig" -source "board/freescale/mpc8560ads/Kconfig" source "board/freescale/mpc8568mds/Kconfig" source "board/freescale/mpc8569mds/Kconfig" source "board/freescale/mpc8572ds/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index ef08489..fbdc66c 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -292,23 +292,6 @@ int checkcpu (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { -/* Everything after the first generation of PQ3 parts has RSTCR */ -#if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \ - defined(CONFIG_MPC8555) || defined(CONFIG_MPC8560) - unsigned long val, msr; - - /* - * Initiate hard reset in debug control register DBCR0 - * Make sure MSR[DE] = 1. This only resets the core. - */ - msr = mfmsr (); - msr |= MSR_DE; - mtmsr (msr); - - val = mfspr(DBCR0); - val |= 0x70000000; - mtspr(DBCR0,val); -#else volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
/* Attempt board-specific reset */ @@ -317,7 +300,6 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Next try asserting HRESET_REQ */ out_be32(&gur->rstcr, 0x2); udelay(100); -#endif
return 1; } diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index d954fe2..6c29f51 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -624,8 +624,7 @@ void get_sys_info(sys_info_t *sys_info) * for four times the clock divider values. */ lcrr_div *= 4; -#elif !defined(CONFIG_MPC8540) && !defined(CONFIG_MPC8541) && \ - !defined(CONFIG_MPC8555) && !defined(CONFIG_MPC8560) +#else /* * Yes, the entire PQ38 family use the same * bit-representation for twice the clock divider values. @@ -680,9 +679,7 @@ int get_clocks (void) * for that SOC. This information is taken from application note * AN2919. */ -#if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \ - defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \ - defined(CONFIG_P1022) +#if defined(CONFIG_P1022) gd->arch.i2c1_clk = sys_info.freq_systembus; #elif defined(CONFIG_MPC8544) /* diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 402edd7..6ea120d 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -325,9 +325,7 @@ void lbc_sdram_init(void); */ #define LCRR_CLKDIV 0x0000001F #define LCRR_CLKDIV_SHIFT 0 -#if defined(CONFIG_MPC83xx) || defined (CONFIG_MPC8540) || \ - defined(CONFIG_MPC8541) || defined (CONFIG_MPC8555) || \ - defined(CONFIG_MPC8560) +#if defined(CONFIG_MPC83xx) #define LCRR_CLKDIV_2 0x00000002 #define LCRR_CLKDIV_4 0x00000004 #define LCRR_CLKDIV_8 0x00000008 diff --git a/board/freescale/mpc8560ads/Kconfig b/board/freescale/mpc8560ads/Kconfig deleted file mode 100644 index 828c068..0000000 diff --git a/board/freescale/mpc8560ads/MAINTAINERS b/board/freescale/mpc8560ads/MAINTAINERS deleted file mode 100644 index 96e6da2..0000000 diff --git a/board/freescale/mpc8560ads/Makefile b/board/freescale/mpc8560ads/Makefile deleted file mode 100644 index 685168e..0000000 diff --git a/board/freescale/mpc8560ads/ddr.c b/board/freescale/mpc8560ads/ddr.c deleted file mode 100644 index 41d4cfe..0000000 diff --git a/board/freescale/mpc8560ads/law.c b/board/freescale/mpc8560ads/law.c deleted file mode 100644 index 41f2e02..0000000 diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c deleted file mode 100644 index f99d639..0000000 diff --git a/board/freescale/mpc8560ads/tlb.c b/board/freescale/mpc8560ads/tlb.c deleted file mode 100644 index d5ee791..0000000 diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig deleted file mode 100644 index aa84d28..0000000 diff --git a/doc/README.scrapyard b/doc/README.scrapyard index f400913..802ba6c 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -12,6 +12,7 @@ The list should be sorted in reverse chronological order.
Board Arch CPU Commit Removed Last known maintainer/contact ================================================================================================= +MPC8560ADS powerpc mpc85xx - - Kumar Gala kumar.gala@freescale.com MPC8555CDS powerpc mpc85xx - - Kumar Gala kumar.gala@freescale.com MPC8548CDS powerpc mpc85xx - - MPC8544DS powerpc mpc85xx - - diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h deleted file mode 100644 index 5a481d5..0000000