9 files changed, 131 insertions, 0 deletions
diff --git a/roms/u-boot/board/efi/Kconfig b/roms/u-boot/board/efi/Kconfig
new file mode 100644
index 000000000..291bd2ca1
--- /dev/null
+++ b/roms/u-boot/board/efi/Kconfig
@@ -0,0 +1,28 @@
+if VENDOR_EFI
+
+choice
+	prompt "Mainboard model"
+	optional
+
+config TARGET_EFI_APP
+	bool "efi application"
+	help
+	  This target is used for running U-Boot on top of EFI. In
+	  this case EFI does the early initialisation, and U-Boot
+	  takes over once the RAM, video and CPU are fully running.
+	  U-Boot is loaded as an application from EFI.
+
+config TARGET_EFI_PAYLOAD
+	bool "efi payload"
+	help
+	  This target is used for running U-Boot on top of EFI. In
+	  this case EFI does the early initialisation, and U-Boot
+	  takes over once the RAM, video and CPU are fully running.
+	  U-Boot is loaded as a payload from EFI.
+
+endchoice
+
+source "board/efi/efi-x86_app/Kconfig"
+source "board/efi/efi-x86_payload/Kconfig"
+
+endif
diff --git a/roms/u-boot/board/efi/efi-x86_app/Kconfig b/roms/u-boot/board/efi/efi-x86_app/Kconfig
new file mode 100644
index 000000000..ae87bf34d
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_app/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_EFI_APP
+
+config SYS_BOARD
+	default "efi-x86_app"
+
+config SYS_VENDOR
+	default "efi"
+
+config SYS_SOC
+	default "efi"
+
+config SYS_CONFIG_NAME
+	default "efi-x86_app"
+
+endif
diff --git a/roms/u-boot/board/efi/efi-x86_app/MAINTAINERS b/roms/u-boot/board/efi/efi-x86_app/MAINTAINERS
new file mode 100644
index 000000000..fb8a6b1c2
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_app/MAINTAINERS
@@ -0,0 +1,6 @@
+EFI-X86_APP BOARD
+M:	Simon Glass <sjg@chromium.org>
+S:	Maintained
+F:	board/efi/efi-x86_app/
+F:	include/configs/efi-x86_app.h
+F:	configs/efi-x86_app_defconfig
diff --git a/roms/u-boot/board/efi/efi-x86_app/Makefile b/roms/u-boot/board/efi/efi-x86_app/Makefile
new file mode 100644
index 000000000..cb48d1ccc
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_app/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (c) 2015 Google, Inc
+
+obj-y	+= app.o
diff --git a/roms/u-boot/board/efi/efi-x86_app/app.c b/roms/u-boot/board/efi/efi-x86_app/app.c
new file mode 100644
index 000000000..da3445bb1
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_app/app.c
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ */
+
+#include <common.h>
diff --git a/roms/u-boot/board/efi/efi-x86_payload/Kconfig b/roms/u-boot/board/efi/efi-x86_payload/Kconfig
new file mode 100644
index 000000000..08dd0c2ed
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_payload/Kconfig
@@ -0,0 +1,40 @@
+if TARGET_EFI_PAYLOAD
+
+config SYS_BOARD
+	default "efi-x86_payload"
+
+config SYS_VENDOR
+	default "efi"
+
+config SYS_SOC
+	default "efi"
+
+config SYS_CONFIG_NAME
+	default "efi-x86_payload"
+
+config SYS_TEXT_BASE
+	default 0x00200000
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+	select BOARD_EARLY_INIT_R
+	imply SYS_NS16550
+	imply SCSI
+	imply SCSI_AHCI
+	imply AHCI_PCI
+	imply MMC
+	imply MMC_PCI
+	imply MMC_SDHCI
+	imply MMC_SDHCI_SDMA
+	imply USB
+	imply USB_EHCI_HCD
+	imply USB_XHCI_HCD
+	imply USB_STORAGE
+	imply USB_KEYBOARD
+	imply VIDEO_EFI
+	imply E1000
+	imply ETH_DESIGNWARE
+	imply PCH_GBE
+	imply RTL8169
+
+endif
diff --git a/roms/u-boot/board/efi/efi-x86_payload/MAINTAINERS b/roms/u-boot/board/efi/efi-x86_payload/MAINTAINERS
new file mode 100644
index 000000000..abf3a1574
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_payload/MAINTAINERS
@@ -0,0 +1,7 @@
+EFI-X86_PAYLOAD BOARD
+M:	Bin Meng <bmeng.cn@gmail.com>
+S:	Maintained
+F:	board/efi/efi-x86_payload/
+F:	include/configs/efi-x86_payload.h
+F:	configs/efi-x86_payload32_defconfig
+F:	configs/efi-x86_payload64_defconfig
diff --git a/roms/u-boot/board/efi/efi-x86_payload/Makefile b/roms/u-boot/board/efi/efi-x86_payload/Makefile
new file mode 100644
index 000000000..a4ebc85aa
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_payload/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
+
+obj-y	+= payload.o
diff --git a/roms/u-boot/board/efi/efi-x86_payload/payload.c b/roms/u-boot/board/efi/efi-x86_payload/payload.c
new file mode 100644
index 000000000..5d4492cdc
--- /dev/null
+++ b/roms/u-boot/board/efi/efi-x86_payload/payload.c
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
+ */
+
+#include <common.h>
+#include <init.h>
+#include <usb.h>
+
+int board_early_init_r(void)
+{
+	/*
+	 * Make sure PCI bus is enumerated so that peripherals on the PCI bus
+	 * can be discovered by their drivers
+	 */
+	pci_init();
+
+	return 0;
+}