From 02504c6730f71b1996f0742ebfe3506e88a918d5 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 18 Jan 2018 18:03:12 +0100
Subject: [PATCH] ccimx6: default kernel image to zImage

As a side effect, remove U-Boot entry point variable and LOADADDR
extra parameter from the kernel recipe.

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

https://jira.digi.com/browse/DEL-5554
---
 meta-digi-arm/conf/machine/ccimx6sbc.conf     |  3 --
 meta-digi-arm/conf/machine/include/ccimx6.inc |  1 -
 .../u-boot-dey-2015.04/ccimx6sbc/boot.txt     | 32 +++++++++----------
 .../recipes-kernel/linux/linux-dey.inc        |  4 ---
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 45ac52237..d10f8ea99 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -20,9 +20,6 @@ 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 \
diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index e638551ce..a5c4bdd9f 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -9,7 +9,6 @@ include conf/machine/include/imx-digi-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
 # Platform u-boot settings
-UBOOT_ENTRYPOINT = "0x10800000"
 UBOOT_SUFFIX = "imx"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6sbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6sbc/boot.txt
index 8a3c60f95..8590ac48c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6sbc/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6sbc/boot.txt
@@ -6,41 +6,41 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file uImage-${soc_family}-ccimx6sbc-id${board_id}.dtb
+	setenv fdt_file zImage-${soc_family}-ccimx6sbc-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x02"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x03"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x04"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x05"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-w.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-w.dtb
 	elif test "${module_variant}" = "0x06"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x08"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x0a"; then
-		setenv fdt_file uImage-imx6dl-ccimx6sbc-w.dtb
+		setenv fdt_file zImage-imx6dl-ccimx6sbc-w.dtb
 	elif test "${module_variant}" = "0x0b"; then
-		setenv fdt_file uImage-imx6dl-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x0c"; then
-		setenv fdt_file uImage-imx6dl-ccimx6sbc.dtb
+		setenv fdt_file zImage-imx6dl-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x0e"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x0f"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x11"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x12"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x13"; then
-		setenv fdt_file uImage-imx6dl-ccimx6sbc-wb.dtb
+		setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x14"; then
-		setenv fdt_file uImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
 	else
 		echo "------ Using default fdt_file"
 	fi
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index cae58b921..69117b9ff 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -21,10 +21,6 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-# We need to pass it as param since kernel might support more than one
-# machine, with different entry points
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
 do_deploy[postfuncs] += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence_sign', '', d)}"
 
 trustfence_sign() {