diff options
| author | John Crispin <john@openwrt.org> | 2013-10-07 15:02:52 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-10-07 15:02:52 +0000 |
| commit | ae225124c64bf8f5d833e8317ffa911f7fffc10f (patch) | |
| tree | 09ec02627122d329b9dec0994bc0801d77e57675 | |
| parent | 1398a5d8497afa3650d85c7511f0a2d3eafcba8b (diff) | |
| download | upstream-ae225124c64bf8f5d833e8317ffa911f7fffc10f.tar.gz upstream-ae225124c64bf8f5d833e8317ffa911f7fffc10f.tar.bz2 upstream-ae225124c64bf8f5d833e8317ffa911f7fffc10f.zip | |
lantiq: fix fritz image generation
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 38326
| -rw-r--r-- | target/linux/lantiq/image/Makefile | 16 | ||||
| -rw-r--r-- | target/linux/lantiq/xrx200/target.mk | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index b308188317..ff15896745 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -55,8 +55,9 @@ endef define MkImageEVA lzma2eva 0x80002000 0x80002000 $(KDIR)/vmlinux-$(1).lzma $(KDIR)/$(1).eva.prealign - dd if=$(KDIR)/$(1).eva.prealign of=$(KDIR)/$(1).eva bs=64k conv=sync - cat ./eva.dummy.squashfs >> $(KDIR)/$(1).eva + dd if=$(KDIR)/$(1).eva.prealign of=$(KDIR)/$(1).eva.align.64k bs=64k conv=sync + dd if=$(KDIR)/$(1).eva.prealign of=$(KDIR)/$(1).eva.align.128k bs=128k conv=sync + cat ./eva.dummy.squashfs >> $(KDIR)/$(1).eva.align.64k endef define CompressGzip @@ -88,7 +89,7 @@ define Image/BuildTPLink/squashfs endef define Image/BuildEVA/squashfs - cat $(KDIR)/$(2).eva $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva + cat $(KDIR)/$(2).eva.align.64k $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva) endef @@ -98,8 +99,8 @@ define Image/BuildLoader/squashfs $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image) endef -define Image/BuildNANDEVA/jffs2-128k - cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).rootfs +define Image/BuildEVA/jffs2-128k + cat $(KDIR)/$(2).eva.align.128k $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image.eva endef define Image/Build/jffs2-64k @@ -156,7 +157,8 @@ endef define Image/BuildKernelEVA/Template $(call PatchKernelLzma,$(1)) $(call MkImageEVA,$(1)) - $(CP) $(KDIR)/$(1).eva $(BIN_DIR)/$(IMG_PREFIX)-$(1).eva + $(CP) $(KDIR)/$(1).eva.align.64k $(BIN_DIR)/$(IMG_PREFIX)-$(1).eva.align.64k + $(CP) $(KDIR)/$(1).eva.align.128k $(BIN_DIR)/$(IMG_PREFIX)-$(1).eva.align.128k endef define Image/BuildKernelGzip/Template @@ -274,7 +276,7 @@ Image/BuildKernel/Profile/EASY80920NOR=$(call Image/BuildKernel/Template,EASY809 Image/Build/Profile/EASY80920NOR=$(call Image/Build/$(1),$(1),EASY80920NOR) Image/BuildKernel/Profile/FRITZ3370=$(call Image/BuildKernelEVA/Template,FRITZ3370) -Image/Build/Profile/FRITZ3370=$(call Image/BuildNANDEVA/$(1),$(1),FRITZ3370) +Image/Build/Profile/FRITZ3370=$(call Image/BuildEVA/$(1),$(1),FRITZ3370) Image/BuildKernel/Profile/VG3503J=$(call Image/BuildKernelLoader/Template,VG3503J) Image/Build/Profile/VG3503J=$(call Image/BuildLoader/$(1),$(1),VG3503J) diff --git a/target/linux/lantiq/xrx200/target.mk b/target/linux/lantiq/xrx200/target.mk index b0be140057..8a9e02090c 100644 --- a/target/linux/lantiq/xrx200/target.mk +++ b/target/linux/lantiq/xrx200/target.mk @@ -1,7 +1,7 @@ ARCH:=mips SUBTARGET:=xrx200 BOARDNAME:=XRX200 -FEATURES:=squashfs atm mips16 +FEATURES:=squashfs atm mips16 jffs2 CPU_TYPE:=34kc CPU_SUBTYPE:=dsp |