From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Thu, 13 Feb 2014 15:02:22 +0100 Subject: [U-Boot] [PATCH] ARM: rpi_b: set $fdtfile in default environment In-Reply-To: <1390974110-4752-1-git-send-email-swarren@wwwdotorg.org> References: <1390974110-4752-1-git-send-email-swarren@wwwdotorg.org> Message-ID: <20140213150222.3a8403ac@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Stephen, On Tue, 28 Jan 2014 22:41:50 -0700, Stephen Warren wrote: > 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 > --- > include/configs/rpi_b.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h > index 0b7add7..976ceaa 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" \ > \ Applied to u-boot-arm/master, thanks! Amicalement, -- Albert.