No target in the tree selects MPC86xx, and NXP lists the MPC8610 as End of Life and the MPC8641D as No Longer Manufactured. Its CPU, PCI and DMA paths have no consumer. Remove them.
Signed-off-by: Bradley Morgan <[email protected]> --- api/api_platform-powerpc.c | 2 +- arch/powerpc/cpu/Makefile | 1 - arch/powerpc/cpu/mpc8xxx/Makefile | 1 - arch/powerpc/cpu/mpc8xxx/cpu.c | 8 +------- arch/powerpc/cpu/mpc8xxx/fdt.c | 8 +++----- arch/powerpc/cpu/mpc8xxx/srio.c | 6 ------ arch/powerpc/include/asm/config.h | 1 - arch/powerpc/include/asm/fsl_lbc.h | 2 +- arch/powerpc/include/asm/fsl_pci.h | 7 ------- arch/powerpc/include/asm/global_data.h | 7 +++---- arch/powerpc/include/asm/ppc.h | 14 +------------- arch/powerpc/include/asm/processor.h | 18 ++---------------- arch/powerpc/lib/bdinfo.c | 2 +- arch/powerpc/lib/bootm.c | 7 ------- arch/powerpc/lib/ppccache.S | 4 ++-- arch/powerpc/lib/stack.c | 2 +- common/board_r.c | 2 +- drivers/ddr/fsl/Kconfig | 3 +-- drivers/ddr/fsl/ctrl_regs.c | 1 - drivers/dma/fsl_dma.c | 4 ---- drivers/gpio/mpc8xxx_gpio.c | 1 - drivers/pci/Kconfig | 2 +- env/Kconfig | 2 +- include/asm-generic/u-boot.h | 2 +- include/fsl_immap.h | 2 +- include/pci_ids.h | 4 ---- include/serial.h | 1 - 27 files changed, 22 insertions(+), 92 deletions(-) diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c index 2c1ab043af6..f789cf40ba1 100644 --- a/api/api_platform-powerpc.c +++ b/api/api_platform-powerpc.c @@ -28,7 +28,7 @@ int platform_sys_info(struct sys_info *si) si->clk_bus = gd->bus_clk; si->clk_cpu = gd->cpu_clk; -#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) #define bi_bar bi_immr_base #elif defined(CONFIG_MPC83xx) #define bi_bar bi_immrbar diff --git a/arch/powerpc/cpu/Makefile b/arch/powerpc/cpu/Makefile index e7f64059277..1a2b6fafa4b 100644 --- a/arch/powerpc/cpu/Makefile +++ b/arch/powerpc/cpu/Makefile @@ -2,4 +2,3 @@ obj-$(CONFIG_MPC83xx) += mpc8xxx/ obj-$(CONFIG_MPC85xx) += mpc8xxx/ -obj-$(CONFIG_MPC86xx) += mpc8xxx/ diff --git a/arch/powerpc/cpu/mpc8xxx/Makefile b/arch/powerpc/cpu/mpc8xxx/Makefile index a44b5165d74..5373398cf6f 100644 --- a/arch/powerpc/cpu/mpc8xxx/Makefile +++ b/arch/powerpc/cpu/mpc8xxx/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_FSL_LAW) += law.o else obj-$(CONFIG_MPC85xx) += cpu.o -obj-$(CONFIG_MPC86xx) += cpu.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-$(CONFIG_FSL_LBC) += fsl_lbc.o diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 8ebef9d5991..f87fb1b807e 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -2,9 +2,7 @@ /* * Copyright 2009-2012 Freescale Semiconductor, Inc. * - * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and - * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains - * cpu specific common code for 85xx/86xx processors. + * This file contains CPU-specific code for MPC85xx processors. */ #include <config.h> @@ -81,10 +79,6 @@ static struct cpu_type cpu_type_list[] = { CPU_TYPE_ENTRY(C291, C291, 1), CPU_TYPE_ENTRY(C292, C292, 1), CPU_TYPE_ENTRY(C293, C293, 1), -#elif defined(CONFIG_MPC86xx) - CPU_TYPE_ENTRY(8610, 8610, 1), - CPU_TYPE_ENTRY(8641, 8641, 2), - CPU_TYPE_ENTRY(8641D, 8641D, 2), #endif }; diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index f1c1cbc1c3c..692f89e04c6 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -3,9 +3,7 @@ * Copyright 2009-2014 Freescale Semiconductor, Inc. * Copyright 2020 NXP * - * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and - * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains - * cpu specific common code for 85xx/86xx processors. + * This file contains CPU-specific common code for MPC85xx processors. */ #include <cpu_func.h> @@ -16,7 +14,7 @@ #include <phy.h> #include <hwconfig.h> -#if defined(CONFIG_MP) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)) +#if defined(CONFIG_MP) && defined(CONFIG_MPC85xx) static int ft_del_cpuhandle(void *blob, int cpuhandle) { int off, ret = -FDT_ERR_NOTFOUND; @@ -68,7 +66,7 @@ void ft_fixup_num_cores(void *blob) { debug ("deleted %d extra core entry entries from device tree\n", del_cores); } -#endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */ +#endif /* defined(CONFIG_MP) && defined(CONFIG_MPC85xx) */ int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc) { diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c index 0c7288c7574..652411fc3b3 100644 --- a/arch/powerpc/cpu/mpc8xxx/srio.c +++ b/arch/powerpc/cpu/mpc8xxx/srio.c @@ -39,12 +39,6 @@ #define _DEVDISR_SRIO2 MPC85xx_DEVDISR_SRIO #define _DEVDISR_RMU MPC85xx_DEVDISR_RMSG #define CFG_SYS_MPC8xxx_GUTS_ADDR CFG_SYS_MPC85xx_GUTS_ADDR -#elif defined(CONFIG_MPC86xx) - #define _DEVDISR_SRIO1 MPC86xx_DEVDISR_SRIO - #define _DEVDISR_SRIO2 MPC86xx_DEVDISR_SRIO - #define _DEVDISR_RMU MPC86xx_DEVDISR_RMSG - #define CFG_SYS_MPC8xxx_GUTS_ADDR \ - (&((immap_t *)CONFIG_SYS_IMMR)->im_gur) #else #error "No defines for DEVDISR_SRIO" #endif diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 7e53dcf8af5..6dee08c0493 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -16,7 +16,6 @@ #ifndef CFG_MAX_MEM_MAPPED #if defined(CONFIG_E500) || \ - defined(CONFIG_MPC86xx) || \ defined(CONFIG_E300) #define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #else diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 37da14c45f1..19dd5c94d60 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -310,7 +310,7 @@ void lbc_sdram_init(void); #define LCRR_EADC_2 0x00020000 #define LCRR_EADC_3 0x00030000 #define LCRR_EADC_4 0x00000000 -/* CLKDIV is five bits only on 8536, 8572, and 8610, so far, but the fifth bit +/* CLKDIV is five bits only on 8536 and 8572, so far, but the fifth bit * should always be zero on older parts that have a four bit CLKDIV. */ #define LCRR_CLKDIV 0x0000001F diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index 6c6e436b6ee..fc7b1779230 100644 --- a/arch/powerpc/include/asm/fsl_pci.h +++ b/arch/powerpc/include/asm/fsl_pci.h @@ -258,13 +258,6 @@ int fsl_pcie_init_board(int busno); FT_FSL_PCIE1_SETUP; \ FT_FSL_PCIE2_SETUP; \ FT_FSL_PCIE3_SETUP; -#elif defined(CONFIG_MPC86xx) -#define FSL_PCI_COMPAT "fsl,mpc8610-pci" -#define FSL_PCIE_COMPAT "fsl,mpc8641-pcie" -#define FT_FSL_PCI_SETUP \ - FT_FSL_PCI1_SETUP; \ - FT_FSL_PCIE1_SETUP; \ - FT_FSL_PCIE2_SETUP; #else #error FT_FSL_PCI_SETUP not defined #endif diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 710d538dad9..0d091fad418 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -44,12 +44,11 @@ struct arch_global_data { # endif /* CONFIG_ARCH_MPC8360 */ #endif #endif -#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC85xx) u32 lbc_clk; void *cpu; -#endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */ -#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ - defined(CONFIG_MPC86xx) +#endif /* CONFIG_MPC85xx */ +#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) u32 i2c1_clk; u32 i2c2_clk; #endif diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h index 2923350bd7b..740bcd910eb 100644 --- a/arch/powerpc/include/asm/ppc.h +++ b/arch/powerpc/include/asm/ppc.h @@ -50,9 +50,7 @@ static inline uint get_svr(void) return mfspr(SVR); } -#if defined(CONFIG_MPC85xx) || \ - defined(CONFIG_MPC86xx) || \ - defined(CONFIG_MPC83xx) +#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83xx) unsigned char in8(unsigned int); void out8(unsigned int, unsigned char); unsigned short in16(unsigned int); @@ -84,17 +82,7 @@ void get_sys_info(sys_info_t *); void ft_fixup_cpu(void *, u64); void ft_fixup_num_cores(void *); #endif -#if defined(CONFIG_MPC86xx) -ulong get_bus_freq(ulong); -typedef MPC86xx_SYS_INFO sys_info_t; -void get_sys_info(sys_info_t *); -static inline ulong get_ddr_freq(ulong dummy) -{ - return get_bus_freq(dummy); -} -#else ulong get_ddr_freq(ulong); -#endif static inline unsigned long get_msr(void) { diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 6c274c9ceef..59c9e7a76a6 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -569,11 +569,6 @@ #define MCSR_IMPE 0x00800000 /* Imprecise Machine Check Exception */ #define ESR_ST 0x00800000 /* Store Operation */ -#if defined(CONFIG_MPC86xx) -#define SPRN_MSSCR0 0x3f6 -#define SPRN_MSSSR0 0x3f7 -#endif - #define SPRN_HDBCR0 0x3d0 #define SPRN_HDBCR1 0x3d1 #define SPRN_HDBCR2 0x3d2 @@ -646,10 +641,7 @@ #define L2CR SPRN_L2CR /* PPC 750 L2 control register */ #define LR SPRN_LR #define MBAR SPRN_MBAR /* System memory base address */ -#if defined(CONFIG_MPC86xx) -#define MSSCR0 SPRN_MSSCR0 -#endif -#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_E500) #define PIR SPRN_PIR #endif #define SVR SPRN_SVR /* System-On-Chip Version Register */ @@ -959,8 +951,6 @@ #define PVR_VER_E5500 0x8024 #define PVR_VER_E6500 0x8040 -#define PVR_86xx 0x80040000 - #define PVR_VIRTEX5 0x7ff21912 /* @@ -1065,10 +1055,6 @@ #define SVR_T2080 0x853000 #define SVR_T2081 0x853100 -#define SVR_8610 0x80A000 -#define SVR_8641 0x809000 -#define SVR_8641D 0x809001 - #define SVR_9130 0x860001 #define SVR_9131 0x860000 #define SVR_9232 0x861400 @@ -1138,7 +1124,7 @@ int fixup_cpu(void); int fsl_qoriq_core_to_cluster(unsigned int core); int fsl_qoriq_dsp_core_to_cluster(unsigned int core); -#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC85xx) #define CPU_TYPE_ENTRY(n, v, nc) \ { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), \ .mask = (1 << (nc)) - 1 } diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c index 6491c210f4e..7c2b1746d0d 100644 --- a/arch/powerpc/lib/bdinfo.c +++ b/arch/powerpc/lib/bdinfo.c @@ -15,7 +15,7 @@ int arch_setup_bdinfo(void) { struct bd_info *bd = gd->bd; -#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_E500) bd->bi_immr_base = CONFIG_SYS_IMMR; /* base of IMMR register */ #endif diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index f9351a17a48..9b0ce9c4b81 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -21,7 +21,6 @@ #include <u-boot/zlib.h> #include <bzlib.h> #include <asm/byteorder.h> -#include <asm/mp.h> #include <bootm.h> #include <vxworks.h> @@ -237,12 +236,6 @@ void boot_prep_vxworks(struct bootm_headers *images) #if defined(CONFIG_MPC85xx) ft_fixup_cpu(images->ft_addr, base + size); ft_fixup_num_cores(images->ft_addr); -#elif defined(CONFIG_MPC86xx) - off = fdt_add_mem_rsv(images->ft_addr, - determine_mp_bootpg(NULL), (u64)4096); - if (off < 0) - printf("## WARNING %s: %s\n", __func__, fdt_strerror(off)); - ft_fixup_num_cores(images->ft_addr); #endif flush_cache((unsigned long)images->ft_addr, images->ft_len); #endif diff --git a/arch/powerpc/lib/ppccache.S b/arch/powerpc/lib/ppccache.S index e94b40ead63..b2bed5c17fb 100644 --- a/arch/powerpc/lib/ppccache.S +++ b/arch/powerpc/lib/ppccache.S @@ -64,7 +64,7 @@ ppcSync: * flush_dcache_range(unsigned long start, unsigned long stop) */ _GLOBAL(flush_dcache_range) -#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC85xx) li r5,L1_CACHE_BYTES-1 andc r3,r3,r5 subf r4,r3,r4 @@ -88,7 +88,7 @@ _GLOBAL(flush_dcache_range) * invalidate_dcache_range(unsigned long start, unsigned long stop) */ _GLOBAL(invalidate_dcache_range) -#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC85xx) li r5,L1_CACHE_BYTES-1 andc r3,r3,r5 subf r4,r3,r4 diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c index afd869e4ac3..232f9758bf5 100644 --- a/arch/powerpc/lib/stack.c +++ b/arch/powerpc/lib/stack.c @@ -33,7 +33,7 @@ int arch_reserve_stacks(void) int arch_setup_dest_addr(void) { -#if defined(CONFIG_MP) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) +#if defined(CONFIG_MP) && defined(CONFIG_E500) /* * We need to make sure the location we intend to put secondary core * boot code is reserved and not used by any part of u-boot diff --git a/common/board_r.c b/common/board_r.c index a397e20959d..d1b9663aa5b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -129,7 +129,7 @@ static int initr_reloc_global_data(void) #elif !defined(CONFIG_SANDBOX) && !defined(CONFIG_NIOS2) monitor_flash_len = (ulong)__init_end - gd->relocaddr; #endif -#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC85xx) /* * The gd->cpu pointer is set to an address in flash before relocation. * We need to update it to point to the same CPU entry in RAM. diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig index 7a3aa7e2087..c4b7ec768e8 100644 --- a/drivers/ddr/fsl/Kconfig +++ b/drivers/ddr/fsl/Kconfig @@ -93,7 +93,6 @@ config SYS_FSL_DDRC_GEN1 config SYS_FSL_DDRC_GEN2 bool - depends on !MPC86xx help Enable Freescale DDR2 controller. @@ -150,7 +149,7 @@ config SYS_FSL_DDR2 bool "Freescale DDR2 controller" depends on SYS_FSL_HAS_DDR2 imply DDR_SPD - select SYS_FSL_DDRC_GEN2 if (!MPC86xx && !SYS_FSL_DDRC_GEN3) + select SYS_FSL_DDRC_GEN2 if !SYS_FSL_DDRC_GEN3 config SYS_FSL_DDR1 bool "Freescale DDR1 controller" diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index fea08c9000f..e8dc6890330 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -42,7 +42,6 @@ * 4 = 20 ohm * 5 = 30 ohm * - * FIXME: Apparently 8641 needs a value of 2 * FIXME: Old code seys if 667 MHz or higher, use 3 on 8572 * * FIXME: There was some effort down this line earlier: diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index e5d242f4f8f..44ba63f2930 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -25,8 +25,6 @@ dma83xx_t *dma_base = (void *)(CFG_SYS_MPC83xx_DMA_ADDR); #elif defined(CONFIG_MPC85xx) ccsr_dma_t *dma_base = (void *)(CFG_SYS_MPC85xx_DMA_ADDR); -#elif defined(CONFIG_MPC86xx) -ccsr_dma_t *dma_base = (void *)(CONFIG_SYS_MPC86xx_DMA_ADDR); #else #error "Freescale DMA engine not supported on your processor" #endif @@ -35,8 +33,6 @@ static void dma_sync(void) { #if defined(CONFIG_MPC85xx) asm("sync; isync; msync"); -#elif defined(CONFIG_MPC86xx) - asm("sync; isync"); #endif } diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index 40646407369..bfa62be9dc7 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -316,7 +316,6 @@ static const struct udevice_id mpc8xxx_gpio_ids[] = { { .compatible = "fsl,mpc8308-gpio", .data = MPC8XXX_GPIO_TYPE }, { .compatible = "fsl,mpc8349-gpio", .data = MPC8XXX_GPIO_TYPE }, { .compatible = "fsl,mpc8572-gpio", .data = MPC8XXX_GPIO_TYPE}, - { .compatible = "fsl,mpc8610-gpio", .data = MPC8XXX_GPIO_TYPE}, { .compatible = "fsl,mpc5121-gpio", .data = MPC5121_GPIO_TYPE, }, { .compatible = "fsl,qoriq-gpio", .data = MPC8XXX_GPIO_TYPE }, { /* sentinel */ } diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 86fafc5a3c7..c32cf344f81 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -187,7 +187,7 @@ config PCIE_FSL depends on PPC help Say Y here if you want to enable PCIe controller support on FSL - PowerPC MPC85xx, MPC86xx, B series, P series and T series SoCs. + PowerPC MPC85xx, B series, P series and T series SoCs. This driver does not support SRIO_PCIE_BOOT feature. config PCI_MPC85XX diff --git a/env/Kconfig b/env/Kconfig index fa4cf30af39..08fa5a4ecd0 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -155,7 +155,7 @@ config ENV_IS_IN_FLASH default y if ARCH_INTEGRATOR_CP default y if M548x || M547x || M5282 default y if MCF532x || MCF52x2 - default y if MPC86xx || MPC83xx + default y if MPC83xx default y if SH && !CPU_SH4 help Define this if you have a flash device which you want to use for the diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index 931fe2f3274..ead690f6c65 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -35,7 +35,7 @@ struct bd_info { unsigned long bi_dsp_freq; /* dsp core frequency */ unsigned long bi_ddr_freq; /* ddr frequency */ #endif -#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx) +#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) unsigned long bi_immr_base; /* base of IMMR register */ #endif #if defined(CONFIG_M68K) diff --git a/include/fsl_immap.h b/include/fsl_immap.h index 54d6e0ab377..ea5d214e499 100644 --- a/include/fsl_immap.h +++ b/include/fsl_immap.h @@ -12,7 +12,7 @@ /* * DDR memory controller registers - * This structure works for mpc83xx (DDR2 and DDR3), mpc85xx, mpc86xx. + * This structure works for mpc83xx (DDR2 and DDR3) and mpc85xx. */ struct ccsr_ddr { u32 cs0_bnds; /* Chip Select 0 Memory Bounds */ diff --git a/include/pci_ids.h b/include/pci_ids.h index cfff275daba..96e84a779ff 100644 --- a/include/pci_ids.h +++ b/include/pci_ids.h @@ -2509,10 +2509,6 @@ #define PCI_DEVICE_ID_P5020 0x0421 #define PCI_DEVICE_ID_P5010E 0x0428 #define PCI_DEVICE_ID_P5010 0x0429 -#define PCI_DEVICE_ID_MPC8641 0x7010 -#define PCI_DEVICE_ID_MPC8641D 0x7011 -#define PCI_DEVICE_ID_MPC8610 0x7018 - #define PCI_VENDOR_ID_PASEMI 0x1959 #define PCI_VENDOR_ID_ATTANSIC 0x1969 diff --git a/include/serial.h b/include/serial.h index 0a707ca730d..0b0179e6c0b 100644 --- a/include/serial.h +++ b/include/serial.h @@ -28,7 +28,6 @@ extern struct serial_device serial_scc_device; extern struct serial_device *default_serial_console(void); #if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ - defined(CONFIG_MPC86xx) || \ defined(CONFIG_ARCH_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \ defined(CONFIG_MICROBLAZE) extern struct serial_device serial0_device; -- 2.47.3
