summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openwrt/target/Makefile.in16
-rw-r--r--openwrt/target/jffs2/jffs2root.mk1
2 files changed, 4 insertions, 13 deletions
diff --git a/openwrt/target/Makefile.in b/openwrt/target/Makefile.in
index aeceb3c14..d40fd158d 100644
--- a/openwrt/target/Makefile.in
+++ b/openwrt/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/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk
index b14f2d0f7..5e9380821 100644
--- a/openwrt/target/jffs2/jffs2root.mk
+++ b/openwrt/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 \