d/patches: x86: Support for EFI boot at Virtualbox added

Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>

debian/control

@@ -37,7 +37,7 @@ Vcs-Browser: https://salsa.debian.org/debian/u-boot
 Vcs-Git: https://salsa.debian.org/debian/u-boot.git
 
 Package: u-boot
-Architecture: armel avr32 sh4
+Architecture: armel avr32 sh4 amd64
 Multi-Arch: same
 Depends: ${misc:Depends},
 Description: A boot loader for embedded systems
@@ -49,6 +49,19 @@ Description: A boot loader for embedded systems
  .
  Included platforms:
  ${u-boot:platforms}
+ 
+Package: u-boot-x86
+Architecture: amd64
+Multi-Arch: same
+Depends: ${misc:Depends}
+Breaks: u-boot (<< 2014.10~rc2+dfsg1-2~)
+Replaces: u-boot (<< 2014.10~rc2+dfsg1-2~)
+Description: A boot loader for amd64 systems
+ This package includes boot loaders for EFI boot.
+ .
+ Included platforms:
+ ${u-boot-x86:platforms}
+ 
 
 Package: u-boot-amlogic
 Architecture: arm64

debian/patches/apertis/x86/0078-X86-Support-for-SCSI-devices-added.patch

+From: mtt2hi <thomas.mittelstaedt@de.bosch.com>
+Date: Mon, 3 Apr 2023 08:08:04 +0000
+Subject: X86: Support for SCSI devices added
+
+Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>
+---
+ configs/efi-x86_payload64_defconfig | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
+index 28aaff6..355f4cd 100644
+--- a/configs/efi-x86_payload64_defconfig
++++ b/configs/efi-x86_payload64_defconfig
+@@ -22,7 +22,7 @@ CONFIG_CMD_IDE=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_PART=y
+ CONFIG_CMD_USB=y
+-# CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_SETEXPR=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_BOOTP_BOOTFILESIZE=y
+ # CONFIG_CMD_NFS is not set
+@@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
++CONFIG_CMD_SCSI=y
+ CONFIG_CMD_FS_GENERIC=y
+ CONFIG_MAC_PARTITION=y
+ CONFIG_ISO_PARTITION=y
+@@ -56,3 +57,9 @@ CONFIG_SYS_64BIT_LBA=y
+ CONFIG_EFI=y
+ CONFIG_EFI_STUB=y
+ CONFIG_EFI_STUB_64BIT=y
++CONFIG_FAT_WRITE=y
++CONFIG_ENV_FAT_INTERFACE="scsi"
++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
++CONFIG_ENV_FAT_FILE="uboot.env"
++CONFIG_ENV_IS_IN_FAT=y
++CONFIG_LEGACY_IMAGE_FORMAT=y

debian/patches/apertis/x86/0079-X86-Command-prompt-changed.patch

+From: mtt2hi <thomas.mittelstaedt@de.bosch.com>
+Date: Mon, 3 Apr 2023 08:09:57 +0000
+Subject: X86: Command prompt changed
+
+Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>
+---
+ configs/efi-x86_payload64_defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
+index 355f4cd..71e932d 100644
+--- a/configs/efi-x86_payload64_defconfig
++++ b/configs/efi-x86_payload64_defconfig
+@@ -63,3 +63,4 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
+ CONFIG_ENV_FAT_FILE="uboot.env"
+ CONFIG_ENV_IS_IN_FAT=y
+ CONFIG_LEGACY_IMAGE_FORMAT=y
++CONFIG_SYS_PROMPT="U-Boot> "

debian/patches/apertis/x86/0080-X86-Distro_boot-feature-added.patch

+From: mtt2hi <thomas.mittelstaedt@de.bosch.com>
+Date: Mon, 3 Apr 2023 08:11:40 +0000
+Subject: X86: Distro_boot feature added
+
+Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>
+---
+ configs/efi-x86_payload64_defconfig |  1 +
+ include/configs/efi-x86_payload.h   | 17 +++++++++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
+index 71e932d..d44e78d 100644
+--- a/configs/efi-x86_payload64_defconfig
++++ b/configs/efi-x86_payload64_defconfig
+@@ -57,6 +57,7 @@ CONFIG_SYS_64BIT_LBA=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 f50c2ce..322da91 100644
+--- a/include/configs/efi-x86_payload.h
++++ b/include/configs/efi-x86_payload.h
+@@ -12,6 +12,23 @@
+ 
+ #include <configs/x86-common.h>
+ 
++#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>
++
++#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
++
++#endif
++
++
+ #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+ 					"stdout=serial,vidconsole\0" \
+ 					"stderr=serial,vidconsole\0"

debian/patches/series

@@ -104,3 +104,7 @@ apertis/am62x/0079-lmb-Treat-a-region-which-is-a-subset-as-equal.patch
 
 # Support for x86 platform
 apertis/x86/0001-pci-coreboot-Don-t-read-regions-when-booting.patch
+apertis/x86/0078-X86-Support-for-SCSI-devices-added.patch
+apertis/x86/0079-X86-Command-prompt-changed.patch
+apertis/x86/0080-X86-Distro_boot-feature-added.patch
+

debian/targets.mk

@@ -648,6 +648,13 @@ else ifeq (${DEB_HOST_ARCH},sh4)
   u-boot_platforms += r2dplus
   r2dplus_targets := u-boot.bin uboot.elf
 
+else ifeq (${DEB_HOST_ARCH},amd64)
+
+# u-boot
+
+  u-boot-x86_platforms += efi-x86_payload64
+  efi-x86_payload64_targets := u-boot.bin uboot.elf u-boot-payload.efi
+
 endif
 
 # u-boot-qemu (Architecture: all)