From b3b797076e1cd4db67e31b77748374ce8215db12 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 8 Jul 2016 14:22:29 +0200
Subject: [PATCH] bcm53xx: simplify image building code

Use append-ubi template for ubinize, remove mkfs override

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 target/linux/bcm53xx/image/Makefile    | 31 +++++++++++++-------------
 target/linux/bcm53xx/image/ubinize.cfg | 24 --------------------
 2 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 target/linux/bcm53xx/image/ubinize.cfg

diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
index 29397937e4..ac58e93510 100644
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -15,8 +15,6 @@ define Image/Prepare
 	# 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
 
 define Build/lzma-d16
@@ -24,16 +22,13 @@ define Build/lzma-d16
 	@mv $@.new $@
 endef
 
-define Build/mkfs/squashfs
-	( cd $(KDIR); $(STAGING_DIR_HOST)/bin/ubinize -p 128KiB -m 2048 -o $(KDIR)/root-block-0x20000-min-0x800.ubi ubinize.cfg )
-endef
-
 define Build/trx-serial
 	$(STAGING_DIR_HOST)/bin/trx \
-		-o $@ \
+		-o $@.new \
 		-m 33554432 \
 		-f $(word 1,$^) -a 1024 \
-		-f $(KDIR)/root.squashfs -a 0x10000 -A $(KDIR)/fs_mark
+		-f $@ -a 0x10000 -A $(KDIR)/fs_mark
+	mv $@.new $@
 endef
 
 define Build/trx-nand
@@ -42,11 +37,12 @@ define Build/trx-nand
 	# root: UBI with one extra block containing UBI mark to trigger erasing
 	#	rest of partition
 	$(STAGING_DIR_HOST)/bin/trx \
-		-o $@ \
+		-o $@.new \
 		-m 33554432 \
 		-f $(word 1,$^) -a 0x20000 -b 0x400000 \
-		-f $(KDIR)/root-block-0x20000-min-0x800.ubi \
+		-f $@ \
 		-A $(KDIR)/ubi_mark -a 0x20000
+	mv $@.new $@
 endef
 
 define Build/asus-trx
@@ -63,7 +59,7 @@ define Build/seama-nand
 		-m "type=firmware" \
 		-f $(word 1,$^) \
 		-b 0x400000 \
-		-f $(KDIR)/root-block-0x20000-min-0x800.ubi \
+		-f $@ \
 		-f $(KDIR)/ubi_mark
 	# Seama container
 	$(STAGING_DIR_HOST)/bin/seama \
@@ -84,12 +80,15 @@ define Device/Default
   KERNEL_NAME := zImage
   IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
   IMAGES := trx
-  IMAGE/trx := trx-nand
+  BLOCKSIZE := 128KiB
+  PAGESIZE := 2048
+  UBINIZE_OPTS :=
+  IMAGE/trx := append-ubi | trx-nand
 endef
 
 define Device/asus
   IMAGES := trx
-  IMAGE/trx := trx-nand | asus-trx
+  IMAGE/trx := append-ubi | trx-nand | asus-trx
 endef
 
 define AsusDevice
@@ -106,7 +105,7 @@ endef
 
 define Device/dlink
   IMAGES := bin
-  IMAGE/bin := seama-nand
+  IMAGE/bin := append-ubi | seama-nand
 endef
 
 define DLinkDevice
@@ -119,7 +118,7 @@ endef
 
 define Device/netgear
   IMAGES := chk
-  IMAGE/chk := trx-nand | netgear-chk
+  IMAGE/chk := append-ubi | trx-nand | netgear-chk
   NETGEAR_REGION := 1
 endef
 
@@ -148,7 +147,7 @@ endef
 
 define Device/smartrg-sr400ac
   IMAGES := trx
-  IMAGE/trx := trx-serial
+  IMAGE/trx := append-rootfs | trx-serial
 endef
 
 TARGET_DEVICES += \
diff --git a/target/linux/bcm53xx/image/ubinize.cfg b/target/linux/bcm53xx/image/ubinize.cfg
deleted file mode 100644
index a4f2f09d9e..0000000000
--- a/target/linux/bcm53xx/image/ubinize.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-[rootfs]
-# Volume mode (other option is static)
-mode=ubi
-# Source image
-image=root.squashfs
-# Volume ID in UBI image
-vol_id=0
-# Allow for dynamic resize
-vol_type=dynamic
-# Volume name
-vol_name=rootfs
-
-[rootfs_data]
-# Volume mode (other option is static)
-mode=ubi
-# Volume ID in UBI image
-vol_id=1
-# Allow for dynamic resize
-vol_type=dynamic
-# Volume name
-vol_name=rootfs_data
-# Autoresize volume at first mount
-vol_flags=autoresize
-vol_size=1MiB
-- 
2.30.2