aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-02-10 18:03:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-02-10 18:03:22 +0000
commitb0a5eaf248a52ece3359cd8ab1748ad98841cc6d (patch)
tree95e99d67638a3d00c26718a1d4972b55ef171171 /target/linux
parentc912bfd0d51d00abd7c8b3bdb3816ac51ae9abb8 (diff)
downloadmaster-187ad058-b0a5eaf248a52ece3359cd8ab1748ad98841cc6d.tar.gz
master-187ad058-b0a5eaf248a52ece3359cd8ab1748ad98841cc6d.tar.bz2
master-187ad058-b0a5eaf248a52ece3359cd8ab1748ad98841cc6d.zip
[realview] switch to 2.6.37
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25449 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/realview/Makefile2
-rw-r--r--target/linux/realview/config-default2
2 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile
index 51c8eabcd0..4dabb4905a 100644
--- a/target/linux/realview/Makefile
+++ b/target/linux/realview/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=ARM Ltd. Realview board (qemu)
FEATURES:=squashfs jffs2 fpu
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -funit-at-a-time
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.37
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/realview/config-default b/target/linux/realview/config-default
index f1a6427ba5..46abf4e237 100644
--- a/target/linux/realview/config-default
+++ b/target/linux/realview/config-default
@@ -12,6 +12,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_ARM=y
CONFIG_ARM_AMBA=y
# CONFIG_ARM_CHARLCD is not set
+# CONFIG_ARM_ERRATA_411920 is not set
# CONFIG_ARM_ERRATA_430973 is not set
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
@@ -164,6 +165,7 @@ CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SMC91X=y
CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
CONFIG_SMSC911X=y
CONFIG_SMSC_PHY=y
CONFIG_SND=y