ARM: rpi_b: set $fdtfile in default environment
authorStephen Warren <swarren@wwwdotorg.org>
Wed, 29 Jan 2014 05:41:50 +0000 (22:41 -0700)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Feb 2014 14:00:53 +0000 (15:00 +0100)
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>
include/configs/rpi_b.h

index 0b7add7bea3d05764591b26d9d4ad5b89b951f59..976ceaa9c1d81931b2339dc11e5ea58c426ffbd9 100644 (file)
        "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" \
        \