summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-10 12:13:19 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2014-11-10 17:54:16 -0200
commit14dad4f3323fc4228aa5fd5d89159d97a2c94dd0 (patch)
tree9b618f07fd96fa340918b6ee2a44421804bc798e
parent61938affe6bdc1272117f7f7f61ef8af77f479f1 (diff)
downloadmeta-fsl-arm-14dad4f3323fc4228aa5fd5d89159d97a2c94dd0.tar.gz
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>
-rw-r--r--conf/machine/imx23evk.conf1
-rw-r--r--conf/machine/imx28evk.conf1
-rw-r--r--conf/machine/include/mxs-base.inc2
3 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 28dede7..5b79690 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -11,7 +11,6 @@ SOC_FAMILY = "mxs:mx23"
11IMXBOOTLETS_MACHINE = "stmp378x_dev" 11IMXBOOTLETS_MACHINE = "stmp378x_dev"
12UBOOT_MACHINE = "mx23evk_config" 12UBOOT_MACHINE = "mx23evk_config"
13 13
14KERNEL_IMAGETYPE = "zImage"
15KERNEL_DEVICETREE = "imx23-evk.dtb" 14KERNEL_DEVICETREE = "imx23-evk.dtb"
16 15
17SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" 16SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index e633487..86123c3 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -15,7 +15,6 @@ UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
15UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs" 15UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
16UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard" 16UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
17 17
18KERNEL_IMAGETYPE = "zImage"
19KERNEL_DEVICETREE = "imx28-evk.dtb" 18KERNEL_DEVICETREE = "imx28-evk.dtb"
20 19
21SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" 20SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index a0fc0d7..40cfa0f 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -41,3 +41,5 @@ INHERIT += "fsl-dynamic-packagearch"
41MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 41MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
42 42
43SERIAL_CONSOLE = "115200 ttyAMA0" 43SERIAL_CONSOLE = "115200 ttyAMA0"
44
45KERNEL_IMAGETYPE = "zImage"