Patchwork [meta-fsl-arm-extra,2/8] cfa10036: split configuration

login
register
mail settings
Submitter Alexandre Belloni
Date Sept. 5, 2013, 9:21 p.m.
Message ID <1378416122-16832-3-git-send-email-alexandre.belloni@free-electrons.com>
Download mbox | patch
Permalink /patch/57513/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Alexandre Belloni - Sept. 5, 2013, 9:21 p.m.
Introduce an include file to be able to support multiple boards using
the cfa10036 by reusing the imx-bootlets, barebox and kernel
configurations.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 conf/machine/cfa10036.conf        | 34 +---------------------------------
 conf/machine/include/cfa10036.inc | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 33 deletions(-)
 create mode 100644 conf/machine/include/cfa10036.inc
Daiane Angolini - Sept. 6, 2013, 11:57 a.m.
On 09/05/2013 06:21 PM, Alexandre Belloni wrote:
> Introduce an include file to be able to support multiple boards using
> the cfa10036 by reusing the imx-bootlets, barebox and kernel
> configurations.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>   conf/machine/cfa10036.conf        | 34 +---------------------------------
>   conf/machine/include/cfa10036.inc | 30 ++++++++++++++++++++++++++++++
>   2 files changed, 31 insertions(+), 33 deletions(-)
>   create mode 100644 conf/machine/include/cfa10036.inc
>
> diff --git a/conf/machine/cfa10036.conf b/conf/machine/cfa10036.conf
> index b7cdd8d..242d352 100644
> --- a/conf/machine/cfa10036.conf
> +++ b/conf/machine/cfa10036.conf
> @@ -3,36 +3,4 @@
>   #@SOC: i.MX28
>   #@DESCRIPTION: Machine configuration for CFA-10036
>
> -include conf/machine/include/mxs-base.inc
> -
> -SOC_FAMILY = "mxs:mx28"
> -
> -PREFERRED_PROVIDER_virtual/kernel = "linux-cfa"
> -
> -IMAGE_BOOTLOADER = "barebox"
> -BAREBOX_BINARY = "barebox"
> -
> -IMXBOOTLETS_MACHINE = "cfa10036"
> -
> -KERNEL_IMAGETYPE = "zImage"
> -KERNEL_DEVICETREE = "imx28-cfa10036.dtb \
> -                     imx28-cfa10037.dtb \
> -                     imx28-cfa10049.dtb \
> -                     imx28-cfa10055.dtb \
> -                     imx28-cfa10056.dtb \
> -                     imx28-cfa10057.dtb \
> -                     imx28-cfa10058.dtb \
> -"
> -
> -# we need the kernel to be installed in the final image
> -IMAGE_INSTALL_append = " kernel-image kernel-devicetree"
> -
> -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> -IMAGE_FSTYPES ?= "tar.bz2 ext3 barebox.mxsboot-sdcard sdcard"
> -
> -SERIAL_CONSOLE = "115200 ttyAMA0"
> -
> -MACHINE_FEATURES = "apm usbgadget usbhost vfat"
> -
> -# Gstreamer plugin
> -MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
> +include conf/machine/include/cfa10036.inc
> diff --git a/conf/machine/include/cfa10036.inc b/conf/machine/include/cfa10036.inc
> new file mode 100644
> index 0000000..0adea54
> --- /dev/null
> +++ b/conf/machine/include/cfa10036.inc
> @@ -0,0 +1,30 @@
> +# Common definitions for cfa-10036 boards
> +
> +include conf/machine/include/mxs-base.inc
> +
> +SOC_FAMILY = "mxs:mx28"
> +
> +MACHINEOVERRIDES =. "cfa10036:"
> +
> +PREFERRED_PROVIDER_virtual/kernel = "linux-cfa"
> +
> +IMAGE_BOOTLOADER = "barebox"
> +BAREBOX_BINARY = "barebox"
> +
> +IMXBOOTLETS_MACHINE = "cfa10036"
> +
> +KERNEL_IMAGETYPE = "zImage"
> +KERNEL_DEVICETREE = "imx28-cfa10036.dtb"

Would KERNEL_DEVICETREE be part of the machine conf file?

> +
> +# we need the kernel to be installed in the final image
> +IMAGE_INSTALL_append = " kernel-image kernel-devicetree"
> +
> +SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> +IMAGE_FSTYPES ?= "tar.bz2 ext3 barebox.mxsboot-sdcard sdcard"
> +
> +SERIAL_CONSOLE = "115200 ttyAMA0"
> +
> +MACHINE_FEATURES = "apm usbgadget usbhost vfat"
> +
> +# Gstreamer plugin
> +MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
>

Patch

diff --git a/conf/machine/cfa10036.conf b/conf/machine/cfa10036.conf
index b7cdd8d..242d352 100644
--- a/conf/machine/cfa10036.conf
+++ b/conf/machine/cfa10036.conf
@@ -3,36 +3,4 @@ 
 #@SOC: i.MX28
 #@DESCRIPTION: Machine configuration for CFA-10036
 
-include conf/machine/include/mxs-base.inc
-
-SOC_FAMILY = "mxs:mx28"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-cfa"
-
-IMAGE_BOOTLOADER = "barebox"
-BAREBOX_BINARY = "barebox"
-
-IMXBOOTLETS_MACHINE = "cfa10036"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "imx28-cfa10036.dtb \
-                     imx28-cfa10037.dtb \
-                     imx28-cfa10049.dtb \
-                     imx28-cfa10055.dtb \
-                     imx28-cfa10056.dtb \
-                     imx28-cfa10057.dtb \
-                     imx28-cfa10058.dtb \
-"
-
-# we need the kernel to be installed in the final image
-IMAGE_INSTALL_append = " kernel-image kernel-devicetree"
-
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 barebox.mxsboot-sdcard sdcard"
-
-SERIAL_CONSOLE = "115200 ttyAMA0"
-
-MACHINE_FEATURES = "apm usbgadget usbhost vfat"
-
-# Gstreamer plugin
-MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
+include conf/machine/include/cfa10036.inc
diff --git a/conf/machine/include/cfa10036.inc b/conf/machine/include/cfa10036.inc
new file mode 100644
index 0000000..0adea54
--- /dev/null
+++ b/conf/machine/include/cfa10036.inc
@@ -0,0 +1,30 @@ 
+# Common definitions for cfa-10036 boards
+
+include conf/machine/include/mxs-base.inc
+
+SOC_FAMILY = "mxs:mx28"
+
+MACHINEOVERRIDES =. "cfa10036:"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-cfa"
+
+IMAGE_BOOTLOADER = "barebox"
+BAREBOX_BINARY = "barebox"
+
+IMXBOOTLETS_MACHINE = "cfa10036"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "imx28-cfa10036.dtb"
+
+# we need the kernel to be installed in the final image
+IMAGE_INSTALL_append = " kernel-image kernel-devicetree"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 barebox.mxsboot-sdcard sdcard"
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat"
+
+# Gstreamer plugin
+MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"