From 7b61262aa3d0e987e5f4532fedfd40b20227fc4b Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 8 Nov 2009 22:55:44 +0000 Subject: [PATCH] also support pcmcia SVN-Revision: 18349 --- target/linux/rdc/Makefile | 2 +- target/linux/rdc/config-2.6.30 | 5 +---- target/linux/rdc/config/profile-wl153 | 1 - target/linux/rdc/image/Makefile | 31 +++++++++++++++++---------- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index 0abff00397..09b81c8ab0 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=i386 BOARD:=rdc BOARDNAME:=RDC 321x -FEATURES:=squashfs jffs2 pci usb +FEATURES:=squashfs jffs2 pci usb pcmcia CFLAGS:=-Os -pipe -march=i486 -funit-at-a-time LINUX_VERSION:=2.6.30.9 diff --git a/target/linux/rdc/config-2.6.30 b/target/linux/rdc/config-2.6.30 index 6dc046afe9..81ec1c57a9 100644 --- a/target/linux/rdc/config-2.6.30 +++ b/target/linux/rdc/config-2.6.30 @@ -28,6 +28,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_BASE_SMALL=1 # CONFIG_BINARY_PRINTF is not set CONFIG_BITREVERSE=y +# CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -52,7 +53,6 @@ CONFIG_CMDLINE_BOOL=y # CONFIG_DCDBAS is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_FS is not set -CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set @@ -132,7 +132,6 @@ CONFIG_HZ_250=y # CONFIG_I8K is not set # CONFIG_IB700_WDT is not set # CONFIG_IBMASR is not set -CONFIG_INITRAMFS_SOURCE="" # CONFIG_IOMMU_API is not set # CONFIG_IOMMU_HELPER is not set CONFIG_IO_DELAY_0X80=y @@ -232,8 +231,6 @@ CONFIG_PHYSICAL_START=0x100000 CONFIG_PROCESSOR_SELECT=y # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_RDC321X_WDT=m -CONFIG_RD_GZIP=y -# CONFIG_RD_LZMA is not set # CONFIG_RELOCATABLE is not set # CONFIG_RTC is not set # CONFIG_RWSEM_GENERIC_SPINLOCK is not set diff --git a/target/linux/rdc/config/profile-wl153 b/target/linux/rdc/config/profile-wl153 index 3e18b0e677..e69de29bb2 100644 --- a/target/linux/rdc/config/profile-wl153 +++ b/target/linux/rdc/config/profile-wl153 @@ -1 +0,0 @@ -# CONFIG_BLK_DEV_INITRD is not set diff --git a/target/linux/rdc/image/Makefile b/target/linux/rdc/image/Makefile index 6d3825312f..315d917473 100644 --- a/target/linux/rdc/image/Makefile +++ b/target/linux/rdc/image/Makefile @@ -39,21 +39,21 @@ define Image/Prepare/wl153/squashfs echo -n "0123456789abcdef0123" >> $(KDIR)/root.tmp cat $(KDIR)/bzImage $(KDIR)/root.squashfs >> $(KDIR)/root.tmp dd if=$(KDIR)/root.tmp of=$(KDIR)/root2.tmp bs=64k conv=sync - dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=$$$$[0x$$$$(cat $(KDIR)/bzSize) + 0x8014] + dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=$$$$(perl -we 'print((-s"$(KDIR)/bzImage")+0x8014)') + $(RM) $(KDIR)/root.tmp $(KDIR)/root2.tmp $(call add_jffs2_mark,$(KDIR)/root.squashfs) endef define Image/Build/wl153 - ls -l $(KDIR)/bzImage | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/' | xargs printf '%.8x' > $(KDIR)/bzSize + echo -ne "\0\0" >> $(KDIR)/bzImage + dd if=$(KDIR)/bzImage of=$(KDIR)/bzImage.tmp bs=4 conv=sync + dd if=$(KDIR)/bzImage.tmp of=$(KDIR)/bzImage bs=1 count=$$$$(perl -we 'print((-s"$(KDIR)/bzImage.tmp")-2)') + perl -we 'while(<>){$$$$i.=$$$$_}print pack"v",-(unpack"%v*",$$$$i)' < $(KDIR)/bzImage.tmp >> $(KDIR)/bzImage + $(RM) $(KDIR)/bzImage.tmp $(call Image/Prepare/wl153/$(1)) - ls -l $(KDIR)/root.$(1) | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/' | xargs printf '%.8x' > $(KDIR)/rdSize - echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/bzSize)\x$$$$(cut -c 5,6 < $(KDIR)/bzSize)\x$$$$(cut -c 3,4 < $(KDIR)/bzSize)\x$$$$(cut -c 1,2 < $(KDIR)/bzSize)" > $(KDIR)/bzSize.tmp - echo -n 'CSYS' > $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img - cat $(KDIR)/bzSize.tmp >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img - echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/rdSize)\x$$$$(cut -c 5,6 < $(KDIR)/rdSize)\x$$$$(cut -c 3,4 < $(KDIR)/rdSize)\x$$$$(cut -c 1,2 < $(KDIR)/rdSize)WRRM" >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img - cat $(KDIR)/bzSize.tmp $(KDIR)/bzImage $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img - $(RM) $(KDIR)/bzSize.tmp $(KDIR)/bzSize $(KDIR)/rdSize - if [ `ls -l $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/'` -gt $$$$((0xffff0000-0xffe08000)) ]; then mv $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img.too_big; echo "#ERR image too big"; fi + perl -we 'print "CSYS",pack("V",-s"$(KDIR)/bzImage"),pack("V",-s"$(KDIR)/root.$(1)"),"WRRM",pack("V",-s"$(KDIR)/bzImage")' > $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img + cat $(KDIR)/bzImage $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img + if [ `perl -we 'print -s"$(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img"'` -gt $$$$((0xffff0000-0xffe08000)) ]; then mv $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img.too_big; echo "#ERR image too big"; fi endef define Image/Build/dir450 @@ -75,8 +75,17 @@ define Image/Build/g570s $(RM) -r $(KDIR)/zyxel.tmp endef +define Image/Prepare/amit/squashfs + echo -n "0123456789abcdef" > $(KDIR)/root.tmp + cat $(KDIR)/root.squashfs >> $(KDIR)/root.tmp + dd if=$(KDIR)/root.tmp of=$(KDIR)/root2.tmp bs=64k conv=sync + dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=16 + $(RM) $(KDIR)/root.tmp $(KDIR)/root2.tmp + $(call add_jffs2_mark,$(KDIR)/root.squashfs) +endef + define Image/Build/amit - $(call Image/Prepare/$(1)) + $(call Image/Prepare/amit/$(1)) if [ ! -x $(STAGING_DIR_HOST)/bin/amit_makebin ]; then echo "#ERR Please copy the AMIT \"makebin\" tool from http://mgb111.pradnik.net/ as $(STAGING_DIR_HOST)/bin/amit_makebin to build."; fi sh -c "mkdir -p $(KDIR)/amit.tmp/linux_src/arch/i386/boot $(KDIR)/amit.tmp/rom_disk && cd $(KDIR)/amit.tmp && ln -s ../../root.$(1) rom_disk/fs.img && ln -s ../../../../../bzImage linux_src/arch/i386/boot && $(STAGING_DIR_HOST)/bin/amit_makebin && mv upgrade.img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-anas350.bin" || : $(RM) -r $(KDIR)/amit.tmp -- 2.30.2