diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-16 21:46:44 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-16 21:46:44 +0000 |
| commit | c96ef1722ed0013063687ceef633809169e93859 (patch) | |
| tree | 16ff41659c1718651030b3fea9bf6dfc795fd597 /target/linux/rdc-2.6/image | |
| parent | 6803b047916838c065b77dff2e1ff4037f43056d (diff) | |
No longer mark rdc-2.6 as broken, squashfs is now working, thanks sn9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6976 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rdc-2.6/image')
| -rw-r--r-- | target/linux/rdc-2.6/image/Makefile | 21 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/image/preinit.arch | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/target/linux/rdc-2.6/image/Makefile b/target/linux/rdc-2.6/image/Makefile index 7cb4e043fb..e73d27b047 100644 --- a/target/linux/rdc-2.6/image/Makefile +++ b/target/linux/rdc-2.6/image/Makefile @@ -12,29 +12,26 @@ define Image/Prepare endef define trxalign/jffs2-128k --a 0x20000 +bs=128k endef define trxalign/jffs2-64k --a 0x10000 +bs=64k endef define trxalign/squashfs --a 1024 +bs=1024 endef define Image/Build/Airlink - touch $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).img -ifneq ($(1),squashfs) - $(STAGING_DIR)/bin/airlink -b 1 -j 64 $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).img -else - $(STAGING_DIR)/bin/airlink -b 1 $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).img -endif + touch $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img + mv $(KDIR)/root.$(1) $(KDIR)/root.tmp + dd of=$(KDIR)/root.$(1) if=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync + rm -f $(KDIR)/root.tmp + $(STAGING_DIR)/bin/airlink -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img endef define Image/Build $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).bzImage -ifneq ($(1),jffs2-128K) - $(call Image/Build/Airlink,$(1),ar525w,$(patsubst jffs2-%,jffs2,$(1))) -endif + $(call Image/Build/Airlink,$(1),ar525w,$(patsubst jffs2-%k,%,$(1))) endef $(eval $(call BuildImage)) diff --git a/target/linux/rdc-2.6/image/preinit.arch b/target/linux/rdc-2.6/image/preinit.arch new file mode 100644 index 0000000000..2e88efda56 --- /dev/null +++ b/target/linux/rdc-2.6/image/preinit.arch @@ -0,0 +1,2 @@ +mount_root ${FAILSAFE:+failsafe} +exec /bin/busybox init |