Skip to content

Commit

Permalink
firmware: Avoid defaulting to 64-bit kernel on older Pi
Browse files Browse the repository at this point in the history
  • Loading branch information
popcornmix committed Sep 3, 2019
1 parent bb2357c commit c99e3ce
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 0 deletions.
Binary file modified boot/start.elf
Binary file not shown.
Binary file modified boot/start4.elf
Binary file not shown.
Binary file modified boot/start4cd.elf
Binary file not shown.
Binary file modified boot/start4db.elf
Binary file not shown.
Binary file modified boot/start4x.elf
Binary file not shown.
Binary file modified boot/start_cd.elf
Binary file not shown.
Binary file modified boot/start_db.elf
Binary file not shown.
Binary file modified boot/start_x.elf
Binary file not shown.

4 comments on commit c99e3ce

@cbxbiker61
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does "older pi" mean? pi3? will the pi4 default to the 64bit kernel?

@pelwell
Copy link
Contributor

@pelwell pelwell commented on c99e3ce Sep 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently no Pi should default to loading a 64-bit kernel. Provided tests don't show any major issues, Pi 4 is likely to default to 64-bit first, eventually allowing us to stop shipping the interim kernel7l.img. If people find that Pi 3 performs better on 64-bit then that default could also change, but that is further into the future.

@cbxbiker61
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, I have pi3's with 64 bit kernels that don't boot now. They have an installed kernel8.img file with no kernel7.img.

I'm assuming this change was meant to change the behaviour...
from: look for kernel8.img then kernel7.img
to: look for kernel7.img then kernel8.img

The non-4 start files are missing kernel8.img. What the heck is kernel8.xxx doing in the start files?

for f in start*; do echo "--- $f ---" && strings $f | grep kernel8; done

--- start4cd.elf ---
kernel8.img
kernel8-32.img
--- start4db.elf ---
kernel8.img
kernel8-32.img
--- start4.elf ---
kernel8.img
kernel8-32.img
--- start4x.elf ---
kernel8.img
kernel8-32.img
--- start_cd.elf ---
kernel8.xxx
kernel8-32.img
--- start_db.elf ---
kernel8.xxx
kernel8-32.img
--- start.elf ---
kernel8.xxx
kernel8-32.img
--- start_x.elf ---
kernel8.xxx
kernel8-32.img

@pelwell
Copy link
Contributor

@pelwell pelwell commented on c99e3ce Sep 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regression was due to a temporary hack - sorry about that. The current firmware (e2e17cd) includes the same logic on Pi3 and older as is now used on Pi4, and should behave as expected.

Please sign in to comment.