Add a toggle for ramdisk support

SVN-Revision: 3030

openwrt/target/linux/Config.in

@@ -22,7 +22,7 @@ endmenu
 
 menu "Kernel Configuration / Device Support"
 
-comment "Device specific modules"
+comment "Device specific configuration"
 
 source "target/linux/*-2.[46]/Config.in"
 

openwrt/target/linux/aruba-2.6/Makefile

@@ -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)
+ifeq ($(BR2_ARUBA_RAMDISK),y)
+	@cp config-ramdisk $(LINUX_DIR)/.config
+else
 	@cp config $(LINUX_DIR)/.config
+endif
 	touch $@
 

openwrt/target/linux/aruba-2.6/config

@@ -157,9 +157,7 @@ CONFIG_SYSCTL=y
 CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
-CONFIG_INITRAMFS_SOURCE="../root"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
 # CONFIG_KALLSYMS is not set

openwrt/target/linux/image/aruba/Makefile

@@ -26,6 +26,16 @@ ifeq ($(FS),jffs2-4MB)
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
 	./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
 
+ifneq ($(BR2_ARUBA_RAMDISK),y)
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari $(KDIR)/root.$(FS)
+	@dd if=$< of=$@.tmp bs=655360 conv=sync
+	@cat $(KDIR)/root.$(FS) >> $@.tmp
+	@dd if=$@.tmp of=$@ bs=3604480 conv=sync
+	@rm -f $@.tmp
+
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
+endif
+
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
 endif
 endif