2 files changed, 23 insertions, 5 deletions
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index ef67446f93..7fbef341b1 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -10,10 +10,10 @@ ARCH:=powerpc
 BOARD:=mpc85xx
 BOARDNAME:=Freescale MPC85xx
 CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=8540
-FEATURES:=spe_fpu ramdisk broken
+FEATURES:=spe_fpu ramdisk
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=2.6.36.4
+LINUX_VERSION:=2.6.38
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index 8c08c30404..1b57fb5d1e 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -1,6 +1,7 @@
 # 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
@@ -16,6 +17,8 @@ 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_BOUNCE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
@@ -33,10 +36,11 @@ CONFIG_E500=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FORCE_MAX_ZONEORDER=11
+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
@@ -51,10 +55,12 @@ 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_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
@@ -62,6 +68,7 @@ CONFIG_GEN_RTC=y
 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
@@ -76,14 +83,17 @@ 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
@@ -104,6 +114,7 @@ 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
@@ -123,18 +134,23 @@ CONFIG_MPIC=y
 # 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
@@ -171,6 +187,7 @@ 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_FSL_BOOK3E=y
 CONFIG_PPC_I8259=y
 # CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y
@@ -185,11 +202,13 @@ CONFIG_PPC_PCI_CHOICE=y
 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
@@ -208,7 +227,6 @@ CONFIG_SPE=y
 # CONFIG_STX_GP3 is not set
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_SUSPEND_NVS=y
 CONFIG_SWIOTLB=y
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TQM8540 is not set