diff options
| author | Mike Baker <mbm@openwrt.org> | 2005-03-04 04:43:26 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2005-03-04 04:43:26 +0000 |
| commit | 1eb7eb06462eaec78beb90435d497e710610845c (patch) | |
| tree | dd9be5e244e73e9dbef27b43ba79d9605d696247 /target | |
| parent | 7b295b2e9877e3ec7ef08195a17bc4a4edd47afa (diff) | |
| download | upstream-1eb7eb06462eaec78beb90435d497e710610845c.tar.gz upstream-1eb7eb06462eaec78beb90435d497e710610845c.tar.bz2 upstream-1eb7eb06462eaec78beb90435d497e710610845c.zip | |
cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@304 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile.in | 16 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 1 |
2 files changed, 4 insertions, 13 deletions
diff --git a/target/Makefile.in b/target/Makefile.in index aeceb3c149..d40fd158d7 100644 --- a/target/Makefile.in +++ b/target/Makefile.in @@ -1,28 +1,18 @@ # Default target skeleton stuff, may be overridden EXTRAVERSION:= -XXX:= TARGET_SKELETON=target/default/skel.tar.gz TARGET_SKEL_DIR=target/default/target_skeleton include target/device/Makefile.in -ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -include target/jffs2/blocksize.mk -JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE) -endif - openwrt-linux.trx: openwrt-trx - @PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ + PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) openwrt-code.bin: openwrt-addpattern openwrt-linux.trx - @PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \ + PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \ -o openwrt-$(TAG)-code$(EXTRAVERSION).bin -g - @sed -i -e "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin - -ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -else -endif + @$(SED) "1s,^W54S,$(TAG)," openwrt-$(TAG)-code$(EXTRAVERSION).bin openwrt-image-clean: @-rm openwrt-* 2>/dev/null diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index b14f2d0f76..5e9380821b 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -46,6 +46,7 @@ jffs2root-dirclean: ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) TARGETS+=openwrt-image ROOTFS=jffs2 +JFFS2FLAGS=-a $(JFFS2_BLOCK_SIZE) openwrt-image: openwrt @make jffs2root openwrt-code.bin TAG=W54G \ |