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.

Sign up for GitHub

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

Jump to bottom

nanopct6(-lts): edge: bump u-boot to 2025.01-rc6; enable UMS and fix non-LTS dtsi #7662

Merged
merged 3 commits into from
Jan 7, 2025
Merged

nanopct6(-lts): edge: bump u-boot to 2025.01-rc6; enable UMS and fix non-LTS dtsi #7662

merged 3 commits into from
Jan 7, 2025
+44 −13

Conversation

rpardini
Copy link
Member

@rpardini rpardini commented Jan 6, 2025 •
edited
Loading

nanopct6(-lts): edge: bump u-boot to 2025.01-rc6; enable UMS and fix non-LTS dtsi

  • nanopct6(-lts): edge: bump u-boot to 2025.01-rc6; enable UMS and fix non-LTS dtsi
  • nanopct6(-lts): edge: u-boot: note that Kwiboo already sent a fix upstream ref the LTS dtsi
  • nanopct6(-lts): edge: u-boot: pull upstream/dts v6.13-rc5-dts for USB3 Type-A

@github-actions github-actions bot added size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Jan 6, 2025
@rpardini rpardini force-pushed the pr/nanopct6-lts-edge-bump-u-boot-to-202501-rc6-enable-UMS-and-fix-non-LTS-dtsi branch from e316247 to 4a0b66a Compare January 6, 2025 17:40
@rpardini
Copy link
Member Author

rpardini commented Jan 6, 2025

Full UART bootlog on the LTS board

DDR 9fffbe1e78 cym 24/02/04-10:09:20,fwver: v1.16
LPDDR4X, 2112MHz
channel[0] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=8 Size=4096MB
channel[1] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=8 Size=4096MB
channel[2] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=8 Size=4096MB
channel[3] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=8 Size=4096MB
Manufacturer ID:0x1
CH0 RX Vref:28.9%, TX Vref:22.8%,21.8%
CH1 RX Vref:28.9%, TX Vref:24.8%,21.8%
CH2 RX Vref:29.3%, TX Vref:23.8%,22.8%
CH3 RX Vref:30.5%, TX Vref:20.8%,18.8%
change to F1: 528MHz
change to F2: 1068MHz
change to F3: 1560MHz
change to F0: 2112MHz
out

U-Boot SPL 2025.01-rc6-armbian-2025.01-rc6-S4be4-P0000-H3d87-Vfb1a-B1e5e-R448a-dirty (Jan 06 2025 - 17:37:22 +0000)
Trying to boot from MMC1
## Checking hash(es) for config config-2 ... OK
## Checking hash(es) for Image atf-1 ... sha256+ OK
## Checking hash(es) for Image u-boot ... sha256+ OK
## Checking hash(es) for Image fdt-2 ... sha256+ OK
## Checking hash(es) for Image atf-2 ... sha256+ OK
## Checking hash(es) for Image atf-3 ... sha256+ OK
INFO:    Preloader serial: 2
NOTICE:  BL31: v2.3():v2.3-682-g4ca8a8422:derrick.huang, fwver: v1.45
NOTICE:  BL31: Built : 10:11:21, Dec 27 2023
INFO:    spec: 0x1
INFO:    code: 0x88
INFO:    ext 32k is not valid
INFO:    ddr: stride-en 4CH
INFO:    GICv3 without legacy support detected.
INFO:    ARM GICv3 driver initialized in EL3
INFO:    valid_cpu_msk=0xff bcore0_rst = 0x0, bcore1_rst = 0x0
INFO:    l3 cache partition cfg-0
INFO:    system boots from cpu-hwid-0
INFO:    disable memory repair
INFO:    idle_st=0x21fff, pd_st=0x11fff9, repair_st=0xfff70001
INFO:    dfs DDR fsp_params[0].freq_mhz= 2112MHz
INFO:    dfs DDR fsp_params[1].freq_mhz= 528MHz
INFO:    dfs DDR fsp_params[2].freq_mhz= 1068MHz
INFO:    dfs DDR fsp_params[3].freq_mhz= 1560MHz
INFO:    BL31: Initialising Exception Handling Framework
INFO:    BL31: Initializing runtime services
WARNING: No OPTEE provided by BL2 boot loader, Booting device without OPTEE initialization. SMC`s destined for OPTEE will return SMC_UNK
ERROR:   Error initializing runtime service opteed_fast
INFO:    BL31: Preparing for EL3 exit to normal world
INFO:    Entry point address = 0xa00000
INFO:    SPSR = 0x3c9


U-Boot 2025.01-rc6-armbian-2025.01-rc6-S4be4-P0000-H3d87-Vfb1a-B1e5e-R448a-dirty (Jan 06 2025 - 17:37:22 +0000)

Model: FriendlyElec NanoPC-T6 LTS
DRAM:  16 GiB
rockchip_rk805 pmic@0: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19
rockchip_rk805 pmic@0: pinctrl_selec pmic@0: pinctrl_select_state_full: uclass_get_device_by_phandlePMIC:  RK806 (on=0x40, off=0x00)
Core:  381 devices, 34 uclasses, devicetree: separate
MMC:   mmc@fe2c0000: 1, mmc@fe2e0000: 0
Loading Environment from SPIFlash... SF: Detected w25q256fw with page size 256 Bytes, erase size 4 KiB, total 32 MiB
*** Warning - bad CRC, using default environment

In:    serial@feb50000
Out:   serial@feb50000
Err:   serial@feb50000
Model: FriendlyElec NanoPC-T6 LTS
rockchip_dnl_key_pressed: no saradc device found
Net:   No ethernet found.
Hit any key to stop autoboot:  0
Scanning for bootflows in all bootdevs
Seq  Method       State   Uclass    Part  Name                      Filename
-----------
Scanning global bootmeth 'efi_mgr':
Card did not respond to voltage select! : -110
Cannot persist EFI variables without system partition
  0  efi_mgr      ready   (none)       0  <NULL>
** Booting bootflow '<NULL>' with efi_mgr
Loading Boot0000 'mmc 0' failed
EFI boot manager: Cannot load any image
Boot failed (err=-14)
Scanning bootdev 'mmc@fe2c0000.bootdev':
Card did not respond to voltage select! : -110
Scanning bootdev 'mmc@fe2e0000.bootdev':
  1  script       ready   mmc          1  mmc@fe2e0000.bootdev.part /boot/boot.scr
** Booting bootflow 'mmc@fe2e0000.bootdev.part_1' with script
Boot script loaded from mmc 0:1
166 bytes read in 11 ms (14.6 KiB/s)
30611879 bytes read in 201 ms (145.2 MiB/s)
36798976 bytes read in 235 ms (149.3 MiB/s)
177682 bytes read in 39 ms (4.3 MiB/s)
Working FDT set to 12000000
Trying kaslrseed command... Info: Unknown command can be safely ignored since kaslrseed does not apply to all boards.
Unknown cge at 12180000 ...
   Image Name:   uInitrd
   Image Type:   AArch64 Linux RAMDisk Image (gzip compressed)
   Data Size:    30611815 Bytes = 29.2 MiB
   Load Address: 00000000
   Entry Point:  00000000
   Verifying Checksum ... OK
## Flattened Device Tree blob at 12000000
   Booting using the fdt blob at 0x12000000
Working FDT set to 12000000
   Loading Ramdisk to eae82000, end ecbb3967 ... OK
   Loading Device Tree to 00000000eadee000, end 00000000eae81fff ... OK
Working FDT set to eadee000

Starting kernel ...

[    0.000000] Booting Linux on physical CPU 0x0000000000 [0x412fd050]
[    0.000000] Linux version 6.13.0-rc5-edge-rockchip64 (build@armbian) (aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #8 SMP PREEMPT Sun Dec 29 21:15:45 UTC 2024
[    0.000000] KASLR enabled
[    0.000000] Machine model: FriendlyElec NanoPC-T6 LTS

@rpardini rpardini force-pushed the pr/nanopct6-lts-edge-bump-u-boot-to-202501-rc6-enable-UMS-and-fix-non-LTS-dtsi branch from 4a0b66a to 37fe415 Compare January 6, 2025 19:08
@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines and removed size/small PR with less then 50 lines labels Jan 6, 2025
@rpardini
Copy link
Member Author

rpardini commented Jan 6, 2025

everything I throw at it just works. LTS board.

=> pci enum
pcie_dw_rockchip pcie@fe180000: PCIe-0 Link Fail
=> nvme scan
=> nvme info
Device 0: Vendor: 0x15b7 Rev: 281010WD Prod: 23285G400246
            Type: Hard Disk
            Capacity: 953869.7 = 931.5 GB (1953525168 x 512)

=> sf probe
SF: Detected w25q256fw with page size 256 Bytes, erase size 4 KiB, total 32 MiB
=> saveenv
Saving Environment to SPIFlash... Erasing SPI flash...Writing to SPI flash...done
OK
<...reset...>
Loading Environment from SPIFlash... SF: Detected w25q256fw with page size 256 Bytes, erase size 4 KiB, total 32 MiB
OK

=> pci enum
pcie_dw_rockchip pcie@fe180000: PCIe-0 Link Fail
=> net list
eth0 : eth_rtl8169 8e:b4:90:97:32:30 active
eth1 : eth_rtl8169 8e:b4:90:97:32:31

=> led list
system-led      <inactive>
user-led        off

=> usb start
starting USB...
Bus usb@fc000000: Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.10
Bus usb@fc800000: USB EHCI 1.00
Bus usb@fc840000: USB OHCI 1.0
Bus usb@fc880000: USB EHCI 1.00
Bus usb@fc8c0000: USB OHCI 1.0
Bus usb@fc400000: Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.10
scanning bus usb@fc000000 for devices... 1 USB Device(s) found
scanning bus usb@fc800000 for devices... 2 USB Device(s) found
scanning bus usb@fc840000 for devices... 1 USB Device(s) found
scanning bus usb@fc880000 for devices... 3 USB Device(s) found
scanning bus usb@fc8c0000 for devices... 1 USB Device(s) found
scanning bus usb@fc400000 for devices... cannot reset port 1!?
2 USB Device(s) found
       scanning usb for storage devices... 1 Storage Device(s) found
=> usb tree
USB device tree:
  1  Hub (5 Gb/s, 0mA)
     U-Boot XHCI Host Controller

  1  Hub (480 Mb/s, 0mA)
  |  u-boot EHCI Host Controller
  |
  +-2   (480 Mb/s, 500mA)
       MACROSILICON USB3. 0 capture

  1  Hub (12 Mb/s, 0mA)
      U-Boot Root Hub

  1  Hub (480 Mb/s, 0mA)
  |  u-boot EHCI Host Controller
  |
  +-2  Hub (480 Mb/s, 2mA)
    |
    +-3  Vendor specific (12 Mb/s, 260mA)
         �Microsoft Xbox 360 Wireless Receiver for  FFF57170

  1  Hub (12 Mb/s, 0mA)
      U-Boot Root Hub

  1  Hub (5 Gb/s, 0mA)
  |  U-Boot XHCI Host Controller
  |
  +-2  Mass Storage (5 Gb/s, 0mA)
       SanDisk USB Extreme Pro 133116796170

=> printenv
arch=arm
baudrate=1500000
board=nanopc-t6-rk3588
board_name=nanopc-t6-rk3588
boot_targets=mmc1 mmc0 nvme scsi usb pxe dhcp spi
bootcmd=bootflow scan -lb
bootdelay=1
cpu=armv8
cpuid#=4132504b3700000000000000000f0c12
eth1addr=8e:b4:90:97:32:31
ethaddr=8e:b4:90:97:32:30
fdt_addr_r=0x12000000
fdtcontroladdr=edbe27f0
fdtfile=rockchip/rk3588-nanopc-t6-lts.dtb
fdtoverlay_addr_r=0x12100000
kernel_addr_r=0x02000000
kernel_comp_addr_r=0x0a000000
kernel_comp_size=0x8000000
loadaddr=0xc00800
partitions=uuid_disk=${uuid_gpt_disk};name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};name=loader2,start=8MB,size=4MB,uuid=${uuid_gpt_loader2};name=trust,size=4M,uuid=${uuid_gpt_atf};name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};name=rootfs,size=-,uuid=B921B045-1DF0-41C3-AF44-4C6F280D3FAE;
preboot=led user-led on; sleep 0.1; led user-led off
pxefile_addr_r=0x00e00000
ramdisk_addr_r=0x12180000
script_offset_f=0xffe000
script_size_f=0x2000
scriptaddr=0x00c00000
serial#=c7a1dc83f5c51804
soc=rk3588
stderr=serial@feb50000
stdin=serial@feb50000
stdout=serial@feb50000
vendor=friendlyelec

@rpardini rpardini marked this pull request as ready for review January 6, 2025 19:40
@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 02 Milestone: First quarter release labels Jan 7, 2025
@igorpecovnik igorpecovnik merged commit e97ed01 into armbian:main Jan 7, 2025
@rpardini
Copy link
Member Author

rpardini commented Jan 7, 2025

Oops, I broke this with the devicetree-rebasing pull and commit. Will send a fix soon with bump to 2025.01 final too

@rpardini
Copy link
Member Author

rpardini commented Jan 7, 2025

Fix in #7670

@SuperKali SuperKali mentioned this pull request Jan 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igorpecovnik igorpecovnik igorpecovnik approved these changes

@SuperKali SuperKali Awaiting requested review from SuperKali SuperKali is a code owner

@Tonymac32 Tonymac32 Awaiting requested review from Tonymac32 Tonymac32 is a code owner

Assignees
No one assigned
Labels
02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rpardini @igorpecovnik