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

uboot: update scripts to consider 'soc_type' var starts with "imx" 

The 'soc_type' variable was already set by fastboot to "imx8qxp"
so the U-Boot board code that was setting this to just "8qxp" has
been changed to set it to "imx8qxp".

Update the scripts accordingly.

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

https://jira.digi.com/browse/DUB-901
This commit is contained in:
Hector Palacios 2019-08-20 16:27:17 +02:00
parent 797f9dc357
commit fd3f3ba413
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,16 @@
# U-Boot bootscript for EMMC/SD images created by Yocto. # U-Boot bootscript for EMMC/SD images created by Yocto.
# #
# Set SOC type to "8qxp" if not already defined by U-Boot # Set SOC type to "imx8qxp" if not already defined by U-Boot
if test ! -n "${soc_type}"; then if test ! -n "${soc_type}"; then
setenv soc_type "8qxp" setenv soc_type "imx8qxp"
fi fi
# #
# 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 ccimx${soc_type}-sbc-express-id${board_id}.dtb setenv fdt_file cc${soc_type}-sbc-express-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware capabilities # Set device tree filename depending on the hardware capabilities
@ -23,9 +23,9 @@ else
if test "${module_has_wifi}" = "1" && if test "${module_has_wifi}" = "1" &&
test "${module_has_bt}" = "1"; then test "${module_has_bt}" = "1"; then
setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
else else
setenv fdt_file ccimx${soc_type}-sbc-express.dtb setenv fdt_file cc${soc_type}-sbc-express.dtb
fi fi
else else
# #
@ -34,13 +34,13 @@ else
if test "${module_variant}" = "0x01" || if test "${module_variant}" = "0x01" ||
test "${module_variant}" = "0x02" || test "${module_variant}" = "0x02" ||
test "${module_variant}" = "0x04"; then test "${module_variant}" = "0x04"; then
setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
elif test "${module_variant}" = "0x03" || elif test "${module_variant}" = "0x03" ||
test "${module_variant}" = "0x05" || test "${module_variant}" = "0x05" ||
test "${module_variant}" = "0x06"; then test "${module_variant}" = "0x06"; then
setenv fdt_file ccimx${soc_type}-sbc-express.dtb setenv fdt_file cc${soc_type}-sbc-express.dtb
else else
setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
fi fi
fi fi
fi fi

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

@ -23,7 +23,7 @@ fi
ram_freq="1.2GHz" ram_freq="1.2GHz"
bus_width="32bit" bus_width="32bit"
if test -n "${module_ram}" && test -n "${soc_type}"; then if test -n "${module_ram}" && test -n "${soc_type}"; then
if test "${soc_type}" = "8dx"; then if test "${soc_type}" = "imx8dx"; then
bus_width="16bit" bus_width="16bit"
fi fi
setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${ram_freq}_${module_ram}_${bus_width}.bin; setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${ram_freq}_${module_ram}_${bus_width}.bin;

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

@ -2,16 +2,16 @@
# U-Boot bootscript for EMMC/SD images created by Yocto. # U-Boot bootscript for EMMC/SD images created by Yocto.
# #
# Set SOC type to "8qxp" if not already defined by U-Boot # Set SOC type to "imx8qxp" if not already defined by U-Boot
if test ! -n "${soc_type}"; then if test ! -n "${soc_type}"; then
setenv soc_type "8qxp" setenv soc_type "imx8qxp"
fi fi
# #
# 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 ccimx${soc_type}-sbc-pro-id${board_id}.dtb setenv fdt_file cc${soc_type}-sbc-pro-id${board_id}.dtb
else else
# #
# Set device tree filename depending on the hardware capabilities # Set device tree filename depending on the hardware capabilities
@ -23,9 +23,9 @@ else
if test "${module_has_wifi}" = "1" && if test "${module_has_wifi}" = "1" &&
test "${module_has_bt}" = "1"; then test "${module_has_bt}" = "1"; then
setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
else else
setenv fdt_file ccimx${soc_type}-sbc-pro.dtb setenv fdt_file cc${soc_type}-sbc-pro.dtb
fi fi
else else
# #
@ -34,13 +34,13 @@ else
if test "${module_variant}" = "0x01" || if test "${module_variant}" = "0x01" ||
test "${module_variant}" = "0x02" || test "${module_variant}" = "0x02" ||
test "${module_variant}" = "0x04"; then test "${module_variant}" = "0x04"; then
setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
elif test "${module_variant}" = "0x03" || elif test "${module_variant}" = "0x03" ||
test "${module_variant}" = "0x05" || test "${module_variant}" = "0x05" ||
test "${module_variant}" = "0x06"; then test "${module_variant}" = "0x06"; then
setenv fdt_file ccimx${soc_type}-sbc-pro.dtb setenv fdt_file cc${soc_type}-sbc-pro.dtb
else else
setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
fi fi
fi fi
fi fi

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

@ -23,7 +23,7 @@ fi
ram_freq="1.2GHz" ram_freq="1.2GHz"
bus_width="32bit" bus_width="32bit"
if test -n "${module_ram}" && test -n "${soc_type}"; then if test -n "${module_ram}" && test -n "${soc_type}"; then
if test "${soc_type}" = "8dx"; then if test "${soc_type}" = "imx8dx"; then
bus_width="16bit" bus_width="16bit"
fi fi
setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${ram_freq}_${module_ram}_${bus_width}.bin; setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${ram_freq}_${module_ram}_${bus_width}.bin;