mpc52xx: switch to 3.2.9

SVN-Revision: 30955

2 files changed, 99 insertions, 74 deletions

diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile
index 3d9c470177..6d69e9983a 100644
--- a/target/linux/mpc52xx/Makefile
+++ b/target/linux/mpc52xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC52xx
 CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
 FEATURES:=targz ext4
 
-LINUX_VERSION:=2.6.30.10
+LINUX_VERSION:=3.2.9
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/mpc52xx/config-2.6.30 b/target/linux/mpc52xx/config-3.2
index 132c158d05..695e920fbd 100644
--- a/target/linux/mpc52xx/config-2.6.30
+++ b/target/linux/mpc52xx/config-3.2
@@ -4,51 +4,56 @@ CONFIG_6xx=y
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
+CONFIG_AMIGA_PARTITION=y
+# 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_ARPD is not set
+CONFIG_ATA=y
+# CONFIG_ATMEL_PWM is not set
 CONFIG_AUDIT_ARCH=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BLK_DEV_SD=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
-# CONFIG_CGROUP_SCHED is not set
-CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyPSC0,115200"
+CONFIG_CMDLINE_BOOL=y
 CONFIG_COMPAT_BRK=y
+CONFIG_CRC16=y
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_ZLIB is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y
-CONFIG_DEVPORT=y
 CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
@@ -56,126 +61,140 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED6xx is not set
 CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_EPAPR_BOOT is not set
 # CONFIG_EPOLL is not set
-CONFIG_FEC_MPC52xx_MDIO=y
+CONFIG_EXT4_FS=y
 CONFIG_FEC_MPC52xx=y
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FEC_MPC52xx_MDIO=y
 CONFIG_FREEZER=y
 # CONFIG_FSL_ULI1575 is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_FW_LOADER is not set
+CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=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_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
-# CONFIG_GEN_RTC_X is not set
 CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
 CONFIG_GPIOLIB=y
-CONFIG_GROUP_SCHED=y
+CONFIG_GPIO_MPC5200=y
 # CONFIG_HAMRADIO is not set
 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_CLK=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_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=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_HAVE_SYSCALL_TRACEPOINTS=y
 # CONFIG_HVC_RTAS is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HZ_100 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_INOTIFY=y
 # CONFIG_IOMMU_HELPER is not set
-CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IPIC is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MROUTE is not set
+CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_PNP_RARP is not set
-CONFIG_IP_PNP=y
-CONFIG_IRQ_PER_CPU=y
-# CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y
+CONFIG_JBD2=y
 CONFIG_KERNEL_START=0xc0000000
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LXT_PHY=y
+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_MPC5121_ADS is not set
-# CONFIG_MPC5121_GENERIC is not set
+CONFIG_MPC5200_WDT=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_U3_HT_IRQS is not set
 # CONFIG_MPIC_WEIRD is not set
 # CONFIG_MTD is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NET_PCI 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_NET_SCHED is not set
+CONFIG_NET_VENDOR_FREESCALE=y
 # CONFIG_NEW_LEDS is not set
+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=y
-# CONFIG_PACKET_MMAP is not set
+CONFIG_OF_IRQ=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_NET=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
-# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PATA_MPC52xx is not set
+CONFIG_PATA_MPC52xx=y
 CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
-CONFIG_PCI_LEGACY=y
+CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
+CONFIG_PM=y
+CONFIG_PM_CLK=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
-CONFIG_PM=y
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC=y
 CONFIG_PPC32=y
-CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC64 is not set
-# CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_82xx is not set
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BESTCOMM_FEC=y
 CONFIG_PPC_BESTCOMM=y
+CONFIG_PPC_BESTCOMM_ATA=y
+CONFIG_PPC_BESTCOMM_FEC=y
 CONFIG_PPC_BOOK3S=y
+CONFIG_PPC_BOOK3S_32=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_CHRP is not set
@@ -184,69 +203,75 @@ CONFIG_PPC_CLOCK=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 CONFIG_PPC_EFIKA=y
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPC_EPAPR_HV_PIC is not set
 CONFIG_PPC_FPU=y
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
 # 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 is not set
 CONFIG_PPC_LIB_RHEAP=y
 # CONFIG_PPC_LITE5200 is not set
 # CONFIG_PPC_MEDIA5200 is not set
 # CONFIG_PPC_MM_SLICES is not set
 # CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_MPC512x is not set
 # CONFIG_PPC_MPC5200_BUGFIX is not set
-CONFIG_PPC_MPC5200_GPIO=y
+# CONFIG_PPC_MPC5200_LPBFIFO is not set
 # CONFIG_PPC_MPC5200_SIMPLE is not set
 CONFIG_PPC_MPC52xx=y
 CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 CONFIG_PPC_OF=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+# CONFIG_PPC_P7_NAP is not set
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_RTAS=y
-CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_RTAS_DAEMON is not set
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
 # CONFIG_PPC_UDBG_16550 is not set
-CONFIG_PPC=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_QUOTACTL is not set
 # CONFIG_RD_LZMA is not set
 # CONFIG_RTAS_ERROR_LOGGING is not set
 CONFIG_RTAS_PROC=y
-# CONFIG_RT_GROUP_SCHED 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_SCSI=y
 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx=y
+CONFIG_SERIAL_MPC52xx_CONSOLE=y
+CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 # CONFIG_SLAB is not set
-# CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y
-# CONFIG_SPI_MPC52xx_PSC is not set
 # CONFIG_SQUASHFS is not set
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SWIOTLB is not set
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TRACING_SUPPORT=y
 # CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_UNEVICTABLE_LRU=y
+CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USER_SCHED=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_WATCHDOG is not set
-# CONFIG_WLAN_80211 is not set
+CONFIG_WATCHDOG_NOWAYOUT=y
+# CONFIG_WATCHDOG_RTAS is not set
 CONFIG_WORD_SIZE=32