Author: blogic Date: 2014-06-26 13:43:38 +0200 (Thu, 26 Jun 2014) New Revision: 41346
Modified: trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh trunk/target/linux/ar71xx/image/Makefile trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini Log: ar71xx: nbg6716: Enable procd nand sysupgrage This enables the procd nand upgrade for ZyXEL NBG 6716. Also the ubi config is cleaned up to match the wndr4300. Signed-off-by: Andr?\195?\169 Valentin <[email protected]> Modified: trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh =================================================================== --- trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 2014-06-26 11:43:34 UTC (rev 41345) +++ trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 2014-06-26 11:43:38 UTC (rev 41346) @@ -305,6 +305,7 @@ } return 0 ;; + nbg6716 | \ wndr4300 ) nand_do_platform_check $board $1 return $?; Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2014-06-26 11:43:34 UTC (rev 41345) +++ trunk/target/linux/ar71xx/image/Makefile 2014-06-26 11:43:38 UTC (rev 41346) @@ -923,7 +923,6 @@ $(eval kernelsize=$(call mtdpartsize,kernel,$(4))) $(eval imageraw=$(KDIR_TMP)/$(2)-raw.img) $(CP) $(KDIR)/root.$(1) $(KDIR_TMP)/ubi_root.img - echo -ne '\xde\xad\xc0\xde' > $(KDIR_TMP)/jffs2.eof $(call ubinize,ubinize-$(2).ini,$(KDIR_TMP),$(KDIR_TMP)/$(2)-root.ubi,128KiB,2048,-E 5) ( \ dd if=$(KDIR_TMP)/$(2)-kernel.jffs2; \ @@ -931,10 +930,7 @@ ) > $(imageraw) dd if=$(imageraw) of=$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-factory.bin \ bs=128k conv=sync - ( \ - dd if=$(KDIR_TMP)/$(2)-kernel.jffs2; \ - dd if=$(KDIR)/root.$(1) bs=128k conv=sync \ - ) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-sysupgrade.bin + $(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/$(2)-kernel.jffs2) endef Modified: trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini =================================================================== --- trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini 2014-06-26 11:43:34 UTC (rev 41345) +++ trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini 2014-06-26 11:43:38 UTC (rev 41346) @@ -9,15 +9,10 @@ vol_type=dynamic # Volume name vol_name=rootfs -# Autoresize volume at first mount -# vol_flags=autoresize -vol_size=40MiB [rootfs_data] # Volume mode (other option is static) mode=ubi -# Source image -image=jffs2.eof # Volume ID in UBI image vol_id=1 # Allow for dynamic resize @@ -25,5 +20,5 @@ # Volume name vol_name=rootfs_data # Autoresize volume at first mount -vol_size=100MiB -#vol_flags=autoresize +vol_size=1MiB +vol_flags=autoresize _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
