From 8f4d2cce42ecd36b86e1435ae8b95a5206c6cb56 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 21 Sep 2015 17:47:06 -0300 Subject: Move mxs-base.inc contents to imx-base.inc The consolidation of all i.MX related base settings allows a more global view of the settings in place. One of the reasons for this patch is the fragmentation caused by i.MX23 and i.MX28 SoCs using mxs-base.inc. The changes needed to get i.MX23 and i.MX28 SoCs working have been included in imx-base.inc file already and some values required rework to apply to specific SoC families to avoid regressions. Signed-off-by: Otavio Salvador --- conf/machine/imx23evk.conf | 3 ++- conf/machine/imx28evk.conf | 3 ++- conf/machine/include/imx-base.inc | 10 +++++++++- conf/machine/include/mxs-base.inc | 42 --------------------------------------- 4 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 conf/machine/include/mxs-base.inc (limited to 'conf') diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index 1d5eaefb..ddd60285 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 -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 5a55d725..c05ad8f6 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 -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 094c9c56..9b3bf60f 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -8,9 +8,14 @@ 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_MAKE_TARGET ?= "u-boot.imx" +UBOOT_MAKE_TARGET_mxs ?= "u-boot.sb" + UBOOT_SUFFIX ?= "imx" +UBOOT_SUFFIX_mxs ?= "sb" +UBOOT_ENTRYPOINT_mxs = "0x40008000" UBOOT_ENTRYPOINT_mx51 = "0x90008000" UBOOT_ENTRYPOINT_mx53 = "0x70008000" UBOOT_ENTRYPOINT_mx6 = "0x10008000" @@ -132,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" @@ -140,8 +146,10 @@ PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4" IMAGE_FSTYPES ?= "ext4 sdcard.gz" +IMAGE_FSTYPES_mxs ?= "ext4 uboot.mxsboot-sdcard sdcard.gz" SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLE_mxs = "115200 ttyAMA0" KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc deleted file mode 100644 index 6083fd57..00000000 --- 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 ?= "ext4 uboot.mxsboot-sdcard sdcard.gz" - -# Add the ability to specify _imx machines -MACHINEOVERRIDES =. "imx:" -- cgit v1.2.3-54-g00ecf