| Message ID | 1390974110-4752-1-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
On 01/28/2014 10:41 PM, 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). Albert, does this look good?
On 02/04/2014 07:20 PM, Stephen Warren wrote: > On 01/28/2014 10:41 PM, 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). > > Albert, does this look good? Albert, is this patch OK? I also haven't heard anything back on: 4a97c0d ARM: bcm2835: fix mbox POWER_STATE_RESP_ON value 290cc12 ARM: rpi_b: rework boot scripts, enable sysboot d7c3c9c ARM: rpi_b: load /uEnv.txt from MMC at startup bae1449 ARM: rpi_b: convert to use distro defaults f62463f pxe: allow compilation when !defined(CONFIG_CMD_NET) 11e1b89 ARM: bcm2835: config.mk isn't needed b5cdf43 ARM: rpi_b: set $fdtfile in default environment
Hi Stephen, On Mon, 10 Feb 2014 22:46:53 -0700, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 02/04/2014 07:20 PM, Stephen Warren wrote: > > On 01/28/2014 10:41 PM, 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). > > > > Albert, does this look good? > > Albert, is this patch OK? I also haven't heard anything back on: > > 4a97c0d ARM: bcm2835: fix mbox POWER_STATE_RESP_ON value > 290cc12 ARM: rpi_b: rework boot scripts, enable sysboot > d7c3c9c ARM: rpi_b: load /uEnv.txt from MMC at startup > bae1449 ARM: rpi_b: convert to use distro defaults > f62463f pxe: allow compilation when !defined(CONFIG_CMD_NET) > 11e1b89 ARM: bcm2835: config.mk isn't needed > b5cdf43 ARM: rpi_b: set $fdtfile in default environment This patch is OK. I'm slowly crawling through my inbox right now and will let you know for the others as soon as I get to them. Amicalement,
Hi Stephen, On Tue, 28 Jan 2014 22:41:50 -0700, Stephen Warren <swarren@wwwdotorg.org> 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 <swarren@wwwdotorg.org> > --- > 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,
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" \ \
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 | 1 + 1 file changed, 1 insertion(+)