From 49ab24e06b8820ed40474dd89ba36d380e3f3045 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 19 May 2012 09:15:02 -0300 Subject: [PATCH] imx28evk: move generic code to mxs-base.inc To avoid metadata duplication we provide a mxs-base.inc to be used for every i.MXS based board. Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/machine/imx28evk.conf | 20 ++------------ .../conf/machine/include/mxs-base.inc | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 meta-fsl-arm/conf/machine/include/mxs-base.inc diff --git a/meta-fsl-arm/conf/machine/imx28evk.conf b/meta-fsl-arm/conf/machine/imx28evk.conf index f6203c86..74524fe6 100644 --- a/meta-fsl-arm/conf/machine/imx28evk.conf +++ b/meta-fsl-arm/conf/machine/imx28evk.conf @@ -2,15 +2,7 @@ #@NAME: imx28 evaluation kit #@DESCRIPTION: Machine configuration for Freescale imx28 evaluation kit -include conf/distro/include/fsl-default-settings.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 - -include conf/machine/include/soc-family.inc -include conf/machine/include/tune-arm926ejs.inc - -SOC_FAMILY = "mxs" +include conf/machine/include/mxs-base.inc UBOOT_ENTRYPOINT = "0x41008000" UBOOT_LOADADDRESS = "0x41008000" @@ -18,15 +10,7 @@ UBOOT_MACHINE = "mx28evk_config" UBOOT_MAKE_TARGET = "u-boot.sb" UBOOT_SUFFIX = "sb" -# Ship kernel modules -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" - -EXTRA_IMAGEDEPENDS = "u-boot" - -XSERVER = "xserver-xorg-lite \ - xf86-input-evdev \ - xf86-video-fbdev \ -" +KERNEL_IMAGETYPE = "uImage" SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" diff --git a/meta-fsl-arm/conf/machine/include/mxs-base.inc b/meta-fsl-arm/conf/machine/include/mxs-base.inc new file mode 100644 index 00000000..941ff108 --- /dev/null +++ b/meta-fsl-arm/conf/machine/include/mxs-base.inc @@ -0,0 +1,26 @@ +# Provides the i.MXS common settings + +include conf/distro/include/fsl-default-settings.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 + +include conf/machine/include/soc-family.inc +include conf/machine/include/tune-arm926ejs.inc + +SOC_FAMILY = "mxs" + +XSERVER = "xserver-xorg-lite \ + xf86-input-evdev \ + xf86-video-fbdev" + +# 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" + +SERIAL_CONSOLE = "115200 ttyAMA0" -- 2.40.1