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

thud migration: u-boot: remove kernel image type from device tree files 

Device tree file names won't have the kernel image type like a
prefix anymore, since thud uses the original file names.

https://jira.digi.com/browse/DEL-6443

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2019-02-07 11:32:23 +01:00
parent 13c316db25
commit e508231683
7 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -6,45 +6,45 @@
# Set device tree filename depending on the board ID (if defined) # Set device tree filename depending on the board ID (if defined)
# #
if test -n "${board_id}"; then if test -n "${board_id}"; then
setenv fdt_file zImage-${soc_family}-ccimx6sbc-id${board_id}.dtb setenv fdt_file ${soc_family}-ccimx6sbc-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware variant # Set device tree filename depending on the hardware variant
# #
if test "${module_variant}" = "0x02"; then if test "${module_variant}" = "0x02"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb setenv fdt_file imx6q-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x03"; then elif test "${module_variant}" = "0x03"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb setenv fdt_file imx6q-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x04"; then elif test "${module_variant}" = "0x04"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb setenv fdt_file imx6q-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x05"; then elif test "${module_variant}" = "0x05"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-w.dtb setenv fdt_file imx6q-ccimx6sbc-w.dtb
elif test "${module_variant}" = "0x06"; then elif test "${module_variant}" = "0x06"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb setenv fdt_file imx6q-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x08"; then elif test "${module_variant}" = "0x08"; then
setenv fdt_file zImage-imx6q-ccimx6sbc.dtb setenv fdt_file imx6q-ccimx6sbc.dtb
elif test "${module_variant}" = "0x0a"; then elif test "${module_variant}" = "0x0a"; then
setenv fdt_file zImage-imx6dl-ccimx6sbc-w.dtb setenv fdt_file imx6dl-ccimx6sbc-w.dtb
elif test "${module_variant}" = "0x0b"; then elif test "${module_variant}" = "0x0b"; then
setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb setenv fdt_file imx6dl-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x0c"; then elif test "${module_variant}" = "0x0c"; then
setenv fdt_file zImage-imx6dl-ccimx6sbc.dtb setenv fdt_file imx6dl-ccimx6sbc.dtb
elif test "${module_variant}" = "0x0e"; then elif test "${module_variant}" = "0x0e"; then
setenv fdt_file zImage-imx6q-ccimx6sbc.dtb setenv fdt_file imx6q-ccimx6sbc.dtb
elif test "${module_variant}" = "0x0f"; then elif test "${module_variant}" = "0x0f"; then
setenv fdt_file zImage-imx6q-ccimx6sbc.dtb setenv fdt_file imx6q-ccimx6sbc.dtb
elif test "${module_variant}" = "0x11"; then elif test "${module_variant}" = "0x11"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb setenv fdt_file imx6q-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x12"; then elif test "${module_variant}" = "0x12"; then
setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb setenv fdt_file imx6q-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x13"; then elif test "${module_variant}" = "0x13"; then
setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb setenv fdt_file imx6dl-ccimx6sbc-wb.dtb
elif test "${module_variant}" = "0x14"; then elif test "${module_variant}" = "0x14"; then
setenv fdt_file zImage-imx6q-ccimx6sbc.dtb setenv fdt_file imx6q-ccimx6sbc.dtb
elif test "${module_variant}" = "0x15"; then elif test "${module_variant}" = "0x15"; then
setenv fdt_file zImage-imx6dl-ccimx6sbc.dtb setenv fdt_file imx6dl-ccimx6sbc.dtb
else else
echo "------ Using default fdt_file" setenv fdt_file imx6q-ccimx6sbc-wb.dtb
fi fi
fi fi

8
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
View File

@ -6,17 +6,17 @@
# Set device tree filename depending on the board ID (if defined) # Set device tree filename depending on the board ID (if defined)
# #
if test -n "${board_id}"; then if test -n "${board_id}"; then
setenv fdt_file zImage-imx6ul-ccimx6ulsbc-id${board_id}.dtb setenv fdt_file imx6ul-ccimx6ulsbc-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware variant # Set device tree filename depending on the hardware variant
# #
if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
setenv fdt_file zImage-imx6ul-ccimx6ulsbc-wb.dtb setenv fdt_file imx6ul-ccimx6ulsbc-wb.dtb
elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
setenv fdt_file zImage-imx6ul-ccimx6ulsbc.dtb setenv fdt_file imx6ul-ccimx6ulsbc.dtb
else else
echo "------ Using default fdt_file: $fdt_file" setenv fdt_file imx6ul-ccimx6ulsbc-wb.dtb
fi fi
fi fi

8
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
View File

@ -6,17 +6,17 @@
# Set device tree filename depending on the board ID (if defined) # Set device tree filename depending on the board ID (if defined)
# #
if test -n "${board_id}"; then if test -n "${board_id}"; then
setenv fdt_file zImage-imx6ul-ccimx6ulstarter-id${board_id}.dtb setenv fdt_file imx6ul-ccimx6ulstarter-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware variant # Set device tree filename depending on the hardware variant
# #
if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
setenv fdt_file zImage-imx6ul-ccimx6ulstarter-wb.dtb setenv fdt_file imx6ul-ccimx6ulstarter-wb.dtb
elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
setenv fdt_file zImage-imx6ul-ccimx6ulstarter.dtb setenv fdt_file imx6ul-ccimx6ulstarter.dtb
else else
echo "------ Using default fdt_file: $fdt_file" setenv fdt_file imx6ul-ccimx6ulstarter-wb.dtb
fi fi
fi fi

14
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
View File

@ -6,23 +6,23 @@
# Set device tree filename depending on the board ID (if defined) # Set device tree filename depending on the board ID (if defined)
# #
if test -n "${board_id}"; then if test -n "${board_id}"; then
setenv fdt_file Image.gz-ccimx8x-sbc-express-id${board_id}.dtb setenv fdt_file ccimx8x-sbc-express-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware variant # Set device tree filename depending on the hardware variant
# #
if test "${module_variant}" = "0x01"; then if test "${module_variant}" = "0x01"; then
setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb setenv fdt_file ccimx8x-sbc-express-wb.dtb
elif test "${module_variant}" = "0x02"; then elif test "${module_variant}" = "0x02"; then
setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb setenv fdt_file ccimx8x-sbc-express-wb.dtb
elif test "${module_variant}" = "0x03"; then elif test "${module_variant}" = "0x03"; then
setenv fdt_file Image.gz-ccimx8x-sbc-express.dtb setenv fdt_file ccimx8x-sbc-express.dtb
elif test "${module_variant}" = "0x04"; then elif test "${module_variant}" = "0x04"; then
setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb setenv fdt_file ccimx8x-sbc-express-wb.dtb
elif test "${module_variant}" = "0x05"; then elif test "${module_variant}" = "0x05"; then
setenv fdt_file Image.gz-ccimx8x-sbc-express.dtb setenv fdt_file ccimx8x-sbc-express.dtb
else else
echo "------ Using default fdt_file" setenv fdt_file ccimx8x-sbc-express-wb.dtb
fi fi
fi fi

8
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
View File

@ -6,17 +6,17 @@
# Set device tree filename depending on the board ID (if defined) # Set device tree filename depending on the board ID (if defined)
# #
if test -n "${board_id}"; then if test -n "${board_id}"; then
setenv fdt_file Image.gz-ccimx8x-sbc-pro-id${board_id}.dtb setenv fdt_file ccimx8x-sbc-pro-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware variant # Set device tree filename depending on the hardware variant
# #
if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
setenv fdt_file Image.gz-ccimx8x-sbc-pro-wb.dtb setenv fdt_file ccimx8x-sbc-pro-wb.dtb
elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
setenv fdt_file Image.gz-ccimx8x-sbc-pro.dtb setenv fdt_file ccimx8x-sbc-pro.dtb
else else
echo "------ Using default fdt_file: $fdt_file" setenv fdt_file ccimx8x-sbc-pro-wb.dtb
fi fi
fi fi

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/use-mainline-bsp/boot.txt
View File

@ -2,9 +2,9 @@
# U-Boot bootscript for NAND images created by Yocto. # U-Boot bootscript for NAND images created by Yocto.
# #
if test "${board}" = "ccimx6ulsbc"; then if test "${board}" = "ccimx6ulsbc"; then
setenv fdt_file zImage-imx6ul-ccimx6ulsbcpro.dtb setenv fdt_file imx6ul-ccimx6ulsbcpro.dtb
else else
setenv fdt_file zImage-imx6ul-ccimx6ulsbcexpress.dtb setenv fdt_file imx6ul-ccimx6ulsbcexpress.dtb
fi fi
if test "${mtdbootpart}" = "recovery"; then if test "${mtdbootpart}" = "recovery"; then