move all common definitions for i.MX53 machines onto imx53-base.inc

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

diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf
index 73fc3a2518ac8473331f502afa869a4effd0a3d3..6195826043a8d6d56ac60385f541e646a8266bd8 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx53ard.conf
+++ b/meta-fsl-arm/conf/machine/imx53ard.conf
@@ -3,40 +3,5 @@
 #@DESCRIPTION: Machine configuration for Freescale imx53 sabre tablet board
 
 include conf/machine/include/imx53-base.inc
-include conf/machine/include/tune-cortexa8.inc
-
-# Todo: 
-#      Check Freescale x11 framebuffer
-#      Check jffs2 extra commands
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg-lite"
-XSERVER = "xserver-xorg-lite \
-              xf86-input-evdev \
-              xf86-input-keyboard \
-              xf86-input-mouse \
-           xf86-video-imxfb"
-
-# Ship kernel modules
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-# Extra audio support
-MACHINE_EXTRA_RRECOMMENDS += "imx-lib imx-audio \
-                              pulseaudio \
-                              fsl-mm-codeclib \
-                              gst-fsl-plugin"
-
-EXTRA_IMAGE_DEPENDS = "u-boot-imx"
-
-IMAGE_FSTYPES += "tar.bz2 jffs2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_MACHINE = "mx53_ard_ddr3_config"
-UBOOT_ENTRYPOINT = "0x70800000"
-UBOOT_LOADADDRESS = "0x70800000"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa touchscreen"

diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf
index e9b8ff6490d4bce8b1569ab3d09c92f9bd9bc1be..0b81d4cc90acbcf5a8691000451155c4ec731b35 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx53qsb.conf
+++ b/meta-fsl-arm/conf/machine/imx53qsb.conf
@@ -2,42 +2,6 @@
 #@NAME: imx53 quick start board
 #@DESCRIPTION: Machine configuration for Freescale imx53 quick start board
 
-#TARGET_ARCH = "arm"
 include conf/machine/include/imx53-base.inc
-include conf/machine/include/tune-cortexa8.inc
-
-# Todo: 
-#      Check Freescale x11 framebuffer
-#      Check jffs2 extra commands
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg-lite"
-XSERVER = "xserver-xorg-lite \
-              xf86-input-evdev \
-              xf86-input-keyboard \
-              xf86-input-mouse \
-              xf86-video-imxfb"
-
-# Ship kernel modules
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-# Extra audio support
-MACHINE_EXTRA_RRECOMMENDS += "imx-lib imx-audio \
-                              pulseaudio \
-                              fsl-mm-codeclib \
-                              gst-fsl-plugin"
-
-EXTRA_IMAGEDEPENDS = "u-boot-imx"
-
-IMAGE_FSTYPES += "tar.bz2 jffs2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_MACHINE = "mx53_loco_config"
-UBOOT_ENTRYPOINT = "0x70800000"
-UBOOT_LOADADDRESS = "0x70800000"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa touchscreen"

diff --git a/meta-fsl-arm/conf/machine/include/imx53-base.inc b/meta-fsl-arm/conf/machine/include/imx53-base.inc
index de72a1502609be6e443cb753e3c0a4852a901bfd..031cff0cc8c0a55f905a1ed6b7b5c0d6b29fa1fa 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx53-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx53-base.inc
@@ -1,3 +1,42 @@
+# Provides the i.MX53 common settings
+
+include conf/machine/include/tune-cortexa8.inc
+
 include conf/distro/include/fsl-default-versions.inc
 include conf/distro/include/fsl-default-revisions.inc
 include conf/distro/include/fsl-default-providers.inc
+
+# Todo:
+#      Check Freescale x11 framebuffer
+#      Check jffs2 extra commands
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg-lite"
+XSERVER = "xserver-xorg-lite \
+           xf86-input-evdev \
+           xf86-input-keyboard \
+           xf86-input-mouse \
+           xf86-video-imxfb"
+
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Extra audio support
+MACHINE_EXTRA_RRECOMMENDS += "imx-lib imx-audio \
+                              pulseaudio \
+                              fsl-mm-codeclib \
+                              gst-fsl-plugin"
+
+EXTRA_IMAGE_DEPENDS = "u-boot-imx"
+
+IMAGE_FSTYPES += "tar.bz2 jffs2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x70800000"
+UBOOT_LOADADDRESS = "0x70800000"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa touchscreen"