aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-21 08:20:00 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-21 08:20:00 +0000
commit92875dbd3d58403bcafac2b6623b29eb3bb41d87 (patch)
treed6f8defbc64903e863b49be2baedea2f9dd3b951
parentac6879caaa0e18015b8d4b3a99bdab4e0d758508 (diff)
downloadupstream-92875dbd3d58403bcafac2b6623b29eb3bb41d87.tar.gz
upstream-92875dbd3d58403bcafac2b6623b29eb3bb41d87.tar.bz2
upstream-92875dbd3d58403bcafac2b6623b29eb3bb41d87.zip
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 <dhaab@luxul.com> SVN-Revision: 45541
-rw-r--r--target/linux/bcm53xx/image/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
index b3f2cd8127..fb909c4629 100644
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -14,6 +14,10 @@ define Image/Prepare
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 @@ endef
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