aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/image
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2006-01-16 19:16:51 +0000
committerMike Baker <mbm@openwrt.org>2006-01-16 19:16:51 +0000
commitb38a864924c2d5385928b58c416954b5cd189ffa (patch)
tree0d972e85e9dc051001e7f495aca7c24491395d77 /target/linux/image
parentf29a368c3dc265edde927e64f51ff181089bab81 (diff)
downloadupstream-b38a864924c2d5385928b58c416954b5cd189ffa.tar.gz
upstream-b38a864924c2d5385928b58c416954b5cd189ffa.tar.bz2
upstream-b38a864924c2d5385928b58c416954b5cd189ffa.zip
move natsemi module into the kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2997 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/image')
-rw-r--r--target/linux/image/aruba/Makefile21
1 files changed, 4 insertions, 17 deletions
diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index aba11156d7..59bf59777b 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -15,31 +15,18 @@ ifeq ($(IB),)
$(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
cat $^ | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false)
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).ari: $(KDIR)/vmlinux.lzma
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).ari
-endif
-
-ifeq ($(FS),jffs2-8MB)
-TRXALIGN:=-a 0x20000
-endif
-ifeq ($(FS),jffs2-4MB)
-TRXALIGN:=-a 0x10000
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/vmlinux.lzma
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
endif
ifeq ($(KERNEL),2.6)
FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
ifeq ($(FS),jffs2-4MB)
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).ari: $(KDIR)/loader.elf
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).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
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
endif
endif