The consolidation of all i.MX related base settings allow for a more global view of the settings in place. Up to now, the i.MX 23 and i.MX 28 SoCs were using the mxs-base.inc file, causing fragmentation.
The changes necessary to keep all i.MX 23 and i.MX 28 reference boards working properly has been done, some values need to be reworked to apply to SoC families instead of global setting but the price for clearness seems worth it. Signed-off-by: Otavio Salvador <[email protected]> --- Changes in v2: None conf/machine/imx23evk.conf | 3 ++- conf/machine/imx28evk.conf | 3 ++- conf/machine/include/imx-base.inc | 34 +++++++++++++++++++++++++++---- conf/machine/include/mxs-base.inc | 42 --------------------------------------- 4 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 conf/machine/include/mxs-base.inc diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index 1d5eaef..ddd6028 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 <[email protected]> -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 5a55d72..c05ad8f 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 <[email protected]> -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 094c9c5..a36ca2b 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -8,9 +8,26 @@ 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_SUFFIX ?= "imx" +UBOOT_MAKE_TARGET_mxs = "u-boot.sb" +UBOOT_MAKE_TARGET_mx51 = "u-boot.imx" +UBOOT_MAKE_TARGET_mx53 = "u-boot.imx" +UBOOT_MAKE_TARGET_mx6 = "u-boot.imx" +UBOOT_MAKE_TARGET_mx6sl = "u-boot.imx" +UBOOT_MAKE_TARGET_mx6sx = "u-boot.imx" +UBOOT_MAKE_TARGET_mx7 = "u-boot.imx" +UBOOT_MAKE_TARGET_vf = "u-boot.imx" + +UBOOT_SUFFIX_mxs = "sb" +UBOOT_SUFFIX_mx51 = "imx" +UBOOT_SUFFIX_mx53 = "imx" +UBOOT_SUFFIX_mx6 = "imx" +UBOOT_SUFFIX_mx6sl = "imx" +UBOOT_SUFFIX_mx6sx = "imx" +UBOOT_SUFFIX_mx7 = "imx" +UBOOT_SUFFIX_vf = "imx" + +UBOOT_ENTRYPOINT_mxs = "0x40008000" UBOOT_ENTRYPOINT_mx51 = "0x90008000" UBOOT_ENTRYPOINT_mx53 = "0x70008000" UBOOT_ENTRYPOINT_mx6 = "0x10008000" @@ -132,6 +149,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 +158,16 @@ PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4" IMAGE_FSTYPES ?= "ext4 sdcard.gz" - -SERIAL_CONSOLE = "115200 ttymxc0" +IMAGE_FSTYPES_mxs ?= "ext4 uboot.mxsboot-sdcard sdcard.gz" + +SERIAL_CONSOLE_mxs = "115200 ttyAMA0" +SERIAL_CONSOLE_mx51 = "115200 ttymxc0" +SERIAL_CONSOLE_mx53 = "115200 ttymxc0" +SERIAL_CONSOLE_mx6 = "115200 ttymxc0" +SERIAL_CONSOLE_mx6sl = "115200 ttymxc0" +SERIAL_CONSOLE_mx6sx = "115200 ttymxc0" +SERIAL_CONSOLE_mx7 = "115200 ttymxc0" +SERIAL_CONSOLE_vf = "115200 ttymxc0" KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc deleted file mode 100644 index 6083fd5..0000000 --- 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:" -- 2.5.3 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
