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

nanopi-r6s: Use mainline U-Boot #6908

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

ColorfulRhino
Copy link
Collaborator

Description

The same configuration has been working fine for the similar NanoPi R6C for a while. Users have reported issues with the vendor U-Boot not able to boot.

Ref: https://forum.armbian.com/topic/42105-report-bug-in-nanopi-r6s/

How Has This Been Tested?

  • ./compile.sh BOARD=nanopi-r6s BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie uboot

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

The same configuration has been working fine for the similar NanoPi R6C for a while. Users have reported issues with the vendor U-Boot not able to boot.

Ref: https://forum.armbian.com/topic/42105-report-bug-in-nanopi-r6s/
@ColorfulRhino ColorfulRhino requested a review from efectn July 7, 2024 15:17
@github-actions github-actions bot added size/small PR with less then 50 lines Hardware Hardware related like kernel, U-Boot, ... labels Jul 7, 2024
@ARC-MX
Copy link
Contributor

ARC-MX commented Jul 8, 2024

I‘vd checked it, I found that the u-boot/arch/arm/mach-rockchip/make_fit_atf.sh file is now commented of line 13. If I uncomment this armbian compilation will fail, but compiling U-boot alone will work.

I still don't know how to define in the.csc file: BOOTDEV.

#define RKIMG_DET_BOOTDEV \
	"rkimg_bootdev=" \
	"if mmc dev 1 && rkimgtest mmc 1; then " \
		"setenv devtype mmc; setenv devnum 1; echo Boot from SDcard;" \
	"elif mmc dev 0; then " \
		"setenv devtype mmc; setenv devnum 0;" \
	"elif rksfc dev 1; then " \
		"setenv devtype spinor; setenv devnum 1;" \
	"fi; \0"

image

@efectn
Copy link
Member

efectn commented Jul 8, 2024

I‘vd checked it, I found that the u-boot/arch/arm/mach-rockchip/make_fit_atf.sh file is now commented of line 13. If I uncomment this armbian compilation will fail, but compiling U-boot alone will work.

I still don't know how to define in the.csc file: BOOTDEV.

#define RKIMG_DET_BOOTDEV \
	"rkimg_bootdev=" \
	"if mmc dev 1 && rkimgtest mmc 1; then " \
		"setenv devtype mmc; setenv devnum 1; echo Boot from SDcard;" \
	"elif mmc dev 0; then " \
		"setenv devtype mmc; setenv devnum 0;" \
	"elif rksfc dev 1; then " \
		"setenv devtype spinor; setenv devnum 1;" \
	"fi; \0"

image

It's used to disable BL32 blob that's mostly used for TEE clients

@igorpecovnik
Copy link
Member

Anyone tested this for booting?

@efectn
Copy link
Member

efectn commented Jul 8, 2024

Anyone tested this for booting?

I'm testing it tonight

@ARC-MX
Copy link
Contributor

ARC-MX commented Jul 8, 2024 via email

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 08 Milestone: Third quarter release labels Jul 8, 2024
@igorpecovnik igorpecovnik merged commit c84703d into armbian:main Jul 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
08 Milestone: Third quarter release Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

5 participants