layerscape: use MKUBIFS_OPTS for per-device ubi parameters

UBIFS_OPTS couldn't be used for per-device ubi parameters.
Let's use MKUBIFS_OPTS instead.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>

diff --git a/target/linux/layerscape/image/armv8_32b.mk b/target/linux/layerscape/image/armv8_32b.mk
index 95418926fd5031717c97deab022b0d6df5f5002e..8410c3b4dd77326e8732e4f3f317543ff8f655cb 100644 (file)
--- a/target/linux/layerscape/image/armv8_32b.mk
+++ b/target/linux/layerscape/image/armv8_32b.mk
@@ -9,6 +9,7 @@ define Device/Default
   PROFILES := Default
   IMAGES := firmware.bin
   FILESYSTEMS := ubifs
   PROFILES := Default
   IMAGES := firmware.bin
   FILESYSTEMS := ubifs

+  MKUBIFS_OPTS := -m 1 -e 262016 -c 128

   KERNEL := kernel-bin | uImage none
   KERNEL_NAME := zImage
   KERNEL_LOADADDR := 0x80008000
   KERNEL := kernel-bin | uImage none
   KERNEL_NAME := zImage
   KERNEL_LOADADDR := 0x80008000


@@ -24,7 +25,6 @@ define Device/ls1012ardb
     u-boot-ls1012ardb-image \
     kmod-ppfe
   DEVICE_DTS := ../../../arm64/boot/dts/freescale/fsl-ls1012a-rdb
     u-boot-ls1012ardb-image \
     kmod-ppfe
   DEVICE_DTS := ../../../arm64/boot/dts/freescale/fsl-ls1012a-rdb

-  UBIFS_OPTS := -m 1 -e 262016 -c 128

   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1


@@ -99,7 +99,6 @@ define Device/ls1046ardb
     layerscape-ppa-ls1046ardb \
     u-boot-ls1046ardb-image
   DEVICE_DTS := ../../../arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk
     layerscape-ppa-ls1046ardb \
     u-boot-ls1046ardb-image
   DEVICE_DTS := ../../../arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk

-  UBIFS_OPTS := -m 1 -e 262016 -c 128

   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1

diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index 79e05efc1cb01536f345a129be30414c9991c3d2..6d783a58db2b375cb86e1fb87834c2e2c16003af 100644 (file)
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -9,6 +9,7 @@ define Device/Default
   PROFILES := Default
   IMAGES := firmware.bin
   FILESYSTEMS := ubifs
   PROFILES := Default
   IMAGES := firmware.bin
   FILESYSTEMS := ubifs

+  MKUBIFS_OPTS := -m 1 -e 262016 -c 128

   KERNEL := kernel-bin | gzip | uImage gzip
   KERNEL_LOADADDR := 0x80080000
   KERNEL_ENTRY_POINT := 0x80080000
   KERNEL := kernel-bin | gzip | uImage gzip
   KERNEL_LOADADDR := 0x80080000
   KERNEL_ENTRY_POINT := 0x80080000


@@ -22,7 +23,6 @@ define Device/ls1012ardb
     layerscape-ppa-ls1012ardb \
     kmod-ppfe
   DEVICE_DTS := freescale/fsl-ls1012a-rdb
     layerscape-ppa-ls1012ardb \
     kmod-ppfe
   DEVICE_DTS := freescale/fsl-ls1012a-rdb

-  UBIFS_OPTS := -m 1 -e 262016 -c 128

   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1


@@ -115,7 +115,6 @@ define Device/ls1046ardb
     layerscape-fman-ls1046ardb \
     layerscape-ppa-ls1046ardb
   DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk
     layerscape-fman-ls1046ardb \
     layerscape-ppa-ls1046ardb
   DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk

-  UBIFS_OPTS := -m 1 -e 262016 -c 128

   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1


@@ -162,7 +161,6 @@ define Device/ls1088ardb
     layerscape-ppa-ls1088ardb \
     restool
   DEVICE_DTS := freescale/fsl-ls1088a-rdb
     layerscape-ppa-ls1088ardb \
     restool
   DEVICE_DTS := freescale/fsl-ls1088a-rdb

-  UBIFS_OPTS := -m 1 -e 262016 -c 128

   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1


@@ -258,6 +256,6 @@ define Device/traverse-five64
   IMAGES = root sysupgrade.tar
   IMAGE/root = append-rootfs
   IMAGE/sysupgrade.tar = sysupgrade-tar
   IMAGES = root sysupgrade.tar
   IMAGE/root = append-rootfs
   IMAGE/sysupgrade.tar = sysupgrade-tar

-  UBIFS_OPTS := -m 2048 -e 124KiB -c 4096
+  MKUBIFS_OPTS := -m 2048 -e 124KiB -c 4096

 endef
 TARGET_DEVICES += traverse-five64
 endef
 TARGET_DEVICES += traverse-five64