enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Genio: Address PR comments

Browse Source
This commit is contained in:
Mecid Urganci 2025-12-11 11:19:31 +01:00 committed by Igor
parent 8f56288384
commit ff59a4bc96
3 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/boards/radxa-nio-12l.conf
View File

@ -7,19 +7,4 @@ KERNEL_TEST_TARGET="collabora"
BOOT_FDT_FILE="mediatek/mt8395-radxa-nio-12l.dtb"
SERIALCON="ttyS0:921600"
HAS_VIDEO_OUTPUT="yes"
# Post-config function for vendor branch
function post_family_config__nio12l_vendor_setup() {
if [[ "${BRANCH}" == "vendor" ]]; then
display_alert "Setting up Genio-Firmware package for ${BOARD}" "${RELEASE}///${BOARD}" "info"
add_packages_to_image "linux-firmware-mediatek-genio" "ubuntu-dev-tools" "ubuntu-desktop"
fi
}
# Post-config function for collabora branch
function post_family_config__nio12l_collabora_setup() {
if [[ "${BRANCH}" == "collabora" ]]; then
display_alert "Setting up Firmware-Full for ${BOARD}" "${RELEASE}///${BOARD}" "info"
declare -g BOARD_FIRMWARE_INSTALL="-full"
fi
}
declare -g BOARD_FIRMWARE_INSTALL="-full"

32
config/bootscripts/boot-genio.cmd
View File

@ -14,25 +14,31 @@ setenv docker_optimizations "on"
setenv earlycon "off"
# Set load address for temporary file loading (armbianEnv.txt, overlays, etc)
# Using address that doesn't conflict with kernel (0x45000000), ramdisk (0x49000000), or fdt (0x44000000)
# Using address that doesn't conflict with kernel (0x45000000) Note: on Arm64 it has to be 2mb aligned
# Ramdisk (0x49000000),
# or fdt (0x44000000)
setenv load_addr "0x43000000"
# Move ramdisk further away to avoid kernel overwrite (176MB space for kernel)
setenv ramdisk_addr_r "0x50000000"
test -n "${distro_bootpart}" || distro_bootpart=1
echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
# get PARTUUID of first partition on SD/eMMC/UFS the boot script was loaded from
echo "Detecting PARTUUID for ${devtype} device ${devnum}:${distro_bootpart}..."
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi
if test "${devtype}" = "scsi"; then part uuid scsi ${devnum}:${distro_bootpart} partuuid; fi
# Explicitly clear partuuid as U-Boot variables set by functions or used in loops may not behave as expected
setenv partuuid
if test "${devtype}" = "mmc" || test "${devtype}" = "scsi" || test "${devtype}" = "usb"; then
part uuid ${devtype} ${devnum}:${distro_bootpart} partuuid
fi
# Use PARTUUID if available (more reliable), otherwise fall back to rootdev label
if test -n "${partuuid}"; then
echo "PARTUUID detected: ${partuuid}"
setenv rootdev "PARTUUID=${partuuid}"
echo "Set default rootdev=${rootdev}"
else
echo "PARTUUID not available, keeping fallback rootdev=${rootdev}"
setenv rootdev "PARTUUID=${partuuid}"
fi
# Load armbianEnv.txt if it exists - using direct load instead of test -e for better compatibility
@ -51,7 +57,11 @@ fi
echo "Final rootdev: ${rootdev}"
if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
if test "${bootlogo}" = "true" ; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,921600 ${consoleargs}"; fi
@ -107,8 +117,8 @@ else
fi
fi
echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
# Resize the fdt to the actual size of the final dtb
fdt resize
echo "Booting kernel from ${kernel_addr_r} with initramfs at ${ramdisk_addr_r} and DTB at ${fdt_addr_r}..."
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}

9
config/sources/families/genio.conf
View File

@ -9,15 +9,6 @@ declare -g BOOTCONFIG="none" # Skip U-Boot compilation
declare -g BOOTSCRIPT="boot-genio.cmd:boot.cmd" # Use custom boot script for Genio (compatible with U-Boot without itest/setexpr/bootz)
declare -g BOOTENV_FILE="genio.txt" # Boot environment template for armbianEnv.txt
# GRUB and UEFI configuration (legacy, may be removed)
declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics terminal for GRUB
declare -g UEFI_GRUB_TIMEOUT=3 # GRUB menu timeout
declare -g SERIALCON="ttyS0" # Serial console for GRUB | TODO: Figure out if we can get Grub via HDMI too
declare -g BOARD_FIRMWARE_INSTALL="-full" # Install full firmware for UEFI support
# GRUB configuration with DTB support
declare -g GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0,921600 root=LABEL=armbi_root rootwait rootfstype=ext4 efi=noruntime"
# Kernel configuration
case $BRANCH in