diff --git a/config/boards/aml-s9xx-box.tvb b/config/boards/aml-s9xx-box.tvb index 6fc821db142a..97a805f929ce 100644 --- a/config/boards/aml-s9xx-box.tvb +++ b/config/boards/aml-s9xx-box.tvb @@ -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' @@ -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" diff --git a/packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template b/packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template index 763c2bb17157..570489dc3bb3 100644 --- a/packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template +++ b/packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template @@ -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= 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