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

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
This commit is contained in:
Hector Palacios 2018-01-18 18:03:12 +01:00
parent 301597e320
commit 02504c6730
4 changed files with 16 additions and 24 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

@ -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 \

1
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -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}"

32
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6sbc/boot.txt
View File

@ -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

4
meta-digi-arm/recipes-kernel/linux/linux-dey.inc
View File

@ -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() {