diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-10 12:13:19 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-11-10 18:57:37 -0200 |
commit | b5840d3aa1a7ae34830a98839d9a171add7f7fd9 (patch) | |
tree | 03b9d2c3af6b6208cf2beddb071affad39011263 /conf | |
parent | 20816796995950dd96fb938724daffb4910681bc (diff) | |
download | meta-fsl-arm-b5840d3aa1a7ae34830a98839d9a171add7f7fd9.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>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/imx23evk.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx28evk.conf | 1 | ||||
-rw-r--r-- | conf/machine/include/mxs-base.inc | 2 |
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" | |||
11 | IMXBOOTLETS_MACHINE = "stmp378x_dev" | 11 | IMXBOOTLETS_MACHINE = "stmp378x_dev" |
12 | UBOOT_MACHINE = "mx23evk_config" | 12 | UBOOT_MACHINE = "mx23evk_config" |
13 | 13 | ||
14 | KERNEL_IMAGETYPE = "zImage" | ||
15 | KERNEL_DEVICETREE = "imx23-evk.dtb" | 14 | KERNEL_DEVICETREE = "imx23-evk.dtb" |
16 | 15 | ||
17 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | 16 | SDCARD_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" | |||
15 | UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs" | 15 | UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs" |
16 | UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard" | 16 | UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard" |
17 | 17 | ||
18 | KERNEL_IMAGETYPE = "zImage" | ||
19 | KERNEL_DEVICETREE = "imx28-evk.dtb" | 18 | KERNEL_DEVICETREE = "imx28-evk.dtb" |
20 | 19 | ||
21 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | 20 | SDCARD_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" | |||
41 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | 41 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" |
42 | 42 | ||
43 | SERIAL_CONSOLE = "115200 ttyAMA0" | 43 | SERIAL_CONSOLE = "115200 ttyAMA0" |
44 | |||
45 | KERNEL_IMAGETYPE = "zImage" | ||