[source] ar71xx: remove split kernel/rootfs images where the sysupgrade image can be written to flash directly
LEDE Commits
lede-commits at lists.infradead.org
Tue Nov 29 01:21:51 PST 2016
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/eff858e8dfc53b81a908fb7be36930668fa70d05
commit eff858e8dfc53b81a908fb7be36930668fa70d05
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Nov 29 10:05:46 2016 +0100
ar71xx: remove split kernel/rootfs images where the sysupgrade image can be written to flash directly
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
target/linux/ar71xx/image/legacy.mk | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk
index 4ec89bf..9d2b31f 100644
--- a/target/linux/ar71xx/image/legacy.mk
+++ b/target/linux/ar71xx/image/legacy.mk
@@ -468,12 +468,6 @@ define Image/Build/dLAN
$(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(eval kernsize=$(call mtdpartsize,kernel,$(4)))
$(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
Image/Build/dLANLzma/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
@@ -485,12 +479,6 @@ define Image/Build/Ath
$(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(eval kernsize=$(call mtdpartsize,kernel,$(4)))
$(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
Image/Build/AthGzip/buildkernel=$(call MkuImageGzip,$(2),$(3) $(4))
@@ -532,10 +520,6 @@ define Image/Build/EnGenius
$(eval kernsize=$(call mtdpartsize,kernel,$(4)))
$(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; \
mksenaofw -e $(call sysupname,$(1),$(2)) \
-o $(call imgname,$(1),$(2))-factory.dlf \
-r 0x101 -p $(7) -t 2; \
@@ -855,7 +839,7 @@ define Image/Build/Zcomax
$(STAGING_DIR_HOST)/bin/mkzcfw \
-B $(2) \
-k $(KDIR_TMP)/vmlinux-$(2).uImage \
- -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+ -r $(KDIR)/root.$(1) \
-o $(call imgname,$(1),$(2))-factory.img; \
fi
endef
More information about the lede-commits
mailing list