Skip to contentSkip to conversation

rpi-firmware: keep fixup.dat and start.elf name

PATCH New Frank Hunleth 2 participants 4 messages Feb 14, 2015 – Feb 15, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rpi-firmware: keep fixup.dat and start.elf name

When enabling the RPi camera (start_x=1 in the config.txt), the start_x.elf file needs to remain called start_x.elf. Installing it as start.elf creates an image that won't boot. This change installs the files without changing their names.

---
 package/rpi-firmware/rpi-firmware.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/rpi-firmware/rpi-firmware.mk +2 -2
index 03178d5..e526063 100644
@@ -28,8 +28,8 @@ endif
 
 define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
-	$(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf
-	$(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+	$(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf
+	$(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat
 	$(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
 	$(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
 	$(RPI_FIRMWARE_INSTALL_DTB)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 rpi-firmware: keep fixup.dat and start.elf name

Frank, All,

On 2015-02-14 17:49 -0500, Frank Hunleth spake thusly:

Quoted 6 lines

When enabling the RPi camera (start_x=1 in the config.txt), the start_x.elf file needs to remain called start_x.elf. Installing it as start.elf creates an image that won't boot. This change installs the files without changing their names.

NAK.

I just tried booting my RPi (model B, the original) with just start_x.elf and fixup_x.dat (instead of start.elf and fixup.dat), and it does not boot.

So, clearly, that's not the proper fix.

Regards,
Yann E. MORIN.

Quoted 26 lines
---
 package/rpi-firmware/rpi-firmware.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/rpi-firmware/rpi-firmware.mk +2 -2
index 03178d5..e526063 100644
@@ -28,8 +28,8 @@ endif
 
 define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
-	$(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf
-	$(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+	$(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf
+	$(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat
 	$(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
 	$(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
 	$(RPI_FIRMWARE_INSTALL_DTB)
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 rpi-firmware: keep fixup.dat and start.elf name

Yann,

Quoted 8 lines · Yann E. MORIN

Frank, All,

On 2015-02-14 17:49 -0500, Frank Hunleth spake thusly:

Quoted 5 lines

When enabling the RPi camera (start_x=1 in the config.txt), the start_x.elf file needs to remain called start_x.elf. Installing it as start.elf creates an image that won't boot. This change installs the files without changing their names.

Quoted 7 lines
Quoted 1 line

NAK.

I just tried booting my RPi (model B, the original) with just start_x.elf and fixup_x.dat (instead of start.elf and fixup.dat), and it does not boot.

Did you put "start_x=1" in your config.txt?

Quoted 1 line

So, clearly, that's not the proper fix.

Here's what I'm seeing:

no start_x=1, start_x.elf renamed as start.elf -> boots, but no camera no start_x=1, start_x.elf -> doesn't boot (your setup, I think) start_x=1, start.elf -> doesn't boot
start_x=1, start_x.elf -> boots and camera works

I'm certainly open to other solutions. Well, I guess that I'd prefer to not rename start.elf back to start_x.elf in a post build step, but if there's another option, I'd take it. The Raspberry Pi docs that I've found so far on this seem pretty light.

Thanks,
Frank

Quoted 38 lines

Regards,
Yann E. MORIN.

Quoted 22 lines
---
 package/rpi-firmware/rpi-firmware.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/rpi-firmware/rpi-firmware.mk +2 -3
index 03178d5..e526063 100644
@@ -28,8 +28,8 @@ endif
 
 define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
      $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
-     $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf
-     $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+     $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf
+     $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat
      $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
      $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
      $(RPI_FIRMWARE_INSTALL_DTB)
--

1.9.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Signature · 4 lines
Frank Hunleth
Troodon Software LLC
Embedded Software Development
http://troodon-software.com/
#3 lore raw

PATCH 1/1 rpi-firmware: keep fixup.dat and start.elf name

Yann,

Quoted 19 lines · Frank Hunleth

Yann,

Quoted 8 lines · Yann E. MORIN

Frank, All,

On 2015-02-14 17:49 -0500, Frank Hunleth spake thusly:

Quoted 5 lines

When enabling the RPi camera (start_x=1 in the config.txt), the start_x.elf file needs to remain called start_x.elf. Installing it as start.elf creates an image that won't boot. This change installs the files without changing their names.

Quoted 7 lines
Quoted 1 line

NAK.

I just tried booting my RPi (model B, the original) with just start_x.elf and fixup_x.dat (instead of start.elf and fixup.dat), and it does not boot.

Quoted 7 lines

Did you put "start_x=1" in your config.txt?

Quoted 1 line

So, clearly, that's not the proper fix.

Here's what I'm seeing:

no start_x=1, start_x.elf renamed as start.elf -> boots, but no camera

I just retested this configuration, and the camera is working now. Sigh. That means that I don't need the patch that I just submitted. I have no clue how I was able to reproduce the issue a few times, but now I can't. Anyway, thanks for checking it out so quickly and sorry for the noise.

Frank

Quoted 50 lines

no start_x=1, start_x.elf -> doesn't boot (your setup, I think) start_x=1, start.elf -> doesn't boot
start_x=1, start_x.elf -> boots and camera works

I'm certainly open to other solutions. Well, I guess that I'd prefer to not rename start.elf back to start_x.elf in a post build step, but if there's another option, I'd take it. The Raspberry Pi docs that I've found so far on this seem pretty light.

Thanks,
Frank

Quoted 38 lines

Regards,
Yann E. MORIN.

Quoted 22 lines
---
 package/rpi-firmware/rpi-firmware.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/rpi-firmware/rpi-firmware.mk +2 -3
index 03178d5..e526063 100644
@@ -28,8 +28,8 @@ endif
 
 define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
      $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
-     $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf
-     $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+     $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf
+     $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat
      $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
      $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
      $(RPI_FIRMWARE_INSTALL_DTB)
--

1.9.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'