Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back RPi3 (and 4) support #10

Merged
merged 2 commits into from
Feb 22, 2024
Merged

Conversation

Herrie82
Copy link
Collaborator

Similar to #9

Boots to UI, wifi works, BT works, WAM works. Has some performance issues, but good enough state to merge and build upon.

@Herrie82 Herrie82 mentioned this pull request Feb 21, 2024
@Herrie82 Herrie82 force-pushed the herrie/rpi3-bringup branch from 80fb3d8 to 8dbeb8f Compare February 22, 2024 04:04
Copy link
Contributor

@shr-project shr-project left a comment

Choose a reason for hiding this comment

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

Maybe drop commits 3 and 4 now when not using rpi-sdimg?

@Herrie82
Copy link
Collaborator Author

Maybe drop commits 3 and 4 now when not using rpi-sdimg?

Can do that, but if someone wants to use it in the future (for whatever reason), good to have for reference

@shr-project
Copy link
Contributor

shr-project commented Feb 22, 2024

Can do that, but if someone wants to use it in the future (for whatever reason), good to have for reference

and does this reference work now? I'll fix the .rootfs in meta-raspberrypi one and then this duplication won't be needed, right?

@Herrie82
Copy link
Collaborator Author

Can do that, but if someone wants to use it in the future (for whatever reason), good to have for reference

and does this reference work now? I'll fix the .rootfs in meta-raspberrypi one and then this duplication won't be needed, right?

Yes it does

@shr-project
Copy link
Contributor

agherzan/meta-raspberrypi#1289 should work as well without the duplication.

And shr-project/meta-webosose@32dccc2 refreshes it from meta-raspberrypi (so that the only difference is virtual/kernel:do_webos_deploy_fixup which you're not using anyway.

So I think it should be dropped from meta-rpi-luneos.

@@ -0,0 +1,214 @@
# Imported from meta-raspberrypi
# kernel dependency changed to do_webos_deploy_fixup task
Copy link
Contributor

Choose a reason for hiding this comment

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

This isn't true right? the only difference is:
agherzan/meta-raspberrypi#1289
and do_webos_deploy_fixup task was removed by "FU" commit now squashed to the next commit.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Cleaned that up now, indeed I removed that one to not rely on all the stuff OSE is doing there

@Herrie82 Herrie82 force-pushed the herrie/rpi3-bringup branch from 97d02a6 to dec65df Compare February 22, 2024 09:23
@Herrie82
Copy link
Collaborator Author

Herrie82 commented Feb 22, 2024

agherzan/meta-raspberrypi#1289 should work as well without the duplication.

And shr-project/meta-webosose@32dccc2 refreshes it from meta-raspberrypi (so that the only difference is virtual/kernel:do_webos_deploy_fixup which you're not using anyway.

So I think it should be dropped from meta-rpi-luneos.

Can drop it once Andrei merges.

[edit]
Andrei isn't the quickest at times... Still have a Kirkstone one pending for weeks already.
[/edit]

@shr-project
Copy link
Contributor

agherzan/meta-raspberrypi#1289 should work as well without the duplication.
And shr-project/meta-webosose@32dccc2 refreshes it from meta-raspberrypi (so that the only difference is virtual/kernel:do_webos_deploy_fixup which you're not using anyway.
So I think it should be dropped from meta-rpi-luneos.

Can drop it once Andrei merges.

[edit] Andrei isn't the quickest at times... Still have a Kirkstone one pending for weeks already. [/edit]

It's already merged in meta-raspberrypi and included in webos-ports-setup:
webOS-ports/webos-ports-setup@3b124c6

@Herrie82
Copy link
Collaborator Author

agherzan/meta-raspberrypi#1289 should work as well without the duplication.
And shr-project/meta-webosose@32dccc2 refreshes it from meta-raspberrypi (so that the only difference is virtual/kernel:do_webos_deploy_fixup which you're not using anyway.
So I think it should be dropped from meta-rpi-luneos.

Can drop it once Andrei merges.
[edit] Andrei isn't the quickest at times... Still have a Kirkstone one pending for weeks already. [/edit]

It's already merged in meta-raspberrypi and included in webos-ports-setup: webOS-ports/webos-ports-setup@3b124c6

Dropped, happy to squash some commits if needed.

@shr-project
Copy link
Contributor

shr-project commented Feb 22, 2024

Do we need bigger /boot from webos .wks?

-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 20
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 80M

@Herrie82
Copy link
Collaborator Author

Do we need bigger /boot from webos .wks?

-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 20
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 80M

Seems boot is using 45MB according df -h from @ericblade, so yes :)

@shr-project
Copy link
Contributor

Do we need bigger /boot from webos .wks?

-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 20
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 80M

Seems boot is using 45MB according df -h from @ericblade, so yes :)

ok, looks like the kernel got much bigger again

0       rpi-bootfiles-20220830.stamp
2.0K    boot.scr
2.0K    cmdline.txt
4.0K    fixup4cd.dat
4.0K    fixup_cd.dat
4.0K    uEnv.txt
6.0K    fixup4.dat
8.0K    fixup.dat
10K     fixup4db.dat
10K     fixup4x.dat
10K     fixup_db.dat
10K     fixup_x.dat
16K     uboot.env
36K     config.txt
52K     bcm2711-rpi-4-b.dtb
52K     bcm2711-rpi-400.dtb
52K     bcm2711-rpi-cm4.dtb
52K     bootcode.bin
126K    overlays
558K    kernel8.img
786K    start4cd.elf
786K    start_cd.elf
2.2M    start4.elf
2.9M    start.elf
2.9M    start4x.elf
3.6M    start4db.elf
3.6M    start_x.elf
4.6M    start_db.elf
23M     Image

Strange that nobody else sees similar issue with the default wks.

@shr-project shr-project merged commit 71dfb95 into scarthgap Feb 22, 2024
@ericblade
Copy link

558k for a kernel? my kernel is 22mb. Whole directory is 43mb out of 70.

total 44134
drwxrwxrwx  1 root root      512 Jan  1  1980  .
drwxr-xr-x 10 root root     4096 Feb 22 22:29  ..
-rwxrwxrwx  1 root root    33555 Apr  6  2011  bcm2710-rpi-3-b.dtb
-rwxrwxrwx  1 root root    34182 Apr  6  2011  bcm2710-rpi-3-b-plus.dtb
-rwxrwxrwx  1 root root    31254 Apr  6  2011  bcm2710-rpi-cm3.dtb
-rwxrwxrwx  1 root root    20720 Apr  6  2011  bcm2837-rpi-3-b.dtb
-rwxrwxrwx  1 root root    52476 Apr  6  2011  bootcode.bin
-rwxrwxrwx  1 root root       67 Apr  6  2011  cmdline.txt
-rwxrwxrwx  1 root root     2607 Apr  6  2011  config.txt
-rwxrwxrwx  1 root root     3171 Apr  6  2011  fixup4cd.dat
-rwxrwxrwx  1 root root     5399 Apr  6  2011  fixup4.dat
-rwxrwxrwx  1 root root     8385 Apr  6  2011  fixup4db.dat
-rwxrwxrwx  1 root root     8387 Apr  6  2011  fixup4x.dat
-rwxrwxrwx  1 root root     3171 Apr  6  2011  fixup_cd.dat
-rwxrwxrwx  1 root root     7262 Apr  6  2011  fixup.dat
-rwxrwxrwx  1 root root    10230 Apr  6  2011  fixup_db.dat
-rwxrwxrwx  1 root root    10232 Apr  6  2011  fixup_x.dat
-rwxrwxrwx  1 root root 22804992 Apr  6  2011  kernel8.img
drwxrwxrwx  1 root root      512 Apr  6  2011  overlays
-rwxrwxrwx  1 root root        0 Apr  6  2011  rpi-bootfiles-20230509~buster.stamp
-rwxrwxrwx  1 root root   805724 Apr  6  2011  start4cd.elf
-rwxrwxrwx  1 root root  3747688 Apr  6  2011  start4db.elf
-rwxrwxrwx  1 root root  2251392 Apr  6  2011  start4.elf
-rwxrwxrwx  1 root root  2998888 Apr  6  2011  start4x.elf
-rwxrwxrwx  1 root root   805724 Apr  6  2011  start_cd.elf
-rwxrwxrwx  1 root root  4819624 Apr  6  2011  start_db.elf
-rwxrwxrwx  1 root root  2975616 Apr  6  2011  start.elf
-rwxrwxrwx  1 root root  3722504 Apr  6  2011  start_x.elf
drwxrwxrwx  1 root root      512 Feb 22 22:22 'System Volume Information'

@shr-project
Copy link
Contributor

agherzan/meta-raspberrypi#1290 was merged, you can drop LGEs WKS file.

@Herrie82
Copy link
Collaborator Author

agherzan/meta-raspberrypi#1290 was merged, you can drop LGEs WKS file.

Sorry need more coffee... wanted to PR this, but merged instead a1738d8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants