On 5/2/23 11:49, thomas.mittelstaedt@bosch.com wrote:
From: mtt2hi thomas.mittelstaedt@de.bosch.com
Patches without commit messages cannot be accepted.
Best regards
Heinrich
Signed-off-by: mtt2hi thomas.mittelstaedt@de.bosch.com
configs/efi-x86_payload64_defconfig | 2 +- include/configs/efi-x86_payload.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig index 12b5e58374..e6047e5fb4 100644 --- a/configs/efi-x86_payload64_defconfig +++ b/configs/efi-x86_payload64_defconfig @@ -11,7 +11,6 @@ CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000" CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DISPLAY_BOARDINFO_LATE=y @@ -59,6 +58,7 @@ CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_STUB_64BIT=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_FAT_WRITE=y CONFIG_ENV_FAT_INTERFACE="scsi" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h index c72b067c36..e1cd8eb316 100644 --- a/include/configs/efi-x86_payload.h +++ b/include/configs/efi-x86_payload.h @@ -6,6 +6,17 @@ /*
- board/config.h - configuration options, board specific
*/ +#ifndef CONFIG_SPL_BUILD
+#define BOOT_TARGET_SCSI(func) \
func(SCSI, scsi, 0)+#define BOOT_TARGET_DEVICES(func) \
- BOOT_TARGET_SCSI(func)
+#include <config_distro_bootcmd.h>
+#endif
#ifndef __CONFIG_H #define __CONFIG_H