---
target/linux/generic/config-3.3 | 1 +
target/linux/mpc85xx/Makefile | 2 +-
target/linux/mpc85xx/config-default | 66 +++++++++-------
.../mpc85xx/patches/100-fix_mpc8568e_mds.patch | 82 +++++++-------------
.../mpc85xx/patches/110-fix_mpc8548_cds.patch | 68 +++++++++--------
.../patches/120-mpc8548_cds_i8259_noirq_init.patch | 8 +-
.../130-mpc8548_cds_disable_i8259_irq.patch | 10 ++-
7 files changed, 116 insertions(+), 121 deletions(-)
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index 8cdc693..ae0cf16 100644
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -440,6 +440,7 @@ CONFIG_CRYPTO=y
# CONFIG_CRYPTO_CTS is not set
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
# CONFIG_CRYPTO_DEV_MV_CESA is not set
# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 3543438..91d608c 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540
FEATURES:=spe_fpu ramdisk
MAINTAINER:=Imre Kaloz <ka...@openwrt.org>
-LINUX_VERSION:=2.6.38.8
+LINUX_VERSION:=3.3
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mpc85xx/config-default
b/target/linux/mpc85xx/config-default
index 7aedd52..0d1b31e 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -4,21 +4,21 @@
# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_ARCH_HAS_ILOG2_U32=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=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_BCMA_POSSIBLE=y
CONFIG_BOOKE=y
CONFIG_BOUNCE=y
CONFIG_CMDLINE="console=ttyS0,115200"
@@ -35,13 +35,11 @@ CONFIG_E500=y
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_EXPERT=y
-CONFIG_FREEZER=y
+# CONFIG_EPAPR_BOOT is not set
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
@@ -51,27 +49,26 @@ 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_CPU_DEVICES is not set
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_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_NVRAM=y
-# CONFIG_GENERIC_PENDING_IRQ is not set
+CONFIG_GENERIC_PCI_IOMAP=y
# 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_GPIO_MPC8XXX=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_JUMP_LABEL=y
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_API_DEBUG=y
@@ -88,22 +85,22 @@ CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_IRQ_WORK=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=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_HAVE_SYSCALL_TRACEPOINTS=y
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_IRQ_FORCED_THREADING=y
CONFIG_ISA_DMA_API=y
CONFIG_KERNEL_START=0xc0000000
# CONFIG_KSI8560 is not set
@@ -113,11 +110,12 @@ 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_MDIO_BOARDINFO=y
CONFIG_MIGRATION=y
# CONFIG_MII is not set
+# CONFIG_MLX4_CORE is not set
# CONFIG_MMIO_NVRAM is not set
# CONFIG_MPC8536_DS is not set
# CONFIG_MPC8540_ADS is not set
@@ -126,7 +124,6 @@ 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
@@ -135,6 +132,7 @@ CONFIG_MPIC=y
# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NONSTATIC_KERNEL is not set
CONFIG_NR_IRQS=512
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
@@ -146,8 +144,14 @@ CONFIG_OF_GPIO=y
CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+# CONFIG_P1010_RDB is not set
# CONFIG_P1022_DS is not set
+# CONFIG_P1023_RDS is not set
+# CONFIG_P2041_RDB is not set
# CONFIG_P3041_DS is not set
+# CONFIG_P3060_QDS is not set
# CONFIG_P4080_DS is not set
# CONFIG_P5020_DS is not set
CONFIG_PAGEFLAGS_EXTENDED=y
@@ -162,11 +166,6 @@ 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
@@ -186,37 +185,47 @@ CONFIG_PPC_BOOK3E_MMU=y
# CONFIG_PPC_DCR_NATIVE is not set
# CONFIG_PPC_E500MC is not set
# CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_EPAPR_HV_PIC is not set
CONFIG_PPC_FSL_BOOK3E=y
CONFIG_PPC_I8259=y
-# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_PPC_ICP_HV is not set
+# CONFIG_PPC_ICP_NATIVE is not set
+# CONFIG_PPC_ICS_RTAS 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_P7_NAP is not set
CONFIG_PPC_PCI_CHOICE=y
# CONFIG_PPC_RTAS is not set
+CONFIG_PPC_SMP_MUXED_IPI=y
CONFIG_PPC_UDBG_16550=y
CONFIG_PPC_WERROR=y
+# CONFIG_PPC_WSP is not set
+# CONFIG_PPC_XICS is not set
# 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_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_FSL=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+# CONFIG_SERIAL_8250_RSA is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SERIAL_QE is not set
+CONFIG_SIMPLE_GPIO=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SOCRATES is not set
@@ -224,8 +233,6 @@ 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
@@ -237,6 +244,7 @@ CONFIG_UCC=y
CONFIG_UCC_FAST=y
CONFIG_UCC_GETH=y
# CONFIG_UGETH_TX_ON_DEMAND is not set
+CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_SUPPORT=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_WATCHDOG 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
index d1e672a..1fec3bf 100644
--- a/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch
+++ b/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch
@@ -1,56 +1,8 @@
---- 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 @@
+Index: linux-3.3/arch/powerpc/boot/dts/mpc8568mds.dts
+===================================================================
+--- linux-3.3.orig/arch/powerpc/boot/dts/mpc8568mds.dts 2012-03-29
09:54:23.451336176 +0200
++++ linux-3.3/arch/powerpc/boot/dts/mpc8568mds.dts 2012-03-29
09:54:33.471268611 +0200
+@@ -317,6 +317,9 @@
gpios = <&bcsr5 3 0>;
};
};
@@ -58,3 +10,27 @@
+ linux,stdout-path = "/soc8568@e0000000/serial@4500";
+ };
};
+
+ /include/ "fsl/mpc8568si-post.dtsi"
+Index: linux-3.3/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
+===================================================================
+--- linux-3.3.orig/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
2012-03-29 09:54:23.461336108 +0200
++++ linux-3.3/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi 2012-03-29
09:55:01.651078593 +0200
+@@ -134,17 +134,8 @@
+
+ };
+
+- duart-sleep-nexus {
+- #address-cells = <1>;
+- #size-cells = <1>;
+- compatible = "simple-bus";
+- sleep = <&pmc 0x00000002>;
+- ranges;
+-
+ /include/ "pq3-duart-0.dtsi"
+
+- };
+-
+ L2: l2-cache-controller@20000 {
+ compatible = "fsl,mpc8568-l2-cache-controller";
+ reg = <0x20000 0x1000>;
diff --git a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch
b/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch
index 3cca828..87dae25 100644
--- a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch
+++ b/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch
@@ -1,34 +1,8 @@
---- 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 @@
+Index: linux-3.3/arch/powerpc/boot/dts/mpc8548cds.dts
+===================================================================
+--- linux-3.3.orig/arch/powerpc/boot/dts/mpc8548cds.dts 2012-03-29
09:54:21.801347303 +0200
++++ linux-3.3/arch/powerpc/boot/dts/mpc8548cds.dts 2012-03-29
09:55:36.780841712 +0200
+@@ -301,6 +301,9 @@
0x0 0x100000>;
};
};
@@ -36,3 +10,35 @@
+ linux,stdout-path = "/soc8548@e0000000/serial@4600";
+ };
};
+
+ /include/ "fsl/mpc8548si-post.dtsi"
+Index: linux-3.3/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
+===================================================================
+--- linux-3.3.orig/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
2012-03-29 09:56:00.930678869 +0200
++++ linux-3.3/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi 2012-03-29
10:00:08.549009165 +0200
+@@ -116,7 +116,24 @@
+
+ /include/ "pq3-i2c-0.dtsi"
+ /include/ "pq3-i2c-1.dtsi"
+-/include/ "pq3-duart-0.dtsi"
++
++ serial0: serial@4600 {
++ cell-index = <1>;
++ device_type = "serial";
++ compatible = "fsl,ns16550", "ns16550";
++ reg = <0x4600 0x100>;
++ clock-frequency = <0>;
++ interrupts = <42 2 0 0>;
++ };
++
++ serial1: serial@4500 {
++ cell-index = <0>;
++ device_type = "serial";
++ compatible = "fsl,ns16550", "ns16550";
++ reg = <0x4500 0x100>;
++ clock-frequency = <0>;
++ interrupts = <42 2 0 0>;
++ };
+
+ L2: l2-cache-controller@20000 {
+ compatible = "fsl,mpc8548-l2-cache-controller";
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
index 4d58510..7788c49 100644
--- a/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch
+++ b/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch
@@ -1,6 +1,8 @@
---- 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)
+Index: linux-3.3/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+===================================================================
+--- linux-3.3.orig/arch/powerpc/platforms/85xx/mpc85xx_cds.c 2012-03-19
00:15:34.000000000 +0100
++++ linux-3.3/arch/powerpc/platforms/85xx/mpc85xx_cds.c 2012-03-29
09:38:58.857570759 +0200
+@@ -215,15 +215,16 @@
return -ENODEV;
}
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
index 54a2785..54ffaf0 100644
--- a/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch
+++ b/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch
@@ -1,11 +1,13 @@
---- a/arch/powerpc/boot/dts/mpc8548cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
-@@ -492,8 +492,10 @@
+Index: linux-3.3/arch/powerpc/boot/dts/mpc8548cds.dts
+===================================================================
+--- linux-3.3.orig/arch/powerpc/boot/dts/mpc8548cds.dts 2012-03-29
09:37:54.000000000 +0200
++++ linux-3.3/arch/powerpc/boot/dts/mpc8548cds.dts 2012-03-29
09:40:09.977091196 +0200
+@@ -260,8 +260,10 @@
#address-cells = <0>;
#interrupt-cells = <2>;
compatible = "chrp,iic";
+/*
- interrupts = <0 1>;
+ interrupts = <0 1 0 0>;
interrupt-parent = <&mpic>;
+*/
};
--
1.7.4.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
