summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2014-01-28 22:41:50 -0700
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-13 15:00:53 +0100
commitbccaa476f69351c44f382668474896fb360d054f (patch)
tree65fb0b3063b05027fedc42c95473d21daee1ed07
parentd53ccdb341cf16e32c0ca2d6099b194d9572fe0c (diff)
downloadblackbird-obmc-uboot-bccaa476f69351c44f382668474896fb360d054f.tar.gz
blackbird-obmc-uboot-bccaa476f69351c44f382668474896fb360d054f.zip
ARM: rpi_b: set $fdtfile in default environment
U-Boot names the Raspberry Pi board rpi_b. This means that the common expression for DTB filename ${soc}-${board}.dtb expands to bcm2835-rpi_b.dtb. However, the DTB generated by the Linux kernel is bcm2835-rpi-b.dtb. Set $fdtfile in U-Boot's environment so that scripts look for the correct DTB filename. An alternative would be to rename the U-Boot board to rpi-b. However, that change would be far more invasive, and end up affecting users (i.e they'd have to change their U-Boot build commands). Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
-rw-r--r--include/configs/rpi_b.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h
index 0b7add7bea..976ceaa9c1 100644
--- a/include/configs/rpi_b.h
+++ b/include/configs/rpi_b.h
@@ -123,6 +123,7 @@
"scriptaddr=0x00000000\0" \
"kernel_addr_r=0x01000000\0" \
"fdt_addr_r=0x02000000\0" \
+ "fdtfile=bcm2835-rpi-b.dtb\0" \
"ramdisk_addr_r=0x02100000\0" \
"boot_targets=mmc0\0" \
\
OpenPOWER on IntegriCloud