summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Jonglez <git@bitsofnetworks.org>2022-05-28 18:17:37 +0300
committerMichaelZhuxx <78013124+MichaelZhuxx@users.noreply.github.com>2023-04-09 17:07:38 +0300
commit32375e883659514501ed5b53d525ee2222d3b342 (patch)
treed46722de6d805858b39c35be3bb238d6e5176f19
parent8d0ca9a936289bb07dd364d0a94d153ec6ac3ed1 (diff)
downloadu-boot-32375e883659514501ed5b53d525ee2222d3b342.tar.xz
starfive: enable BOOTCOMMAND so that DISTRO_DEFAULTS becomes useful
Currently, the starfive configuration implements the distro spec: https://u-boot.readthedocs.io/en/latest/develop/distro.html However, BOOTCOMMAND is not enabled in the actual board config. This results in "bootcmd" not being defined, so u-boot does nothing by default. The Fedora image provided by StarFive is still able to boot, but only because u-boot has a preboot command that loads boot/uEnv.txt from the third partition of the SD card. To make use of the distro spec and allow generic booting of any OS image, this patch enables BOOTCOMMAND. Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
-rw-r--r--configs/starfive_jh7100_starlight_smode_defconfig3
-rw-r--r--configs/starfive_jh7100_visionfive_smode_defconfig3
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/starfive_jh7100_starlight_smode_defconfig b/configs/starfive_jh7100_starlight_smode_defconfig
index 68284497f7..670ebbb727 100644
--- a/configs/starfive_jh7100_starlight_smode_defconfig
+++ b/configs/starfive_jh7100_starlight_smode_defconfig
@@ -32,7 +32,8 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_DELAY_STR="f"
CONFIG_AUTOBOOT_STOP_STR="v"
CONFIG_AUTOBOOT_KEYED_CTRLC=y
-# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="run distro_bootcmd"
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run mmcbootenv"
CONFIG_DEFAULT_FDT_FILE="starfive/jh7100-beaglev-starlight.dtb"
diff --git a/configs/starfive_jh7100_visionfive_smode_defconfig b/configs/starfive_jh7100_visionfive_smode_defconfig
index 7a82eba3a5..a3663b830d 100644
--- a/configs/starfive_jh7100_visionfive_smode_defconfig
+++ b/configs/starfive_jh7100_visionfive_smode_defconfig
@@ -30,7 +30,8 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_DELAY_STR="f"
CONFIG_AUTOBOOT_STOP_STR="v"
CONFIG_AUTOBOOT_KEYED_CTRLC=y
-# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="run distro_bootcmd"
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run mmcbootenv"
CONFIG_DEFAULT_FDT_FILE="starfive/jh7100-visionfive.dtb"