From d787c4947c9793a0aa9cc974cfb2b0e163bca61b Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 27 Nov 2012 16:04:06 +0100 Subject: [PATCH] meta-digi-arm: Reuse meta-fsl-arm for machine configuration. - imx-digi-base includes imx-base and contains the overrides. - mxs-digi-base includes mxs-base and contains the overrides. - digi-defaults contains the overrides to fsl-default-settings, fsl-default-providers and fsl-default-versions. - The machine configuration files include the digi includes and also contains the UBOOT load addresses overrides. Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/machine/ccardxmx28js.conf | 2 +- meta-digi-arm/conf/machine/ccxmx51js.conf | 9 ++- meta-digi-arm/conf/machine/ccxmx53js.conf | 7 ++- .../conf/machine/include/digi-defaults.inc | 6 +- .../conf/machine/include/imx-base.inc | 55 ------------------- .../conf/machine/include/imx-digi-base.inc | 14 +++++ .../conf/machine/include/mxs-base.inc | 20 ------- .../conf/machine/include/mxs-digi-base.inc | 6 ++ 8 files changed, 34 insertions(+), 85 deletions(-) delete mode 100644 meta-digi-arm/conf/machine/include/imx-base.inc create mode 100644 meta-digi-arm/conf/machine/include/imx-digi-base.inc delete mode 100644 meta-digi-arm/conf/machine/include/mxs-base.inc create mode 100644 meta-digi-arm/conf/machine/include/mxs-digi-base.inc diff --git a/meta-digi-arm/conf/machine/ccardxmx28js.conf b/meta-digi-arm/conf/machine/ccardxmx28js.conf index 4361ac209..2ffda86e7 100644 --- a/meta-digi-arm/conf/machine/ccardxmx28js.conf +++ b/meta-digi-arm/conf/machine/ccardxmx28js.conf @@ -2,7 +2,7 @@ #@NAME: ConnectCore for MX28 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 JSK. -include conf/machine/include/mxs-base.inc +include conf/machine/include/mxs-digi-base.inc IMXBOOTLETS_MACHINE = "CCARDXMX28JS" diff --git a/meta-digi-arm/conf/machine/ccxmx51js.conf b/meta-digi-arm/conf/machine/ccxmx51js.conf index c46a9f758..2f1f248c7 100644 --- a/meta-digi-arm/conf/machine/ccxmx51js.conf +++ b/meta-digi-arm/conf/machine/ccxmx51js.conf @@ -2,10 +2,10 @@ #@NAME: ConnectCore for MX51 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK -include conf/machine/include/imx-base.inc +include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx51:mx5" +SOC_FAMILY = "mx5" # [DIGI] Dig's kernel does not use device trees. # KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccxmx51js.dts" @@ -14,4 +14,7 @@ UBOOT_MACHINE = "ccxmx51_config" # [DIGI] Wireless firmware file need to be addded here # MACHINE_FIRMWARE += " firmware-imx-ath6k" -MACHINE_FEATURES += " wifi" \ No newline at end of file +MACHINE_FEATURES += " wifi" + +UBOOT_ENTRYPOINT_mx51 = "0x94000000" +UBOOT_LOADADDRESS_mx51 = "0x94000000" diff --git a/meta-digi-arm/conf/machine/ccxmx53js.conf b/meta-digi-arm/conf/machine/ccxmx53js.conf index 4d928dda5..3fd5c67ff 100644 --- a/meta-digi-arm/conf/machine/ccxmx53js.conf +++ b/meta-digi-arm/conf/machine/ccxmx53js.conf @@ -2,10 +2,10 @@ #@NAME: ConnectCore for MX53 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK. -include conf/machine/include/imx-base.inc +include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx53:mx5" +SOC_FAMILY = "mx5" # [DIGI] Digi's kernel does not use device tree. # KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts" @@ -15,3 +15,6 @@ UBOOT_MACHINE = "ccxmx53js_config" # [DIGI] Wireless firmware file need to be addded here # MACHINE_FIRMWARE += " firmware-imx-ath6k" MACHINE_FEATURES += " wifi" + +UBOOT_ENTRYPOINT_mx53 = "0x70800000" +UBOOT_LOADADDRESS_mx53 = "0x70800000" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 4ccb03285..466aed51a 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -1,9 +1,7 @@ # Digi BSP default providers -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-digi" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx" -PREFERRED_PROVIDER_u-boot ?= "u-boot-digi" +PREFERRED_PROVIDER_virtual/kernel = "linux-digi" +PREFERRED_PROVIDER_u-boot = "u-boot-digi" # Digi BSP default settings diff --git a/meta-digi-arm/conf/machine/include/imx-base.inc b/meta-digi-arm/conf/machine/include/imx-base.inc deleted file mode 100644 index 3cde7a302..000000000 --- a/meta-digi-arm/conf/machine/include/imx-base.inc +++ /dev/null @@ -1,55 +0,0 @@ -# Provides the i.MX architecture common settings - -include conf/machine/include/digi-defaults.inc -include conf/machine/include/soc-family.inc - -# [DIGI] [TODO] Don't think we need this. -# Disable perf features as 2.6.35.3 fail to build otherwise -# PERF_FEATURES_ENABLE = "" - -UBOOT_ENTRYPOINT_mx51 = "0x94000000" -UBOOT_LOADADDRESS_mx51 = "0x94000000" - -UBOOT_ENTRYPOINT_mx53 = "0x70800000" -UBOOT_LOADADDRESS_mx53 = "0x70800000" - -# [DIGI] Work in progress -# UBOOT_ENTRYPOINT_mx6 = "0x10800000" -# UBOOT_LOADADDRESS_mx6 = "0x10800000" - -XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_mx5 = "xf86-video-imxfb" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - ${XSERVER_DRIVER}" - -# Ship kernel modules -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" - -# Firmware -MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE_mx53 = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" -MACHINE_FIRMWARE_mx51 = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" - -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" - -# Extra audio support -MACHINE_EXTRA_RRECOMMENDS += "imx-audio \ - imx-lib \ - udev-extraconf" - -# Gstreamer plugin -MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" - -PREFERRED_PROVIDER_virtual/libgl_mx5 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" - -EXTRA_IMAGEDEPENDS = "u-boot" - -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "jffs2 tar.bz2 ext3 sdcard" - -SERIAL_CONSOLE = "115200 ttymxc0" - -KERNEL_IMAGETYPE = "uImage" - -MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc new file mode 100644 index 000000000..0d6f0fee1 --- /dev/null +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -0,0 +1,14 @@ +# Provides the i.MX architecture common settings +include conf/machine/include/imx-base.inc + +# Overrides the default fsl settings + +# Single override file for settings, versions and providers. +include conf/machine/include/digi-defaults.inc + +UBOOT_MAKE_TARGET = "u-boot.bin" +UBOOT_SUFFIX = "bin" + +PREFERRED_PROVIDER_virtual/libgl_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" + +IMAGE_FSTYPES = "jffs2 tar.bz2 ext3 sdcard" diff --git a/meta-digi-arm/conf/machine/include/mxs-base.inc b/meta-digi-arm/conf/machine/include/mxs-base.inc deleted file mode 100644 index 46d5a6694..000000000 --- a/meta-digi-arm/conf/machine/include/mxs-base.inc +++ /dev/null @@ -1,20 +0,0 @@ -# Provides the i.MXS common settings - -include conf/machine/include/digi-defaults.inc -include conf/machine/include/soc-family.inc -include conf/machine/include/tune-arm926ejs.inc - -SOC_FAMILY = "mxs" - -# [DIGI] This may not be needed -# Disable perf features as 2.6.35.3 fail to build otherwise -# PERF_FEATURES_ENABLE = "" - -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - xf86-video-fbdev" - -# Ship kernel modules -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" - -SERIAL_CONSOLE = "115200 ttyAMA0" diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc new file mode 100644 index 000000000..cab205bf8 --- /dev/null +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -0,0 +1,6 @@ +# Provides the i.MXS common settings +include conf/machine/include/mxs-base.inc + +# Override default fsl settings. + +include conf/machine/include/digi-defaults.inc