summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-07-30 21:02:03 -0600
committerBin Meng <bmeng.cn@gmail.com>2023-08-09 23:31:12 +0800
commit17b2398534c5212dd3b32db7d965e813c8a31e59 (patch)
treeb9eb3fb8a0dd6a12c90521cc32d9e494f7492167
parent6ed1cb3552c0d590f681176878bd625373ea0c6b (diff)
downloadu-boot-17b2398534c5212dd3b32db7d965e813c8a31e59.tar.gz
u-boot-17b2398534c5212dd3b32db7d965e813c8a31e59.tar.bz2
u-boot-17b2398534c5212dd3b32db7d965e813c8a31e59.zip
x86: efi-x86_payload: Convert to text environment
Use the common include. Drop everything from the config.h file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # Intel Edison Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--board/efi/efi-x86_payload/efi-x86_payload.env6
-rw-r--r--include/configs/efi-x86_payload.h17
2 files changed, 6 insertions, 17 deletions
diff --git a/board/efi/efi-x86_payload/efi-x86_payload.env b/board/efi/efi-x86_payload/efi-x86_payload.env
new file mode 100644
index 0000000000..6a65628706
--- /dev/null
+++ b/board/efi/efi-x86_payload/efi-x86_payload.env
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
+ */
+
+#include <env/x86.env>
diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h
index c72b067c36..e00c408f29 100644
--- a/include/configs/efi-x86_payload.h
+++ b/include/configs/efi-x86_payload.h
@@ -2,20 +2,3 @@
/*
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
*/
-
-/*
- * board/config.h - configuration options, board specific
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <configs/x86-common.h>
-
-#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \
- "stdout=serial,vidconsole\0" \
- "stderr=serial,vidconsole\0"
-
-/* ATA/IDE support */
-
-#endif /* __CONFIG_H */