From d5093de0b19bfa62bc47415658e7f2316bf914bc Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 9 May 2012 10:48:41 +0000 Subject: [PATCH] mpc85xx: remove 2.6.38 support SVN-Revision: 31661 --- target/linux/mpc85xx/config-default | 244 ------------------ .../patches/100-fix_mpc8568e_mds.patch | 60 ----- .../mpc85xx/patches/110-fix_mpc8548_cds.patch | 38 --- .../120-mpc8548_cds_i8259_noirq_init.patch | 23 -- .../130-mpc8548_cds_disable_i8259_irq.patch | 13 - 5 files changed, 378 deletions(-) delete mode 100644 target/linux/mpc85xx/config-default delete mode 100644 target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch delete mode 100644 target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch delete mode 100644 target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch delete mode 100644 target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default deleted file mode 100644 index 4eb9824c2a..0000000000 --- a/target/linux/mpc85xx/config-default +++ /dev/null @@ -1,244 +0,0 @@ -# CONFIG_40x is not set -# CONFIG_44x is not set -# CONFIG_ADVANCED_OPTIONS is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -CONFIG_ARCH_HAS_ILOG2_U32=y -CONFIG_ARCH_HAS_WALK_MEMORY=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_ARCH_NO_VIRT_TO_BUS is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_AUDIT_ARCH=y -# CONFIG_AUTO_IRQ_AFFINITY is not set -CONFIG_BKL=y -CONFIG_BOOKE=y -CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38 -CONFIG_BOUNCE=y -CONFIG_CMDLINE="console=ttyS0,115200" -CONFIG_CMDLINE_BOOL=y -# CONFIG_CPM2 is not set -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DEFAULT_UIMAGE=y -CONFIG_DEVKMEM=y -CONFIG_DNOTIFY=y -CONFIG_DTC=y -# CONFIG_E200 is not set -CONFIG_E500=y -CONFIG_EARLY_PRINTK=y -CONFIG_ELF_CORE=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_EXPERT=y -CONFIG_FREEZER=y -CONFIG_FSL_BOOKE=y -CONFIG_FSL_EMB_PERFMON=y -CONFIG_FSL_LBC=y -CONFIG_FSL_PCI=y -CONFIG_FSL_PMC=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_FSL_SOC=y -CONFIG_FSL_SOC_BOOKE=y -# CONFIG_FSL_ULI1575 is not set -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_GPIO=y -# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set -# CONFIG_GENERIC_IOMAP is not set -# CONFIG_GENERIC_IRQ_PROBE is not set -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_NVRAM=y -# CONFIG_GENERIC_PENDING_IRQ is not set -# CONFIG_GENERIC_TBSYNC is not set -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GEN_RTC=y -# CONFIG_GEN_RTC_X is not set -CONFIG_GIANFAR=y -CONFIG_GPIOLIB=y -# CONFIG_HAMRADIO is not set -# CONFIG_HARDIRQS_SW_RESEND is not set -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_RAPIDIO=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_HAVE_GENERIC_HARDIRQS=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_IRQ_WORK=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set -CONFIG_HAVE_SPARSE_IRQ=y -# CONFIG_HIBERNATION is not set -CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_INOTIFY_USER=y -CONFIG_IOMMU_HELPER=y -# CONFIG_IPIC is not set -CONFIG_IRQ_PER_CPU=y -CONFIG_ISA_DMA_API=y -CONFIG_KERNEL_START=0xc0000000 -# CONFIG_KSI8560 is not set -# CONFIG_LEDS_GPIO is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_LOWMEM_CAM_NUM=3 -CONFIG_LOWMEM_SIZE=0x30000000 -CONFIG_LXT_PHY=y -CONFIG_MACH_NO_WESTBRIDGE=y -# CONFIG_MATH_EMULATION is not set -CONFIG_MAX_ACTIVE_REGIONS=32 -CONFIG_MIGRATION=y -# CONFIG_MII is not set -# CONFIG_MMIO_NVRAM is not set -# CONFIG_MPC8536_DS is not set -# CONFIG_MPC8540_ADS is not set -# CONFIG_MPC8560_ADS is not set -CONFIG_MPC85xx_CDS=y -# CONFIG_MPC85xx_DS is not set -CONFIG_MPC85xx_MDS=y -# CONFIG_MPC85xx_RDB is not set -CONFIG_MPC8xxx_GPIO=y -CONFIG_MPIC=y -# CONFIG_MPIC_U3_HT_IRQS is not set -# CONFIG_MPIC_WEIRD is not set -# CONFIG_MTD is not set -# CONFIG_NEED_DMA_MAP_STATE is not set -# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NR_IRQS=512 -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_DEVICE=y -CONFIG_OF_DYNAMIC=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -# CONFIG_P1022_DS is not set -# CONFIG_P3041_DS is not set -# CONFIG_P4080_DS is not set -# CONFIG_P5020_DS is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xc0000000 -CONFIG_PCI=y -CONFIG_PCIEAER=y -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_DOMAINS=y -CONFIG_PHYLIB=y -CONFIG_PHYSICAL_ALIGN=0x04000000 -CONFIG_PHYSICAL_START=0x00000000 -# CONFIG_PHYS_64BIT is not set -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_OPS=y -# CONFIG_PM_RUNTIME is not set -CONFIG_PM_SLEEP=y -CONFIG_PPC=y -CONFIG_PPC32=y -# CONFIG_PPC64 is not set -CONFIG_PPC_85xx=y -# CONFIG_PPC_8xx is not set -# CONFIG_PPC_970_NAP is not set -CONFIG_PPC_ADV_DEBUG_DACS=2 -CONFIG_PPC_ADV_DEBUG_DVCS=0 -CONFIG_PPC_ADV_DEBUG_IACS=2 -CONFIG_PPC_ADV_DEBUG_REGS=y -CONFIG_PPC_BOOK3E_MMU=y -# CONFIG_PPC_BOOK3S_32 is not set -# CONFIG_PPC_CELL is not set -# CONFIG_PPC_CELL_NATIVE is not set -# CONFIG_PPC_CLOCK is not set -# CONFIG_PPC_DCR_MMIO is not set -# CONFIG_PPC_DCR_NATIVE is not set -# CONFIG_PPC_E500MC is not set -# CONFIG_PPC_EARLY_DEBUG is not set -CONFIG_PPC_FSL_BOOK3E=y -CONFIG_PPC_I8259=y -# CONFIG_PPC_INDIRECT_IO is not set -CONFIG_PPC_INDIRECT_PCI=y -CONFIG_PPC_LIB_RHEAP=y -CONFIG_PPC_MMU_NOHASH=y -CONFIG_PPC_MMU_NOHASH_32=y -# CONFIG_PPC_MM_SLICES is not set -# CONFIG_PPC_MPC106 is not set -CONFIG_PPC_OF=y -CONFIG_PPC_PCI_CHOICE=y -# CONFIG_PPC_RTAS is not set -CONFIG_PPC_UDBG_16550=y -CONFIG_PPC_WERROR=y -# CONFIG_PQ2ADS is not set -# CONFIG_PREEMPT_RCU is not set -CONFIG_PRINT_STACK_DEPTH=64 -CONFIG_PROC_DEVICETREE=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_QE_GPIO=y -CONFIG_QUICC_ENGINE=y -# CONFIG_QUOTACTL is not set -# CONFIG_RAPIDIO is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_SBC8548 is not set -CONFIG_SBC8560=y -CONFIG_SCHED_HRTICK=y -# CONFIG_SCSI_DMA is not set -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SERIAL_QE is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SOCRATES is not set -CONFIG_SPE=y -# CONFIG_SQUASHFS is not set -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_STX_GP3 is not set -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_SWIOTLB=y -CONFIG_TASK_SIZE=0xc0000000 -# CONFIG_TQM8540 is not set -# CONFIG_TQM8541 is not set -# CONFIG_TQM8548 is not set -# CONFIG_TQM8555 is not set -# CONFIG_TQM8560 is not set -CONFIG_UCC=y -CONFIG_UCC_FAST=y -CONFIG_UCC_GETH=y -# CONFIG_UGETH_TX_ON_DEMAND is not set -CONFIG_USB_SUPPORT=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WORD_SIZE=32 -# CONFIG_XES_MPC85xx is not set diff --git a/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch b/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch deleted file mode 100644 index d1e672a9df..0000000000 --- a/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/arch/powerpc/boot/dts/mpc8568mds.dts -+++ b/arch/powerpc/boot/dts/mpc8568mds.dts -@@ -301,32 +301,24 @@ - }; - }; - -- duart-sleep-nexus { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "simple-bus"; -- sleep = <&pmc 0x00000002>; -- ranges; -- -- serial0: serial@4500 { -- cell-index = <0>; -- device_type = "serial"; -- compatible = "ns16550"; -- reg = <0x4500 0x100>; -- clock-frequency = <0>; -- interrupts = <42 2>; -- interrupt-parent = <&mpic>; -- }; -+ serial0: serial@4500 { -+ cell-index = <0>; -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0x4500 0x100>; -+ clock-frequency = <0>; -+ interrupts = <42 2>; -+ interrupt-parent = <&mpic>; -+ }; - -- serial1: serial@4600 { -- cell-index = <1>; -- device_type = "serial"; -- compatible = "ns16550"; -- reg = <0x4600 0x100>; -- clock-frequency = <0>; -- interrupts = <42 2>; -- interrupt-parent = <&mpic>; -- }; -+ serial1: serial@4600 { -+ cell-index = <1>; -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0x4600 0x100>; -+ clock-frequency = <0>; -+ interrupts = <42 2>; -+ interrupt-parent = <&mpic>; - }; - - global-utilities@e0000 { -@@ -669,4 +661,7 @@ - gpios = <&bcsr5 3 0>; - }; - }; -+ chosen { -+ linux,stdout-path = "/soc8568@e0000000/serial@4500"; -+ }; - }; diff --git a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch b/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch deleted file mode 100644 index 3cca8288c6..0000000000 --- a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/arch/powerpc/boot/dts/mpc8548cds.dts -+++ b/arch/powerpc/boot/dts/mpc8548cds.dts -@@ -308,21 +308,21 @@ - }; - }; - -- serial0: serial@4500 { -- cell-index = <0>; -+ serial0: serial@4600 { -+ cell-index = <1>; - device_type = "serial"; - compatible = "ns16550"; -- reg = <0x4500 0x100>; // reg base, size -+ reg = <0x4600 0x100>; // reg base, size - clock-frequency = <0>; // should we fill in in uboot? - interrupts = <42 2>; - interrupt-parent = <&mpic>; - }; - -- serial1: serial@4600 { -- cell-index = <1>; -+ serial1: serial@4500 { -+ cell-index = <0>; - device_type = "serial"; - compatible = "ns16550"; -- reg = <0x4600 0x100>; // reg base, size -+ reg = <0x4500 0x100>; // reg base, size - clock-frequency = <0>; // should we fill in in uboot? - interrupts = <42 2>; - interrupt-parent = <&mpic>; -@@ -564,4 +564,7 @@ - 0x0 0x100000>; - }; - }; -+ chosen { -+ linux,stdout-path = "/soc8548@e0000000/serial@4600"; -+ }; - }; diff --git a/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch b/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch deleted file mode 100644 index 4d585100e6..0000000000 --- a/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c -+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c -@@ -234,15 +234,16 @@ static int mpc85xx_cds_8259_attach(void) - return -ENODEV; - } - -+ i8259_init(cascade_node, 0); -+ of_node_put(cascade_node); -+ - cascade_irq = irq_of_parse_and_map(cascade_node, 0); - if (cascade_irq == NO_IRQ) { -- printk(KERN_ERR "Failed to map cascade interrupt\n"); -+ of_node_put(cascade_node); -+ printk(KERN_DEBUG "No interrupt for i8259 PIC\n"); - return -ENXIO; - } - -- i8259_init(cascade_node, 0); -- of_node_put(cascade_node); -- - /* - * Hook the interrupt to make sure desc->action is never NULL. - * This is required to ensure that the interrupt does not get diff --git a/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch b/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch deleted file mode 100644 index 54a27858f3..0000000000 --- a/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/powerpc/boot/dts/mpc8548cds.dts -+++ b/arch/powerpc/boot/dts/mpc8548cds.dts -@@ -492,8 +492,10 @@ - #address-cells = <0>; - #interrupt-cells = <2>; - compatible = "chrp,iic"; -+/* - interrupts = <0 1>; - interrupt-parent = <&mpic>; -+*/ - }; - - rtc@70 { -- 2.30.2