Author: rmilecki Date: 2015-04-21 10:20:00 +0200 (Tue, 21 Apr 2015) New Revision: 45541
Modified: trunk/target/linux/bcm53xx/image/Makefile Log: bcm53xx: append only 1 block (with erasing mark) to UBI This is needed as prepare_generic_squashfs generates more data (in our case 0x40004 B) and it's complex for sysupgrade to extract UBI image out of TRX. Signed-off-by: Dan Haab <[email protected]> Modified: trunk/target/linux/bcm53xx/image/Makefile =================================================================== --- trunk/target/linux/bcm53xx/image/Makefile 2015-04-21 08:19:53 UTC (rev 45540) +++ trunk/target/linux/bcm53xx/image/Makefile 2015-04-21 08:20:00 UTC (rev 45541) @@ -14,6 +14,10 @@ echo -ne '\xde\xad\xc0\xde' > $(KDIR)/fs_mark $(call prepare_generic_squashfs,$(KDIR)/fs_mark) + # For UBI we want only one extra block + rm -f $(KDIR)/ubi_mark + echo -ne '\xde\xad\xc0\xde' > $(KDIR)/ubi_mark + $(CP) ./ubinize.cfg $(KDIR) endef @@ -33,12 +37,14 @@ define Build/trx-nand # kernel: always use 4 MiB (-28 B or TRX header) to allow upgrades even # if it grows up between releases + # root: UBI with one extra block containing UBI mark to trigger erasing + # rest of partition $(STAGING_DIR_HOST)/bin/trx \ -o $@ \ -m 33554432 \ -f $(word 1,$^) -a 0x20000 -b 0x400000 \ - -f $(KDIR)/root-block-0x20000-min-0x800.ubi -a 0x20000 \ - -A $(KDIR)/fs_mark + -f $(KDIR)/root-block-0x20000-min-0x800.ubi \ + -A $(KDIR)/ubi_mark -a 0x20000 endef define Build/netgear-chk _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
