upgrade to 2.6.15.6, fix default config for Aruba

[openwrt.git] / openwrt / target / linux / aruba-2.6 / Makefile

diff --git a/openwrt/target/linux/aruba-2.6/Makefile b/openwrt/target/linux/aruba-2.6/Makefile
index 02ed5c4..667f976 100644 (file)
--- a/openwrt/target/linux/aruba-2.6/Makefile
+++ b/openwrt/target/linux/aruba-2.6/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk
 

-LINUX_VERSION:=2.6.15
+LINUX_VERSION:=2.6.15.6

 LINUX_RELEASE:=1
 LINUX_RELEASE:=1

-LINUX_KERNEL_MD5SUM:=cdf95e00f5111e31f78e1d97304d9522
+LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca

 
 include ../rules.mk
 include ./config
 
 include ../rules.mk
 include ./config


@@ -14,6 +14,10 @@ include ../kernel.mk
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
        [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
        [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)

-       @cp config $(LINUX_DIR)/.config
+ifeq ($(BR2_ARUBA_RAMDISK),y)
+       @$(CP) config-ramdisk $(LINUX_DIR)/.config
+else
+       @$(CP) config $(LINUX_DIR)/.config
+endif

        touch $@
 
        touch $@