Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar71xx: remove split kernel/rootfs images where the sysupgrade image can be written to flash directly

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-11-29 10:05:46 +01:00
parent cc550d0005
commit eff858e8df
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/ar71xx/image/legacy.mk
View file

@ -468,12 +468,6 @@ define Image/Build/dLAN
$(eval rootsize=$(call mtdpartsize,rootfs,$(4))) $(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(eval kernsize=$(call mtdpartsize,kernel,$(4))) $(eval kernsize=$(call mtdpartsize,kernel,$(4)))
$(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize))) $(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize)))
if [ -e "$(call factoryname,$(1),$(2))" ]; then \
dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
dd if=$(KDIR)/root.$(1) \
of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
fi
endef endef
Image/Build/dLANLzma/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4)) Image/Build/dLANLzma/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
@ -485,12 +479,6 @@ define Image/Build/Ath
$(eval rootsize=$(call mtdpartsize,rootfs,$(4))) $(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(eval kernsize=$(call mtdpartsize,kernel,$(4))) $(eval kernsize=$(call mtdpartsize,kernel,$(4)))
$(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize))) $(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize)))
if [ -e "$(call sysupname,$(1),$(2))" ]; then \
dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
dd if=$(KDIR)/root.$(1) \
of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
fi
endef endef
Image/Build/AthGzip/buildkernel=$(call MkuImageGzip,$(2),$(3) $(4)) Image/Build/AthGzip/buildkernel=$(call MkuImageGzip,$(2),$(3) $(4))
@ -532,10 +520,6 @@ define Image/Build/EnGenius
$(eval kernsize=$(call mtdpartsize,kernel,$(4))) $(eval kernsize=$(call mtdpartsize,kernel,$(4)))
$(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize))) $(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize)))
if [ -e "$(call sysupname,$(1),$(2))" ]; then \ if [ -e "$(call sysupname,$(1),$(2))" ]; then \
dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
dd if=$(KDIR)/root.$(1) \
of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
mksenaofw -e $(call sysupname,$(1),$(2)) \ mksenaofw -e $(call sysupname,$(1),$(2)) \
-o $(call imgname,$(1),$(2))-factory.dlf \ -o $(call imgname,$(1),$(2))-factory.dlf \
-r 0x101 -p $(7) -t 2; \ -r 0x101 -p $(7) -t 2; \
@ -855,7 +839,7 @@ define Image/Build/Zcomax
$(STAGING_DIR_HOST)/bin/mkzcfw \ $(STAGING_DIR_HOST)/bin/mkzcfw \
-B $(2) \ -B $(2) \
-k $(KDIR_TMP)/vmlinux-$(2).uImage \ -k $(KDIR_TMP)/vmlinux-$(2).uImage \
-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ -r $(KDIR)/root.$(1) \
-o $(call imgname,$(1),$(2))-factory.img; \ -o $(call imgname,$(1),$(2))-factory.img; \
fi fi
endef endef