aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-31 18:34:31 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-31 19:35:05 +0200
commit468a9b7a7744478e6225816aa6153c9db0155810 (patch)
treef19f7567d69f26a436aa8fa611d635fdfebc5246 /target/linux
parent1448501558812742e16b21bc5a297ba9f1003232 (diff)
downloadupstream-468a9b7a7744478e6225816aa6153c9db0155810.tar.gz
upstream-468a9b7a7744478e6225816aa6153c9db0155810.tar.bz2
upstream-468a9b7a7744478e6225816aa6153c9db0155810.zip
imx6: use ubinize-image.sh to fix build with per-device rootfs
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/imx6/image/Makefile18
-rw-r--r--target/linux/imx6/image/ubinize-ventana.cfg37
-rw-r--r--target/linux/imx6/image/ubinize.cfg13
3 files changed, 4 insertions, 64 deletions
diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index 9122d9673a..a7d68fbe97 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -51,20 +51,10 @@ define Build/ubi-boot-overlay
$(BIN_DIR)/$(IMG_PREFIX)-$(DEVICE_NAME)-bootfs_$(word 1, $(1)).ubifs
# ubi
- rm -rf p $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))
- mkdir -p $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))
- $(CP) $(word 2, $^) \
- $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))/
- $(CP) $(KDIR)/boot-$(DEVICE_NAME)-bootfs_$(word 1, $(1)).ubifs \
- $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))/boot.ubifs
- $(CP) ./ubinize-$(DEVICE_NAME).cfg \
- $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))/ubinize.cfg
- ( cd $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1)); \
- $(STAGING_DIR_HOST)/bin/ubinize \
- -m $(word 2, $(1)) -p $(word 4, $(1)) -s $(word 2, $(1)) \
- -o $@ \
- ubinize.cfg \
- )
+ sh $(TOPDIR)/scripts/ubinize-image.sh \
+ --part boot=$(KDIR)/boot-$(DEVICE_NAME)-bootfs_$(word 1, $(1)).ubifs=15 \
+ $(IMAGE_ROOTFS) $@ \
+ -m $(word 2, $(1)) -p $(word 4, $(1)) -s $(word 2, $(1))
endef
define Build/bootfs.tar.gz
diff --git a/target/linux/imx6/image/ubinize-ventana.cfg b/target/linux/imx6/image/ubinize-ventana.cfg
deleted file mode 100644
index 6b30b0993e..0000000000
--- a/target/linux/imx6/image/ubinize-ventana.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-[boot]
-# Volume mode (other option is static)
-mode=ubi
-# Source image
-image=boot.ubifs
-# Volume ID in UBI image
-vol_id=0
-# Allow for dynamic resize
-vol_type=dynamic
-# Volume name
-vol_name=boot
-vol_size=15MiB
-
-[rootfs]
-# Volume mode (other option is static)
-mode=ubi
-# Source image
-image=root.squashfs
-# Volume ID in UBI image
-vol_id=1
-# 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=2
-# Allow for dynamic resize
-vol_type=dynamic
-# Volume name
-vol_name=rootfs_data
-# Autoresize volume at first mount
-vol_flags=autoresize
-vol_size=1MiB
diff --git a/target/linux/imx6/image/ubinize.cfg b/target/linux/imx6/image/ubinize.cfg
deleted file mode 100644
index e4149ec7d7..0000000000
--- a/target/linux/imx6/image/ubinize.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[rootfs]
-# Volume mode (other option is static)
-mode=ubi
-# Source image
-image=root.ubifs
-# Volume ID in UBI image
-vol_id=0
-# Allow for dynamic resize
-vol_type=dynamic
-# Volume name
-vol_name=rootfs
-# Autoresize volume at first mount
-vol_flags=autoresize