[meta-freescale] [meta-fsl-arm-extra][PATCH 1/4] ventana: cleanup conf + add multiubi FSTYPE

[Pushpal Sidhu]

Signed-off-by: Pushpal Sidhu <psidhu at gateworks.com>
---
 conf/machine/ventana.conf | 58 +++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/conf/machine/ventana.conf b/conf/machine/ventana.conf
index 8e18b6d..1974100 100644
--- a/conf/machine/ventana.conf
+++ b/conf/machine/ventana.conf
@@ -7,39 +7,48 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_u-boot = "u-boot-gateworks-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-gateworks-imx"
+PREFERRED_PROVIDER_u-boot = "u-boot-gateworks-imx"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-gateworks-imx"
+PREFERRED_PROVIDER_kernel = "linux-gateworks-imx"
 
 SOC_FAMILY = "mx6:mx6dl:mx6q"
 
 KERNEL_DEVICETREE  = " \
-	imx6q-gw5400-a.dtb \
-	imx6q-gw51xx.dtb \
-	imx6q-gw52xx.dtb \
-	imx6q-gw53xx.dtb \
-	imx6q-gw54xx.dtb \
-	imx6q-gw551x.dtb \
-	imx6q-gw552x.dtb \
-	imx6dl-gw51xx.dtb \
-	imx6dl-gw52xx.dtb \
-	imx6dl-gw53xx.dtb \
-	imx6dl-gw54xx.dtb \
-	imx6dl-gw551x.dtb \
-	imx6dl-gw552x.dtb \
+    imx6q-gw5400-a.dtb \
+    imx6q-gw51xx.dtb \
+    imx6q-gw52xx.dtb \
+    imx6q-gw53xx.dtb \
+    imx6q-gw54xx.dtb \
+    imx6q-gw551x.dtb \
+    imx6q-gw552x.dtb \
+    imx6dl-gw51xx.dtb \
+    imx6dl-gw52xx.dtb \
+    imx6dl-gw53xx.dtb \
+    imx6dl-gw54xx.dtb \
+    imx6dl-gw551x.dtb \
+    imx6dl-gw552x.dtb \
 "
 
 KERNEL_IMAGETYPE = "uImage"
 
 MACHINE_FEATURES += "pci wifi bluetooth"
 
-# Add kernel/modules
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree"
-MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sky2"
+# Add kernel modules
+MACHINE_EXTRA_RRECOMMENDS += "\
+    kernel-module-sky2 \
+"
 
 # Modules autoload
 KERNEL_MODULE_AUTOLOAD = "sky2"
 
+# Req'd for boot
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "\
+    kernel-image kernel-devicetree \
+    u-boot-script-gateworks-imx \
+"
+
 # Bootloader configs:
 UBOOT_CONFIG ??= "std"
 UBOOT_CONFIG[std] = "gwventana_config"
@@ -47,12 +56,17 @@ UBOOT_CONFIG[std] = "gwventana_config"
 SERIAL_CONSOLE = "115200 ttymxc1"
 
 # Override FS Type Creation
-IMAGE_FSTYPES = "tar.bz2 ubi"
+IMAGE_FSTYPES = "tar.bz2 multiubi"
+
+# Build the following sizes
+MULTIUBI_BUILD ?= "normal large"
 
 UBI_VOLNAME = "rootfs"
+
 # 256MB ('normal' flash layout)
-MKUBIFS_ARGS += "-F -m 2048 -e 124KiB -c 1912 -x zlib"
-UBINIZE_ARGS += "-m 2048 -p 128KiB -s 2048"
+export MKUBIFS_ARGS_normal = "-F -m 2048 -e 124KiB -c 1912 -x zlib"
+export UBINIZE_ARGS_normal = "-m 2048 -p 128KiB -s 2048"
+
 # 2GB ('large' flash layout)
-#MKUBIFS_ARGS += "-F -m 4096 -e 248KiB -c 8124 -x zlib"
-#UBINIZE_ARGS += "-m 4096 -p 256KiB -s 4096"
+export MKUBIFS_ARGS_large = "-F -m 4096 -e 248KiB -c 8124 -x zlib"
+export UBINIZE_ARGS_large = "-m 4096 -p 256KiB -s 4096"
-- 
2.6.2