[S] Change in coreboot[main]: payloads/depthcharge: Add default 64-bit libpayload config

[Cliff Huang (Code Review)]

Cliff Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84107?usp=email )

Change subject: payloads/depthcharge: Add default 64-bit libpayload config
......................................................................

payloads/depthcharge: Add default 64-bit libpayload config

Add CONFIG_LP_DEFCONFIG64_OVERRIDE flag to select default 64-bit config
file in payloads/libpayload/configs directory.

BUG=
TEST=Build with this new flag and check that the libpayload and
depthcharge.elf are built in 64-bit format.

Signed-off-by: Cliff Huang 
Change-Id: Iac07cf9e3c11e49955c69553407be76ef4f8c060
---
M payloads/external/Makefile.mk
M payloads/external/depthcharge/Kconfig
M payloads/external/depthcharge/Makefile
A payloads/libpayload/configs/defconfig64
4 files changed, 26 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/84107/1

diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk
index 53693f5..412ac68 100644
--- a/payloads/external/Makefile.mk
+++ b/payloads/external/Makefile.mk
@@ -152,7 +152,8 @@
    	DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \
    	DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \
    	DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) \
-		OVERRIDE_DEFCONFIG=$(CONFIG_LP_DEFCONFIG_OVERRIDE)
+		OVERRIDE_DEFCONFIG=$(CONFIG_LP_DEFCONFIG_OVERRIDE) \
+		OVERRIDE_DEFCONFIG64=$(CONFIG_LP_DEFCONFIG64_OVERRIDE)

# edk2

diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig
index 86b20ab..2963da3 100644
--- a/payloads/external/depthcharge/Kconfig
+++ b/payloads/external/depthcharge/Kconfig
@@ -62,4 +62,13 @@
      instead.  This is can be a convenience for development purposes, or
      if the defaults in defconfig are sufficient for your system.

+config LP_DEFCONFIG64_OVERRIDE
+	bool "Use default 64-bit libpayload config"
+	default n if LP_DEFCONFIG_OVERRIDE
+	help
+	  The Depthcharge makefile looks for a file config.<boardname> in the
+	  libpayload/configs directory.  Say Y here to use the file defconfig
+	  instead.  This is can be a convenience for development purposes, or
+	  if the defaults in defconfig are sufficient for your system.
+
 endif
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile
index af303da..9866109 100644
--- a/payloads/external/depthcharge/Makefile
+++ b/payloads/external/depthcharge/Makefile
@@ -30,6 +30,9 @@
 ifeq ($(OVERRIDE_DEFCONFIG),y)
 libpayload_config=$(libpayload_dir)/configs/defconfig
 DEPTHCHARGE_LIBPAYLOAD_MSG="Depthcharge: Using default defconfig for libpayload"
+else ifeq ($(OVERRIDE_DEFCONFIG64),y)
+libpayload_config=$(libpayload_dir)/configs/defconfig64
+DEPTHCHARGE_LIBPAYLOAD_MSG="Depthcharge: Using default defconfig for 64-bit libpayload"
 else
 libpayload_config=$(libpayload_dir)/configs/config.$(BOARD)
 DEPTHCHARGE_LIBPAYLOAD_MSG="Depthcharge: Using $(libpayload_dir)/configs/config.$(BOARD)"
diff --git a/payloads/libpayload/configs/defconfig64 b/payloads/libpayload/configs/defconfig64
new file mode 100644
index 0000000..e3904dc
--- /dev/null
+++ b/payloads/libpayload/configs/defconfig64
@@ -0,0 +1,12 @@
+CONFIG_LP_CHROMEOS=y
+# CONFIG_LP_8250_SERIAL_CONSOLE=y
+CONFIG_LP_ARCH_X86_32=n
+CONFIG_LP_ARCH_X86_64=y
+# CONFIG_LP_MULTIBOOT is not set
+CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y
+CONFIG_LP_USB=y
+CONFIG_LP_USB_UHCI=y
+CONFIG_LP_USB_OHCI=y
+CONFIG_LP_USB_EHCI=y
+CONFIG_LP_USB_XHCI=y
+CONFIG_LP_HEAP_SIZE=1048576