[3rdparty][PATCH 1/7] Remove --no-fstab-update option from WIC_CREATE_EXTRA_ARG for all machines

[3rdparty][PATCH 1/7] Remove --no-fstab-update option from WIC_CREATE_EXTRA_ARG for all machines

[Fabio Berton]

WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" was add to imx-base.inc
and we can remove from all machines that includes imx-base.inc file.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/apalis-imx6.conf  | 1 -
 conf/machine/colibri-imx6.conf | 1 -
 conf/machine/colibri-imx7.conf | 1 -
 conf/machine/colibri-vf.conf   | 1 -
 conf/machine/imx7s-warp.conf   | 3 ---
 5 files changed, 7 deletions(-)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 3ac71a9..a7ec6e3 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -31,7 +31,6 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
 IMAGE_FSTYPES = "wic.gz tar.xz"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
 
 SERIAL_CONSOLE ?= "115200 ttymxc0"
 
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index d5a8c17..966fcca 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -29,7 +29,6 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
 IMAGE_FSTYPES = "wic.gz tar.xz"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
 
 SERIAL_CONSOLE ?= "115200 ttymxc0"
 
diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
index d47fe84..2af3b24 100644
--- a/conf/machine/colibri-imx7.conf
+++ b/conf/machine/colibri-imx7.conf
@@ -29,7 +29,6 @@ UBOOT_MACHINE ?= "colibri_imx7_defconfig"
 IMAGE_FSTYPES = "wic.gz tar.xz"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
 
 # Enable free --space-fixup (-F) by default, this allows DFU updates
 MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F"
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 852902f..51e658e 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -32,7 +32,6 @@ UBOOT_MACHINE ?= "colibri_vf_defconfig"
 IMAGE_FSTYPES = "wic.gz tar.xz ubifs"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
 
 # Enable free --space-fixup (-F) by default, this allows DFU updates
 MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F"
diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf
index 5c8a82f..68c82e6 100644
--- a/conf/machine/imx7s-warp.conf
+++ b/conf/machine/imx7s-warp.conf
@@ -22,7 +22,4 @@ UBOOT_CONFIG[sd] = "warp7_secure_defconfig,sdcard"
 IMAGE_FSTYPES = "wic.gz"
 WKS_FILE ?= "imx-uboot-bootpart.wks"
 
-# Do not update /etc/fstab
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
-
 MACHINE_EXTRA_RRECOMMENDS += "firmware-imx-brcm"
-- 
2.14.2

[3rdparty][PATCH 2/7] apalis-imx6: Remove imx-base.inc duplicate code

[Fabio Berton]

IMAGE_FSTYPES = "wic.gz" is already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/apalis-imx6.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index a7ec6e3..05a1336 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -28,7 +28,7 @@ UBOOT_CONFIG[spl] = "apalis_imx6_defconfig,,u-boot.img"
 UBOOT_MAKE_TARGET = ""
 UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
 
-IMAGE_FSTYPES = "wic.gz tar.xz"
+IMAGE_FSTYPES += "tar.xz"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
 
-- 
2.14.2

[3rdparty][PATCH 3/7] colibri-imx6: Remove imx-base.inc duplicate code

[Fabio Berton]

IMAGE_FSTYPES = "wic.gz" is already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/colibri-imx6.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 966fcca..0113071 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -26,7 +26,7 @@ UBOOT_CONFIG[spl] = "colibri_imx6_defconfig,,u-boot.img"
 UBOOT_MAKE_TARGET = ""
 UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
 
-IMAGE_FSTYPES = "wic.gz tar.xz"
+IMAGE_FSTYPES += "tar.xz"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
 
-- 
2.14.2

[3rdparty][PATCH 4/7] colibri-imx7: Remove imx-base.inc duplicate code

[Fabio Berton]

IMAGE_FSTYPES = "wic.gz" is already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/colibri-imx7.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
index 2af3b24..db5bb13 100644
--- a/conf/machine/colibri-imx7.conf
+++ b/conf/machine/colibri-imx7.conf
@@ -26,7 +26,7 @@ UBOOT_BINARY = "u-boot-nand.imx"
 UBOOT_MAKE_TARGET = "u-boot-nand.imx"
 UBOOT_MACHINE ?= "colibri_imx7_defconfig"
 
-IMAGE_FSTYPES = "wic.gz tar.xz"
+IMAGE_FSTYPES += "tar.xz"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
 
-- 
2.14.2

[3rdparty][PATCH 5/7] colibri-vf: Remove imx-base.inc duplicate code

[Fabio Berton]

IMAGE_FSTYPES = "wic.gz" is already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/colibri-vf.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 51e658e..09376d6 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -29,7 +29,7 @@ UBOOT_BINARY ?= "u-boot-nand.imx"
 UBOOT_MAKE_TARGET = "u-boot-nand.imx"
 UBOOT_MACHINE ?= "colibri_vf_defconfig"
 
-IMAGE_FSTYPES = "wic.gz tar.xz ubifs"
+IMAGE_FSTYPES += "tar.xz ubifs"
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
 
-- 
2.14.2

[3rdparty][PATCH 6/7] imx7d-pico: Remove imx-base.inc duplicate code

[Fabio Berton]

IMAGE_FSTYPES = "wic.gz" is already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/imx7d-pico.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/conf/machine/imx7d-pico.conf b/conf/machine/imx7d-pico.conf
index 09c5002..c50b609 100644
--- a/conf/machine/imx7d-pico.conf
+++ b/conf/machine/imx7d-pico.conf
@@ -23,5 +23,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 
 WKS_FILES ?= "imx-uboot.wks"
 WKS_FILE_DEPENDS ?= ""
-
-IMAGE_FSTYPES = "wic.gz"
-- 
2.14.2

[3rdparty][PATCH 7/7] imx7s-warp: Remove imx-base.inc duplicate code

[Fabio Berton]

IMAGE_FSTYPES = "wic.gz" and WKS_FILE = "imx-uboot-bootpart.wks" are
already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/imx7s-warp.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf
index 68c82e6..7a23fd6 100644
--- a/conf/machine/imx7s-warp.conf
+++ b/conf/machine/imx7s-warp.conf
@@ -18,8 +18,4 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-warp7"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "warp7_secure_defconfig,sdcard"
 
-# wic
-IMAGE_FSTYPES = "wic.gz"
-WKS_FILE ?= "imx-uboot-bootpart.wks"
-
 MACHINE_EXTRA_RRECOMMENDS += "firmware-imx-brcm"
-- 
2.14.2