Skip to content

Commit

Permalink
aml-s9xx-box: Remove u-boot and update generated extlinux.conf
Browse files Browse the repository at this point in the history
 Changes to be committed:
	modified:   config/boards/aml-s9xx-box.tvb
	modified:   packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template

The aml-s9xx-box builds use the native TV Box u-boot.  I've had as a
todo item to figure out how to not build and include an unused u-boot.
In a recent PR for a different board the opposite was being done
(adding a u-boot where a board didn't previously ship one), thus
I then had the info to remove it here.
This also changes the generated extlinux.conf to include a fdt line
by adding the boot_fdt_file to the board config file.  This reduces
the effort needed to manually modify the extlinux.conf.
  • Loading branch information
SteeManMI committed Jun 27, 2024
1 parent 1ff783d commit 87f37f6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
11 changes: 10 additions & 1 deletion config/boards/aml-s9xx-box.tvb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
BOARD_NAME="aml-s9xx-box"
BOARDFAMILY="meson-gxl"
BOARD_MAINTAINER="SteeManMI"
BOOTCONFIG="libretech-cc_defconfig"
BOOTSIZE="512"
BOOTFS_TYPE="fat"
KERNEL_TARGET="current,edge"
SERIALCON="ttyAML0"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.mesongx"
BOOT_FDT_FILE="amlogic/meson-gxl-s905x-p212.dtb"
BOOT_LOGO="desktop"
SRC_EXTLINUX="yes"
SRC_CMDLINE='rootflags=data=writeback console=ttyAML0,115200n8 console=tty0'
Expand All @@ -34,6 +34,15 @@ function aml-s9xx-box-bsp-cli-preinst() {

}

function post_family_config__uboot_aml-s9xx-box() {
# This board type relies on the vendor installed u-boot on emmc to boot

display_alert "$BOARD" "Configuring ($BOARD) non-u-boot" "info"

unset BOOTSOURCE
declare -g BOOTCONFIG='none'
}

function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() {

display_alert "$BOARD" "Installing bsp files" "info"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
label Armbian-unofficial
kernel /Image
initrd /uInitrd
fdtdir /dtb/

#Insert the correct FDT line for your box's dtb in the extlinux.conf file
#The dtbs for Amlogic s9xx boxes are located in /boot/dtb/amlogic
#For example for a TX3 mini box the FDT line to insert would look like this:
FDT /dtb/amlogic/meson-gxl-s905w-tx3-mini.dtb
fdt /dtb/amlogic/meson-gxl-s905w-tx3-mini.dtb


append root=UUID=<root partition uuid> rootflags=data=writeback console=ttyAML0,115200n8 console=tty0 rw no_console_suspend consoleblank=0 fsck.fix=yes fsck.repair=yes net.ifnames=0 splash plymouth.ignore-serial-consoles
Expand Down

0 comments on commit 87f37f6

Please sign in to comment.