diff options
| author | Fu Wei <tekkamanninja@gmail.com> | 2021-08-23 05:41:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-23 05:41:32 +0300 |
| commit | 386e78f4a791c06cb34e805e4095a8d4600d5551 (patch) | |
| tree | 8115ce950d573b3e97778846b81e788b936e5479 | |
| parent | 39359967a32b9a39ef080eae69a7e7a15e34b917 (diff) | |
| parent | 1669ec339a54ec9ac413c1f6ddea00ed439dc7ad (diff) | |
| download | u-boot-Fedora_JH7100_2021.07.tar.xz | |
Merge pull request #25 from andreas-schwab/Fedora_JH7100_upstreamFedora_JH7100_2021.07
Fix EFI booting
| -rw-r--r-- | configs/starfive_jh7100_beagle_v_smode_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/starfive-jh7100.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/starfive_jh7100_beagle_v_smode_defconfig b/configs/starfive_jh7100_beagle_v_smode_defconfig index fbf1bb7d87..43afc4f8c3 100644 --- a/configs/starfive_jh7100_beagle_v_smode_defconfig +++ b/configs/starfive_jh7100_beagle_v_smode_defconfig @@ -30,6 +30,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon stmmaceth=chain_mo CONFIG_BOOTCOMMAND="run bootcmd_mmc0" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr};fdt addr ${fdtcontroladdr};" +CONFIG_DEFAULT_FDT_FILE="starfive/jh7100-beaglev-starlight.dtb" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_LOG_MAX_LEVEL=5 CONFIG_DISPLAY_CPUINFO=y @@ -59,7 +60,6 @@ CONFIG_CMD_DNS=y CONFIG_CMD_FS_UUID=y CONFIG_CMD_LOG=y # CONFIG_ISO_PARTITION is not set -CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_VERSION_VARIABLE=y CONFIG_BOOTP_SEND_HOSTNAME=y diff --git a/include/configs/starfive-jh7100.h b/include/configs/starfive-jh7100.h index 8c5915a73c..a543ca8313 100644 --- a/include/configs/starfive-jh7100.h +++ b/include/configs/starfive-jh7100.h @@ -123,6 +123,7 @@ "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \ "partitions=" PARTS_DEFAULT "\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTENV \ BOOTENV_SF |