[PATCH 0/5] Consolidate all i.MX base settings in imx-base.inc

[PATCH 0/5] Consolidate all i.MX base settings in imx-base.inc

[Otavio Salvador]

This patchset removes the mxs-base.inc file so all i.MX related
based settings are consolidated in imx-base.inc file.


Otavio Salvador (5):
  mxs-base.inc: Consolidate IMAGE_FSTYPES definition
  imx-base.inc, mxs-base.inc: Stop generating tar.bz2 image tarball by
    default
  imx-base.inc, mxs-base.inc: Change default image to sdcard.gz
  imx-base.inc, mxs-base.inc: Use ext4 filesystem for images as default
  Move mxs-base.inc contents to imx-base.inc

 conf/machine/imx23evk.conf        |  6 ++----
 conf/machine/imx28evk.conf        |  6 ++----
 conf/machine/include/imx-base.inc | 38 ++++++++++++++++++++++++++++++++------
 conf/machine/include/mxs-base.inc | 39 ---------------------------------------
 4 files changed, 36 insertions(+), 53 deletions(-)
 delete mode 100644 conf/machine/include/mxs-base.inc

-- 
2.5.3

[PATCH 1/5] mxs-base.inc: Consolidate IMAGE_FSTYPES definition

[Otavio Salvador]

The IMAGE_FSTYPES should have a default that uses the SD Card class
for image generation, using this all evaluation boards work out of box
using the provided .sdcard image.

The duplicated definition has been removed, affected machines are:

 - imx23evk
 - imx28evk

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/imx23evk.conf        | 3 ---
 conf/machine/imx28evk.conf        | 3 ---
 conf/machine/include/mxs-base.inc | 3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index ecaef9a..1d5eaef 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -13,7 +13,4 @@ UBOOT_MACHINE = "mx23evk_config"
 
 KERNEL_DEVICETREE = "imx23-evk.dtb"
 
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
-
 MACHINE_FEATURES = "apm usbgadget usbhost vfat touchscreen"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 86123c3..5a55d72 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -17,9 +17,6 @@ UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
 
 KERNEL_DEVICETREE = "imx28-evk.dtb"
 
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
-
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index d576dd3..b32e926 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -35,5 +35,8 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 
 KERNEL_IMAGETYPE = "zImage"
 
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
+
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"
-- 
2.5.3

[PATCH 2/5] imx-base.inc, mxs-base.inc: Stop generating tar.bz2 image tarball by default

[Otavio Salvador]

The tar.bz2 is useful for people using NFS or generating the SD card
image byhand, those can enable this in the board file or in the
local.conf when needed. By the fault the SD card image should be the
only image built as it is the most commonly used one for initial
development.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 2 +-
 conf/machine/include/mxs-base.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f54e9b7..d2075f1 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -127,7 +127,7 @@ IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
+IMAGE_FSTYPES ?= "ext3 sdcard"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index b32e926..38450be 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -36,7 +36,7 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 KERNEL_IMAGETYPE = "zImage"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
+IMAGE_FSTYPES ?= "ext3 uboot.mxsboot-sdcard sdcard"
 
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"
-- 
2.5.3

[PATCH 3/5] imx-base.inc, mxs-base.inc: Change default image to sdcard.gz

[Otavio Salvador]

The sdcard image can be compressed for easier download and transfer
between machine when doing the development. For it, we can change it
for sdcard.gz so the image generation backend handles the compression
steps.

While on that, we drop the ext3 explicit definition as it is also
included by the backend code automatically.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 2 +-
 conf/machine/include/mxs-base.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d2075f1..fe12455 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -127,7 +127,7 @@ IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "ext3 sdcard"
+IMAGE_FSTYPES ?= "sdcard.gz"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index 38450be..48c2bf4 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -36,7 +36,7 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 KERNEL_IMAGETYPE = "zImage"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "ext3 uboot.mxsboot-sdcard sdcard"
+IMAGE_FSTYPES ?= "uboot.mxsboot-sdcard sdcard.gz"
 
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"
-- 
2.5.3

[PATCH 4/5] imx-base.inc, mxs-base.inc: Use ext4 filesystem for images as default

[Otavio Salvador]

The ext4 is now the default for images in OpenEmbedded-Core, we now
follow this change for all i.MX reference boards.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 2 +-
 conf/machine/include/mxs-base.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index fe12455..23a734b 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -126,7 +126,7 @@ IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
 IMAGE_FSTYPES ?= "sdcard.gz"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index 48c2bf4..7891598 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -35,7 +35,7 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 
 KERNEL_IMAGETYPE = "zImage"
 
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
 IMAGE_FSTYPES ?= "uboot.mxsboot-sdcard sdcard.gz"
 
 # Add the ability to specify _imx machines
-- 
2.5.3

[PATCH 5/5] Move mxs-base.inc contents to imx-base.inc

[Otavio Salvador]

The consolidation of all i.MX related base settings allow for a more
global view of the settings in place. Up to now, the i.MX 23 and i.MX
28 SoCs were using the mxs-base.inc file, causing fragmentation.

The changes necessary to keep all i.MX 23 and i.MX 28 reference boards
working properly has been done, some values need to be reworked to
apply to SoC families instead of global setting but the price for
clearness seems worth it.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/imx23evk.conf        |  3 ++-
 conf/machine/imx28evk.conf        |  3 ++-
 conf/machine/include/imx-base.inc | 34 +++++++++++++++++++++++++++----
 conf/machine/include/mxs-base.inc | 42 ---------------------------------------
 4 files changed, 34 insertions(+), 48 deletions(-)
 delete mode 100644 conf/machine/include/mxs-base.inc

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 1d5eaef..ddd6028 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -4,7 +4,8 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX23 Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
-include conf/machine/include/mxs-base.inc
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-arm926ejs.inc
 
 SOC_FAMILY = "mxs:mx23"
 
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 5a55d72..c05ad8f 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -4,7 +4,8 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
-include conf/machine/include/mxs-base.inc
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-arm926ejs.inc
 
 SOC_FAMILY = "mxs:mx28"
 
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 23a734b..451c375 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -8,9 +8,26 @@ include conf/machine/include/soc-family.inc
 # Set specific make target and binary suffix
 PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
-UBOOT_MAKE_TARGET = "u-boot.imx"
-UBOOT_SUFFIX ?= "imx"
 
+UBOOT_MAKE_TARGET_mxs = "u-boot.sb"
+UBOOT_MAKE_TARGET_mx51 = "u-boot.imx"
+UBOOT_MAKE_TARGET_mx53 = "u-boot.imx"
+UBOOT_MAKE_TARGET_mx6 = "u-boot.imx"
+UBOOT_MAKE_TARGET_mx6sl = "u-boot.imx"
+UBOOT_MAKE_TARGET_mx6sx = "u-boot.imx"
+UBOOT_MAKE_TARGET_mx7 = "u-boot.imx"
+UBOOT_MAKE_TARGET_vf = "u-boot.imx"
+
+UBOOT_SUFFIX_mxs = "sb"
+UBOOT_SUFFIX_mx51 = "imx"
+UBOOT_SUFFIX_mx53 = "imx"
+UBOOT_SUFFIX_mx6 = "imx"
+UBOOT_SUFFIX_mx6sl = "imx"
+UBOOT_SUFFIX_mx6sx = "imx"
+UBOOT_SUFFIX_mx7 = "imx"
+UBOOT_SUFFIX_vf = "imx"
+
+UBOOT_ENTRYPOINT_mxs = "0x40008000"
 UBOOT_ENTRYPOINT_mx51  = "0x90008000"
 UBOOT_ENTRYPOINT_mx53  = "0x70008000"
 UBOOT_ENTRYPOINT_mx6  = "0x10008000"
@@ -120,6 +137,7 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6ul = ""
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-imx"
+IMX_DEFAULT_KERNEL_mxs = "linux-fslc"
 IMX_DEFAULT_KERNEL_mx5 = "linux-fslc"
 IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-mx6"
 IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
@@ -128,8 +146,16 @@ PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
 IMAGE_FSTYPES ?= "sdcard.gz"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
+IMAGE_FSTYPES_mxs ?= "uboot.mxsboot-sdcard sdcard.gz"
+
+SERIAL_CONSOLE_mxs = "115200 ttyAMA0"
+SERIAL_CONSOLE_mx51 = "115200 ttymxc0"
+SERIAL_CONSOLE_mx53 = "115200 ttymxc0"
+SERIAL_CONSOLE_mx6 = "115200 ttymxc0"
+SERIAL_CONSOLE_mx6sl = "115200 ttymxc0"
+SERIAL_CONSOLE_mx6sx = "115200 ttymxc0"
+SERIAL_CONSOLE_mx7 = "115200 ttymxc0"
+SERIAL_CONSOLE_vf = "115200 ttymxc0"
 
 KERNEL_IMAGETYPE = "zImage"
 
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
deleted file mode 100644
index 7891598..0000000
--- a/conf/machine/include/mxs-base.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-# Provides the i.MXS common settings
-
-include conf/machine/include/fsl-default-settings.inc
-include conf/machine/include/fsl-default-versions.inc
-
-include conf/machine/include/soc-family.inc
-include conf/machine/include/tune-arm926ejs.inc
-
-SOC_FAMILY = "mxs"
-
-PREFERRED_PROVIDER_virtual/kernel ??= "linux-fslc"
-
-PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
-PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_MAKE_TARGET = "u-boot.sb"
-UBOOT_SUFFIX = "sb"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-video-fbdev"
-
-# Sub-architecture support
-MACHINE_SOCARCH_SUFFIX ?= ""
-
-MACHINE_ARCH_FILTER = "virtual/kernel"
-
-INHERIT += "fsl-dynamic-packagearch"
-
-# Ship kernel modules
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-SERIAL_CONSOLE = "115200 ttyAMA0"
-
-KERNEL_IMAGETYPE = "zImage"
-
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
-IMAGE_FSTYPES ?= "uboot.mxsboot-sdcard sdcard.gz"
-
-# Add the ability to specify _imx machines
-MACHINEOVERRIDES =. "imx:"
-- 
2.5.3

Re: [PATCH 2/5] imx-base.inc, mxs-base.inc: Stop generating tar.bz2 image tarball by default

[Igor Grinberg]

Hi Otavio,


On 09/22/15 15:46, Otavio Salvador wrote:
> The tar.bz2 is useful for people using NFS or generating the SD card
> image byhand, those can enable this in the board file or in the
> local.conf when needed. By the fault the SD card image should be the
> only image built as it is the most commonly used one for initial
> development.

It is also useful for uniform deployment, when you do not know which
storage is going to be used for rootfs. For example you can provide
the tar.bz2 for deployment on any device, e.g. NAND, SD card, mSATA...
Although it will require another form of deployment technique (not dd),
but I think it is still useful.

On the other hand, I agree that it can be enabled in the board file or
the local.conf.
So, you decide...

> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>  conf/machine/include/imx-base.inc | 2 +-
>  conf/machine/include/mxs-base.inc | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index f54e9b7..d2075f1 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -127,7 +127,7 @@ IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
>  PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
>  
>  SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> -IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
> +IMAGE_FSTYPES ?= "ext3 sdcard"
>  
>  SERIAL_CONSOLE = "115200 ttymxc0"
>  
> diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
> index b32e926..38450be 100644
> --- a/conf/machine/include/mxs-base.inc
> +++ b/conf/machine/include/mxs-base.inc
> @@ -36,7 +36,7 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
>  KERNEL_IMAGETYPE = "zImage"
>  
>  SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> -IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
> +IMAGE_FSTYPES ?= "ext3 uboot.mxsboot-sdcard sdcard"
>  
>  # Add the ability to specify _imx machines
>  MACHINEOVERRIDES =. "imx:"
> 

-- 
Regards,
Igor.

Re: [PATCH 2/5] imx-base.inc, mxs-base.inc: Stop generating tar.bz2 image tarball by default

[Otavio Salvador]

Hello Igor,

On Thu, Sep 24, 2015 at 5:49 AM, Igor Grinberg <grinberg@compulab.co.il> wrote:
> On 09/22/15 15:46, Otavio Salvador wrote:
>> The tar.bz2 is useful for people using NFS or generating the SD card
>> image byhand, those can enable this in the board file or in the
>> local.conf when needed. By the fault the SD card image should be the
>> only image built as it is the most commonly used one for initial
>> development.
>
> It is also useful for uniform deployment, when you do not know which
> storage is going to be used for rootfs. For example you can provide
> the tar.bz2 for deployment on any device, e.g. NAND, SD card, mSATA...
> Although it will require another form of deployment technique (not dd),
> but I think it is still useful.
>
> On the other hand, I agree that it can be enabled in the board file or
> the local.conf.
> So, you decide...

Yes, I agree that the tar.bz2 is very useful however this should be
handled by machine.

Machines wishing to have this enabled, can do it setting the variable
in the machine file.

The imx-base.inc should be trimmed and in fact this setting should be
set on all machine files as it is really a machine option, however the
default set of images generated ought to be well thought as it has
impact on:

- build time
- storage use

Both are important, specially for autobuilders[1] as we need to cover
many machines to try to keep the quality of the BSP high.

1. http://ci.ossystems.com.br/

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750