summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-02 12:53:31 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-14 16:36:13 +0900
commit3cb9abc9c512ca733d2de4cca20c5d7feca829c7 (patch)
treed6b6414a35493b777746b8beb8e3acc4d0d04d72 /include
parent84a7562e49b7168bef3a0b55c4605dea63413c0f (diff)
downloadblackbird-obmc-uboot-3cb9abc9c512ca733d2de4cca20c5d7feca829c7.tar.gz
blackbird-obmc-uboot-3cb9abc9c512ca733d2de4cca20c5d7feca829c7.zip
ARM: uniphier: update U-Boot file names in workflow
Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree") and commit 03c25bcd263a ("fdt: Build an SPL binary without device tree"), we can use shorter file names for the output images. The default configuration for UniPhier SoCs enables CONFIG_OF_SEPARATE and CONFIG_SPL_OF_CONTROL. In this case, spl/u-boot-spl.bin is the same as spl/u-boot-spl-dtb.bin. Likewise, u-boot.img is the same as as u-boot-dtb.img. So, this change of the flow has no impact. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/uniphier.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index b340f63cde..6f91ee61ae 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -230,9 +230,9 @@
"nor_base=0x42000000\0" \
"bootm_low=0x80000000\0" \
"nandupdate=nand erase 0 0x00100000 &&" \
- "tftpboot u-boot-spl-dtb.bin &&" \
+ "tftpboot u-boot-spl.bin &&" \
"nand write $loadaddr 0 0x00010000 &&" \
- "tftpboot u-boot-dtb.img &&" \
+ "tftpboot u-boot.img &&" \
"nand write $loadaddr 0x00010000 0x000f0000\0" \
LINUXBOOT_ENV_SETTINGS
OpenPOWER on IntegriCloud