From: Stephen Warren Date: Wed, 29 Jan 2014 05:41:50 +0000 (-0700) Subject: ARM: rpi_b: set $fdtfile in default environment X-Git-Tag: v2014.04-rc1~77^2~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bccaa476f69351c44f382668474896fb360d054f;p=oweals%2Fu-boot.git 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 --- 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" \ \