From 58bbd78efe3ebdda4695995f61e0e2ae73097305 Mon Sep 17 00:00:00 2001 From: hbujanda Date: Thu, 15 Mar 2018 13:30:44 +0100 Subject: [PATCH] ccimx6ulstarter/sbc: add support for variant 0x05 Variant 0x05 is a non-wireless with 1 GiB DDR3 boot.txt: Select zImage-imx6ul-ccimx6ulsbc.dtb fdt_file. install_linux_fw_sd: Use u-boot-ccimx6ulsbc1GB.imx bootloader. Signed-off-by: Hector bujanda https://jira.digi.com/browse/DEL-5684 --- .../recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/boot.txt | 2 +- .../u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey-2015.04/ccimx6ulstarter/boot.txt | 2 +- .../u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/boot.txt index 41fabd40f..61ad40243 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/boot.txt @@ -13,7 +13,7 @@ else # if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then setenv fdt_file zImage-imx6ul-ccimx6ulsbc-wb.dtb - elif test "${module_variant}" = "0x03"; then + elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then setenv fdt_file zImage-imx6ul-ccimx6ulsbc.dtb else echo "------ Using default fdt_file: $fdt_file" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt index f6dfc5a08..2a63489e5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt @@ -23,7 +23,7 @@ fi if test -n "${module_variant}"; then if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc.imx; - elif test "${module_variant}" = "0x04"; then + elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc1GB.imx; fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/boot.txt index 875f453de..cad47192a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/boot.txt @@ -13,7 +13,7 @@ else # if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then setenv fdt_file zImage-imx6ul-ccimx6ulstarter-wb.dtb - elif test "${module_variant}" = "0x03"; then + elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then setenv fdt_file zImage-imx6ul-ccimx6ulstarter.dtb else echo "------ Using default fdt_file: $fdt_file" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt index 6f9a1614b..b9d1c97c2 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt @@ -23,7 +23,7 @@ fi if test -n "${module_variant}"; then if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter.imx; - elif test "${module_variant}" = "0x04"; then + elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter1GB.imx; fi fi