Browse Source

Merge pull request #25 from andreas-schwab/Fedora_JH7100_upstream

Fix EFI booting
Fu Wei 2 years ago
parent
commit
386e78f4a7

+ 1 - 1
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

+ 1 - 0
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