mxs-base.inc: Convert to zImage

U-boot mainline uses zImage as the image type, so let's use zImage by default
in mxs-base.inc.

Boards that use uImage can still override it by passing:
KERNEL_IMAGETYPE = "uImage"

in their .conf file.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/conf/machine/imx23evk.conf b/meta-fsl-arm/conf/machine/imx23evk.conf
index 28dede73b9421199df15492990df038e0dea5f86..5b7969064c9cb84d2275cf17328217000a3de4e7 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx23evk.conf
+++ b/meta-fsl-arm/conf/machine/imx23evk.conf
@@ -11,7 +11,6 @@ SOC_FAMILY = "mxs:mx23"
 IMXBOOTLETS_MACHINE = "stmp378x_dev"
 UBOOT_MACHINE = "mx23evk_config"
 
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = "imx23-evk.dtb"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"

diff --git a/meta-fsl-arm/conf/machine/imx28evk.conf b/meta-fsl-arm/conf/machine/imx28evk.conf
index e633487748188150bcf162b2f1fd11df2f2695c2..86123c3155827efc7c299b9710f6a909f99a77ba 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx28evk.conf
+++ b/meta-fsl-arm/conf/machine/imx28evk.conf
@@ -15,7 +15,6 @@ UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
 UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
 UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
 
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = "imx28-evk.dtb"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"

diff --git a/meta-fsl-arm/conf/machine/include/mxs-base.inc b/meta-fsl-arm/conf/machine/include/mxs-base.inc
index a0fc0d7a24425ce61a7ad317c6dea89d28d3f5ba..40cfa0f13d02ee597525ce031f4c0037e402c719 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/mxs-base.inc
+++ b/meta-fsl-arm/conf/machine/include/mxs-base.inc
@@ -41,3 +41,5 @@ INHERIT += "fsl-dynamic-packagearch"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
+
+KERNEL_IMAGETYPE = "zImage"