conf: machine: imx8m[m,n,p]: enable extlinux support

Newer U-Boot versions enables distro boot option as a default. This
requires that the target uses either Syslinux or boot script in order to
start instead of customized boot environment.

Since according to U-Boot documentation [1], Syslinux is considered as a
preferred way of using distro boot - enable it for imx8mm, imx8mn and
imx8mp derivatives for mainline BSP.

Syslinux options are introduced in machine-specific headers in order
to assemble correct extlinux.conf file.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Link: [1]: https://source.denx.de/u-boot/u-boot/-/blob/master/doc/README.distro

diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 9b590fe01374eb79e37953e5c744234340fa3d8a..bcf838abf65a2657c02055c0d828b1ba5e0dd57f 100644 (file)
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -45,6 +45,25 @@ IMX_BOOT_SOC_TARGET = "iMX8MM"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Mini EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Mini EVK"
+UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
 UBOOT_MAKE_TARGET = "all"

diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 6a5b31f7e5d4f72b37d269f8e4a0d50c76578d85..a0e39857c7700f1ec11ca0354de09fa291a835ad 100644 (file)
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -46,6 +46,25 @@ IMX_BOOT_SOC_TARGET = "iMX8MN"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Nano EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Nano EVK"
+UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
 BOOT_SPACE = "65536"
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"

diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 872d07a0c6d2286cb3a06e618a21990bcbc94252..814638d01732871c11e1ce432e50a22a540b5576 100644 (file)
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -43,6 +43,25 @@ IMX_BOOT_SOC_TARGET = "iMX8MP"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Plus EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Plus EVK"
+UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
 UBOOT_MAKE_TARGET = "all"