Skip to content

Commit 8687e9d

Browse files
HeyMecoigorpecovnik
authored andcommitted
Radxa-Nio-12L: Switch Uboot flow from EFI to extlinux
1 parent 4e027a4 commit 8687e9d

4 files changed

Lines changed: 105 additions & 4 deletions

File tree

config/boards/radxa-nio-12l.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ BOARD_MAINTAINER="HeyMeco"
55
KERNEL_TARGET="collabora"
66
KERNEL_TEST_TARGET="collabora"
77
BOOT_FDT_FILE="mediatek/mt8395-radxa-nio-12l.dtb"
8-
enable_extension "grub-with-dtb"
8+
SERIALCON="ttyS0:921600"
99
HAS_VIDEO_OUTPUT="yes"
1010

1111
# Post-config function for vendor branch

config/bootenv/genio.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
verbosity=1
2+
bootlogo=false
3+
console=both
4+
5+

config/bootscripts/boot-genio.cmd

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# DO NOT EDIT THIS FILE
2+
#
3+
# Please edit /boot/armbianEnv.txt to set supported parameters
4+
#
5+
6+
setenv overlay_error "false"
7+
# default values
8+
setenv rootdev "LABEL=armbi_root"
9+
setenv verbosity "1"
10+
setenv console "both"
11+
setenv bootlogo "false"
12+
setenv rootfstype "ext4"
13+
setenv docker_optimizations "on"
14+
setenv earlycon "off"
15+
16+
17+
test -n "${distro_bootpart}" || distro_bootpart=1
18+
19+
echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
20+
21+
if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
22+
load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
23+
env import -t ${load_addr} ${filesize}
24+
fi
25+
26+
if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
27+
28+
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
29+
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,921600 ${consoleargs}"; fi
30+
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
31+
if test "${bootlogo}" = "true"; then
32+
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
33+
else
34+
setenv consoleargs "splash=verbose ${consoleargs}"
35+
fi
36+
37+
# get PARTUUID of first partition on SD/eMMC/UFS the boot script was loaded from
38+
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi
39+
if test "${devtype}" = "scsi"; then part uuid scsi ${devnum}:${distro_bootpart} partuuid; fi
40+
41+
# Use PARTUUID if available (more reliable), otherwise fall back to rootdev label
42+
if test -n "${partuuid}"; then
43+
setenv rootdev "PARTUUID=${partuuid}"
44+
fi
45+
46+
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
47+
48+
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
49+
50+
load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
51+
load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image
52+
53+
load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
54+
fdt addr ${fdt_addr_r}
55+
fdt resize 65536
56+
for overlay_file in ${overlays}; do
57+
if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/mediatek/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
58+
echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
59+
fdt apply ${load_addr} || setenv overlay_error "true"
60+
elif load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/mediatek/overlay/${overlay_file}.dtbo; then
61+
echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
62+
fdt apply ${load_addr} || setenv overlay_error "true"
63+
fi
64+
done
65+
for overlay_file in ${user_overlays}; do
66+
if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
67+
echo "Applying user provided DT overlay ${overlay_file}.dtbo"
68+
fdt apply ${load_addr} || setenv overlay_error "true"
69+
fi
70+
done
71+
if test "${overlay_error}" = "true"; then
72+
echo "Error applying DT overlays, restoring original DT"
73+
load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
74+
else
75+
if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/mediatek/overlay/${overlay_prefix}-fixup.scr; then
76+
load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/mediatek/overlay/${overlay_prefix}-fixup.scr
77+
echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
78+
source ${load_addr}
79+
fi
80+
if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
81+
load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
82+
echo "Applying user provided fixup script (fixup.scr)"
83+
source ${load_addr}
84+
fi
85+
fi
86+
87+
echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
88+
kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
89+
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
90+
91+
# Recompile with:
92+
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

config/sources/families/genio.conf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ declare -g ARCH=arm64
44
declare -g GOVERNOR=performance
55
declare -g INSTALL_ARMBIAN_FIRMWARE=no
66

7-
# GRUB and UEFI configuration
8-
declare -g BOOTCONFIG="none" # Skip U-Boot completely
7+
# U-Boot bootscript configuration
8+
declare -g BOOTCONFIG="none" # Skip U-Boot compilation
9+
declare -g BOOTSCRIPT="boot-genio.cmd:boot.cmd" # Use custom boot script for Genio (compatible with U-Boot without itest/setexpr/bootz)
10+
declare -g BOOTENV_FILE="genio.txt" # Boot environment template for armbianEnv.txt
11+
12+
# GRUB and UEFI configuration (legacy, may be removed)
913
declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics terminal for GRUB
1014
declare -g UEFI_GRUB_TIMEOUT=3 # GRUB menu timeout
1115
declare -g SERIALCON="ttyS0" # Serial console for GRUB | TODO: Figure out if we can get Grub via HDMI too
1216
declare -g BOARD_FIRMWARE_INSTALL="-full" # Install full firmware for UEFI support
1317

1418
# GRUB configuration with DTB support
15-
declare -g GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0,921600 root=LABEL=armbi_root rootwait rootfstype=ext4 efi=noruntime"
19+
declare -g GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0,921600 root=LABEL=armbi_root rootwait rootfstype=ext4 efi=noruntime"
1620

1721
# Kernel configuration
1822
case $BRANCH in

0 commit comments

Comments
 (0)