qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 11:12:47 +02:00
Code

give Aruba some love - add support for the combined flash layout

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7283 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2007-05-20 18:51:23 +00:00
parent 21c566be05
commit f2146ff453
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/aruba-2.6/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
ARCH:=mips ARCH:=mips
BOARD:=aruba BOARD:=aruba
BOARDNAME:=Aruba BOARDNAME:=Aruba
FEATURES:=jffs2 FEATURES:=squashfs jffs2
define Target/Description define Target/Description
Build firmware images for Aruba boards Build firmware images for Aruba boards

3
target/linux/aruba-2.6/config/default
View File

@ -67,7 +67,7 @@ CONFIG_MACH_ARUBA=y
# CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set # CONFIG_MACH_JAZZ is not set
# CONFIG_MACH_VR41XX is not set # CONFIG_MACH_VR41XX is not set
CONFIG_MINI_FO=m CONFIG_MINI_FO=y
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_ATLAS is not set
# CONFIG_MIPS_BOSPORUS is not set # CONFIG_MIPS_BOSPORUS is not set
@ -151,6 +151,7 @@ CONFIG_MTD_PHYSMAP_START=0x1fc00000
# CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_ROM is not set # CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set # CONFIG_MTD_SLRAM is not set
CONFIG_MTD_SPLIT_ROOTFS=y
CONFIG_NATSEMI=y CONFIG_NATSEMI=y
# CONFIG_NE2K_PCI is not set # CONFIG_NE2K_PCI is not set
# CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_3COM is not set

9
target/linux/aruba-2.6/image/Makefile
View File

@ -31,11 +31,18 @@ define Image/BuildKernel
endef endef
define Image/Build/jffs2-64k define Image/Build/jffs2-64k
@dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync @dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=786432 conv=sync
@cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp @cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
mv $(KDIR)/image.tmp $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin mv $(KDIR)/image.tmp $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin
endef endef
define Image/Build/squashfs
@dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=786432 conv=sync
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
@cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
@dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin bs=64k conv=sync
endef
define Image/Build define Image/Build
$(call Image/Build/$(1),$(1)) $(call Image/Build/$(1),$(1))
endef endef

6
target/linux/aruba-2.6/patches/000-aruba.patch
View File

@ -630,9 +630,9 @@ diff -Nur linux-2.6.17/arch/mips/aruba/prom.c linux-2.6.17-owrt/arch/mips/aruba/
+ +
+/* Kernel Boot parameters */ +/* Kernel Boot parameters */
+static unsigned char bootparm[] = +static unsigned char bootparm[] =
+ "init=/etc/preinit " + "init=/etc/preinit noinitrd "
+ "mtdparts=physmap-flash.0:3520k@0x080000(zImage),2752k@0x140000(JFFS2),8k@0x3f8000(NVRAM) " + "mtdparts=physmap-flash.0:3520k@0x080000(kernel),2752k@0x140000(rootfs),8k@0x3f8000(NVRAM) "
+ "console=ttyS0,9600 root=/dev/mtdblock1 rootfstype=jffs2 "; + "console=ttyS0,9600 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 ";
+ +
+extern unsigned long mips_machgroup; +extern unsigned long mips_machgroup;
+extern unsigned long mips_machtype; +extern unsigned long mips_machtype;