From fb765741a5fefb6f717e919cac46c6133ec7ff76 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 5 Jul 2018 13:49:40 +0200 Subject: [PATCH] ccimx8x: change kernel to Image.gz and support all SOM variants in DT U-Boot's 'dboot' command now supports uncompressing Image.gz. This will be the default kernel image type for the CC8X. This also changes the names of the device tree artifacts, that must be updated on the boot script. While on it, add support for all the SOM variants (wireless and non-wireless). Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 1 + meta-digi-arm/conf/machine/include/ccimx8x.inc | 4 ++-- .../u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt | 12 ++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index fc556c478..a576a03e5 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -27,6 +27,7 @@ UBOOT_CONFIG[ccimx8x_sbc_express2GB] = "ccimx8x_sbc_express2GB_defconfig,,u-boot UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" KERNEL_DEVICETREE ?= " \ + digi/ccimx8x-sbc-express-wb.dtb \ digi/ccimx8x-sbc-express.dtb \ " diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 096005667..d8b0bf238 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -36,5 +36,5 @@ MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip" -# AARCH64 doesn't support compressed kernel images -KERNEL_IMAGETYPE = "Image" +# AARCH64 doesn't support self-extracting zImage +KERNEL_IMAGETYPE = "Image.gz" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt index 9dab463bb..e8895fadd 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt @@ -6,13 +6,21 @@ # Set device tree filename depending on the board ID (if defined) # if test -n "${board_id}"; then - setenv fdt_file zImage-ccimx8x-sbc-express-id${board_id}.dtb + setenv fdt_file Image.gz-ccimx8x-sbc-express-id${board_id}.dtb else # # Set device tree filename depending on the hardware variant # if test "${module_variant}" = "0x01"; then - setenv fdt_file zImage-ccimx8x-sbc-express-wb.dtb + setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb + elif test "${module_variant}" = "0x02"; then + setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb + elif test "${module_variant}" = "0x03"; then + setenv fdt_file Image.gz-ccimx8x-sbc-express.dtb + elif test "${module_variant}" = "0x04"; then + setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb + elif test "${module_variant}" = "0x05"; then + setenv fdt_file Image.gz-ccimx8x-sbc-express.dtb else echo "------ Using default fdt_file" fi