KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bcm53xx: simplify image building code

Browse source 
Use append-ubi template for ubinize, remove mkfs override

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-08 14:22:29 +02:00
parent dbc416b6ec
commit b3b797076e
2 changed files with 15 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
target/linux/bcm53xx/image/Makefile
View file

@ -15,8 +15,6 @@ define Image/Prepare
# For UBI we want only one extra block # For UBI we want only one extra block
rm -f $(KDIR)/ubi_mark rm -f $(KDIR)/ubi_mark
echo -ne '\xde\xad\xc0\xde' > $(KDIR)/ubi_mark echo -ne '\xde\xad\xc0\xde' > $(KDIR)/ubi_mark
$(CP) ./ubinize.cfg $(KDIR)
endef endef
define Build/lzma-d16 define Build/lzma-d16
@ -24,16 +22,13 @@ define Build/lzma-d16
@mv $@.new $@ @mv $@.new $@
endef 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 define Build/trx-serial
$(STAGING_DIR_HOST)/bin/trx \ $(STAGING_DIR_HOST)/bin/trx \
-o $@ \ -o $@.new \
-m 33554432 \ -m 33554432 \
-f $(word 1,$^) -a 1024 \ -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 endef
define Build/trx-nand define Build/trx-nand
@ -42,11 +37,12 @@ define Build/trx-nand
# root: UBI with one extra block containing UBI mark to trigger erasing # root: UBI with one extra block containing UBI mark to trigger erasing
# rest of partition # rest of partition
$(STAGING_DIR_HOST)/bin/trx \ $(STAGING_DIR_HOST)/bin/trx \
-o $@ \ -o $@.new \
-m 33554432 \ -m 33554432 \
-f $(word 1,$^) -a 0x20000 -b 0x400000 \ -f $(word 1,$^) -a 0x20000 -b 0x400000 \
-f $(KDIR)/root-block-0x20000-min-0x800.ubi \ -f $@ \
-A $(KDIR)/ubi_mark -a 0x20000 -A $(KDIR)/ubi_mark -a 0x20000
mv $@.new $@
endef endef
define Build/asus-trx define Build/asus-trx
@ -63,7 +59,7 @@ define Build/seama-nand
-m "type=firmware" \ -m "type=firmware" \
-f $(word 1,$^) \ -f $(word 1,$^) \
-b 0x400000 \ -b 0x400000 \
-f $(KDIR)/root-block-0x20000-min-0x800.ubi \ -f $@ \
-f $(KDIR)/ubi_mark -f $(KDIR)/ubi_mark
# Seama container # Seama container
$(STAGING_DIR_HOST)/bin/seama \ $(STAGING_DIR_HOST)/bin/seama \
@ -84,12 +80,15 @@ define Device/Default
KERNEL_NAME := zImage KERNEL_NAME := zImage
IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
IMAGES := trx IMAGES := trx
IMAGE/trx := trx-nand BLOCKSIZE := 128KiB
PAGESIZE := 2048
UBINIZE_OPTS :=
IMAGE/trx := append-ubi | trx-nand
endef endef
define Device/asus define Device/asus
IMAGES := trx IMAGES := trx
IMAGE/trx := trx-nand | asus-trx IMAGE/trx := append-ubi | trx-nand | asus-trx
endef endef
define AsusDevice define AsusDevice
@ -106,7 +105,7 @@ endef
define Device/dlink define Device/dlink
IMAGES := bin IMAGES := bin
IMAGE/bin := seama-nand IMAGE/bin := append-ubi | seama-nand
endef endef
define DLinkDevice define DLinkDevice
@ -119,7 +118,7 @@ endef
define Device/netgear define Device/netgear
IMAGES := chk IMAGES := chk
IMAGE/chk := trx-nand | netgear-chk IMAGE/chk := append-ubi | trx-nand | netgear-chk
NETGEAR_REGION := 1 NETGEAR_REGION := 1
endef endef
@ -148,7 +147,7 @@ endef
define Device/smartrg-sr400ac define Device/smartrg-sr400ac
IMAGES := trx IMAGES := trx
IMAGE/trx := trx-serial IMAGE/trx := append-rootfs | trx-serial
endef endef
TARGET_DEVICES += \ TARGET_DEVICES += \

24
target/linux/bcm53xx/image/ubinize.cfg
View file

@ -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