X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b0edeb40eabb575ec6a24fefcfcb61d71e13d3d2..HEAD:/target/linux/kirkwood/image/Makefile diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index ee29a95b6..c93be6751 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -JFFS2OPTS_NAND += --little-endian --pagesize=0x800 --no-cleanmarkers --pad +JFFS2OPTS += --little-endian --pagesize=0x800 --no-cleanmarkers --pad define Image/Prepare cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage @@ -21,16 +21,21 @@ endef define Image/Build $(if $(Image/Build/$(1)), \ $(call Image/Build/$(1),$(1)), \ - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img \ + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img \ ) endef +define Image/Build/jffs2-128k + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img \ + bs=2048 conv=sync +endef + define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) ( \ dd if=$(KDIR)/uImage bs=4096k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ - ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img + ) > $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img endef $(eval $(call BuildImage))