aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-08 14:22:29 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-14 10:27:45 +0200
commitb3b797076e1cd4db67e31b77748374ce8215db12 (patch)
treee560edf69bdc4c24ce1e94c0fa2b584605e233f3 /target/linux
parentdbc416b6ec91b0b9bf2f6cc7166a362d849a348c (diff)
downloadupstream-b3b797076e1cd4db67e31b77748374ce8215db12.tar.gz
upstream-b3b797076e1cd4db67e31b77748374ce8215db12.tar.bz2
upstream-b3b797076e1cd4db67e31b77748374ce8215db12.zip
bcm53xx: simplify image building code
Use append-ubi template for ubinize, remove mkfs override Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/bcm53xx/image/Makefile31
-rw-r--r--target/linux/bcm53xx/image/ubinize.cfg24
2 files changed, 15 insertions, 40 deletions
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