Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccimx6/ccimx6ul: default kernel image to zImage, except for CC6 

U-Boot has been able to boot kernel zImage for a long time so make this
the default kernel image.
For the CC6 we still want to use uImage for compatibility reasons.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-5237
This commit is contained in:
Hector Palacios 2017-11-20 12:51:13 +01:00
parent faabf6ebbb
commit 5d18ee6731
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -25,6 +25,9 @@ UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig"
UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig"
UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig"
# Use uImage for backwards compatibility
KERNEL_IMAGETYPE = "uImage"
KERNEL_DEVICETREE ?= " \
imx6dl-ccimx6sbc.dtb \
imx6dl-ccimx6sbc-w.dtb \

2
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -36,8 +36,6 @@ MACHINE_FEATURES += "wifi bluetooth"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
KERNEL_IMAGETYPE = "zImage"
# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"

2
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -88,7 +88,7 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6ul = ""
EXTRA_IMAGEDEPENDS = "u-boot"
KERNEL_IMAGETYPE = "uImage"
KERNEL_IMAGETYPE = "zImage"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6qpsbc/boot.txt
View File

@ -6,13 +6,13 @@
# Set device tree filename depending on the board ID (if defined)
#
if test -n "${board_id}"; then
setenv fdt_file uImage-${soc_family}-ccimx6qpsbc-id${board_id}.dtb
setenv fdt_file zImage-${soc_family}-ccimx6qpsbc-id${board_id}.dtb
else
#
# Set device tree filename depending on the hardware variant
#
if test "${module_variant}" = "0x01"; then
setenv fdt_file uImage-${soc_family}-ccimx6qpsbc-wb.dtb
setenv fdt_file zImage-${soc_family}-ccimx6qpsbc-wb.dtb
else
echo "------ Using default fdt_file"
fi