From c4c2cde2c6e69e985094904ea67a4df1400e98ac Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 10 Nov 2014 12:13:19 -0200 Subject: [PATCH] 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 Tested-by: Daiane Angolini Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/machine/imx23evk.conf | 1 - meta-fsl-arm/conf/machine/imx28evk.conf | 1 - meta-fsl-arm/conf/machine/include/mxs-base.inc | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-fsl-arm/conf/machine/imx23evk.conf b/meta-fsl-arm/conf/machine/imx23evk.conf index 28dede73..5b796906 100644 --- 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 e6334877..86123c31 100644 --- 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 a0fc0d7a..40cfa0f1 100644 --- 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" -- 2.40.1