ppc40x: switch to 3.2.9

SVN-Revision: 30791

5 files changed, 62 insertions, 40 deletions

diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index 2efb13a8de..87d5d6b568 100644
--- a/target/linux/ppc40x/Makefile
+++ b/target/linux/ppc40x/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs
 CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=3.0.18
+LINUX_VERSION:=3.2.9
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index da318a2187..7cb2b60aca 100644
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -6,48 +6,47 @@ CONFIG_4xx=y
 CONFIG_4xx_SOC=y
 # CONFIG_ACADIA 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_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_BITREVERSE=y
+CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DEFAULT_UIMAGE is not set
-CONFIG_DEVPORT=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EP405 is not set
+# CONFIG_EPAPR_BOOT is not set
 CONFIG_EXTRA_TARGETS="uImage"
-CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FSL_ULI1575 is not set
-# CONFIG_FSNOTIFY 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__DO_IRQ=y
-# CONFIG_GENERIC_IOMAP 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_TBSYNC is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
@@ -58,6 +57,7 @@ CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HAS_RAPIDIO is not set
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -68,62 +68,71 @@ 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_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=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_HCU4 is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 # CONFIG_HOTFOOT is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
-CONFIG_IBM_NEW_EMAC=y
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-CONFIG_IBM_NEW_EMAC_EMAC4=y
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RGMII=y
-CONFIG_IBM_NEW_EMAC_RXB=256
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-CONFIG_IBM_NEW_EMAC_TXB=256
+CONFIG_IBM_EMAC=y
+CONFIG_IBM_EMAC_EMAC4=y
+CONFIG_IBM_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_RGMII=y
+CONFIG_IBM_EMAC_RXB=256
+CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
+CONFIG_IBM_EMAC_TXB=256
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IPIC is not set
-# CONFIG_IRQSTACKS is not set
-CONFIG_IRQ_PER_CPU=y
 CONFIG_ISA_DMA_API=y
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_I4L is not set
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_KILAUEA=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_OF=y
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_MAGICBOX=y
 # CONFIG_MAKALU is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MAX_ACTIVE_REGIONS=32
+# CONFIG_MLX4_CORE is not set
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_U3_HT_IRQS is not set
 # CONFIG_MPIC_WEIRD is not set
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_GEOMETRY is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NLS=m
 CONFIG_NOT_COHERENT_CACHE=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_NET=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
 CONFIG_OPENRB=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
@@ -137,11 +146,16 @@ CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PPC=y
 CONFIG_PPC32=y
 CONFIG_PPC40x_SIMPLE=y
+CONFIG_PPC4xx_MSI=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PPC64 is not set
 # CONFIG_PPC_85xx is not set
 # 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_BOOK3S_32 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
@@ -150,24 +164,32 @@ CONFIG_PPC_DCR=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_DCR_NATIVE=y
 # CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPC_EPAPR_HV_PIC is not set
 # CONFIG_PPC_I8259 is not set
-# 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_MMU_NOHASH=y
-CONFIG_PPC_MMU_NOHASH_32=y
 # CONFIG_PPC_MM_SLICES is not set
 # CONFIG_PPC_MPC106 is not set
+CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_OF=y
+# CONFIG_PPC_P7_NAP is not set
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_RTAS is not set
 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_QUOTACTL is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCHED_HRTICK=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -179,9 +201,9 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SLUB=y
 CONFIG_SWIOTLB=y
 CONFIG_TASK_SIZE=0xc0000000
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
 CONFIG_USB=m
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_COMMON=m
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
@@ -189,10 +211,10 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_WALNUT is not set
 CONFIG_WORD_SIZE=32
 # CONFIG_XILINX_SYSACE is not set
 # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
+CONFIG_XZ_DEC=y
diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch
index 97de79c4e1..d8eb1730d6 100644
--- a/target/linux/ppc40x/patches/004-magicbox.patch
+++ b/target/linux/ppc40x/patches/004-magicbox.patch
@@ -407,7 +407,7 @@
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -198,6 +200,7 @@ image-$(CONFIG_EP405)			+= dtbImage.ep40
+@@ -199,6 +201,7 @@ image-$(CONFIG_EP405)			+= dtbImage.ep40
  image-$(CONFIG_HOTFOOT)			+= cuImage.hotfoot
  image-$(CONFIG_WALNUT)			+= treeImage.walnut
  image-$(CONFIG_ACADIA)			+= cuImage.acadia
@@ -417,7 +417,7 @@
  image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -62,6 +62,16 @@ config KILAUEA
+@@ -54,6 +54,16 @@ config KILAUEA
  	help
  	  This option enables support for the AMCC PPC405EX evaluation board.
  
diff --git a/target/linux/ppc40x/patches/005-openrb.patch b/target/linux/ppc40x/patches/005-openrb.patch
index ca998c67d5..9f1202b8ca 100644
--- a/target/linux/ppc40x/patches/005-openrb.patch
+++ b/target/linux/ppc40x/patches/005-openrb.patch
@@ -408,7 +408,7 @@
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -201,6 +202,7 @@ image-$(CONFIG_HOTFOOT)			+= cuImage.hot
+@@ -202,6 +203,7 @@ image-$(CONFIG_HOTFOOT)			+= cuImage.hot
  image-$(CONFIG_WALNUT)			+= treeImage.walnut
  image-$(CONFIG_ACADIA)			+= cuImage.acadia
  image-$(CONFIG_MAGICBOX)		+= cuImage.magicbox
@@ -418,7 +418,7 @@
  image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -72,6 +72,16 @@ config MAGICBOX
+@@ -64,6 +64,16 @@ config MAGICBOX
  	help
  	  This option enables support for the Magicbox boards.
  
diff --git a/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch b/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch
index c296a12063..0b4bb0d3de 100644
--- a/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch
+++ b/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch
@@ -19,7 +19,7 @@
  	depends on CPU_CAVIUM_OCTEON
 --- a/drivers/ata/Makefile
 +++ b/drivers/ata/Makefile
-@@ -80,6 +80,7 @@ obj-$(CONFIG_PATA_AT91)		+= pata_at91.o
+@@ -81,6 +81,7 @@ obj-$(CONFIG_PATA_AT91)		+= pata_at91.o
  obj-$(CONFIG_PATA_CMD640_PCI)	+= pata_cmd640.o
  obj-$(CONFIG_PATA_ISAPNP)	+= pata_isapnp.o
  obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o