board/freescale: Introduce UBOOTBIN in spl genimage templates

For boards like imx7d-pico, u-boot.img changes to u-boot-dtb.img in
U-Boot v2019.07. Therefore, we need to pick u-boot.img or u-boot-dtb.img
depending on the board configuration.

Just like was done in commit 52344e556fa03 for the generic genimage
template, replace the U-Boot file name with UBOOTBIN, which is set
according to the BR2_TARGET_UBOOT_FORMAT_* option. We also need to set
the correct value for this variable for the u-boot.img and
u-boot-dtb.img cases.

While we're at it, rename the partition from 'u-boot-img' to 'u-boot',
to stay consistent with the generic genimage template.

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
[Arnout: correct u-boot.img condition, rework commit log]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl b/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
index 9cdecc6ce0c6d28d086e4e85be166f0b79d68ec8..c29032572aef0cb28c9e3c878ba94bc208fac640 100644 (file)
--- a/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
+++ b/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
@@ -17,9 +17,9 @@ image sdcard.img {
     offset = 1024
   }
 
-  partition u-boot-img {
+  partition u-boot {
     in-partition-table = "no"
-    image = "u-boot.img"
+    image = "%UBOOTBIN%"
     offset = 69K
   }
 

diff --git a/board/freescale/common/imx/genimage.cfg.template_spl b/board/freescale/common/imx/genimage.cfg.template_spl
index 0b6e22864b3dc371660031fc95ecdc62d8307564..d2d810777b5c4adf648ab769073781ab82060be2 100644 (file)
--- a/board/freescale/common/imx/genimage.cfg.template_spl
+++ b/board/freescale/common/imx/genimage.cfg.template_spl
@@ -26,9 +26,9 @@ image sdcard.img {
     offset = 1024
   }
 
-  partition u-boot-img {
+  partition u-boot {
     in-partition-table = "no"
-    image = "u-boot.img"
+    image = "%UBOOTBIN%"
     offset = 69K
   }
 

diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh
index 12756c63d547a2f837d6510c81813102212763f8..ab51dc2098828361ee339bbc7a2d805720986c84 100755 (executable)
--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -66,6 +66,10 @@ uboot_image()
                echo "u-boot-dtb.imx"
        elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then
                echo "u-boot.imx"
+       elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then
+           echo "u-boot-dtb.img"
+       elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then
+           echo "u-boot.img"
        fi
 }