[PATCH 22/22] x86: qemu-x86: Convert to text environment
Simon Glass
sjg at chromium.org
Mon Jul 31 05:02:05 CEST 2023
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
board/emulation/qemu-x86/qemu-x86.env | 6 ++++++
include/configs/qemu-x86.h | 23 -----------------------
2 files changed, 6 insertions(+), 23 deletions(-)
create mode 100644 board/emulation/qemu-x86/qemu-x86.env
diff --git a/board/emulation/qemu-x86/qemu-x86.env b/board/emulation/qemu-x86/qemu-x86.env
new file mode 100644
index 000000000000..adcc1c53bd22
--- /dev/null
+++ b/board/emulation/qemu-x86/qemu-x86.env
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2015, Bin Meng <bmeng.cn at gmail.com>
+ */
+
+#include <env/x86.env>
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 3e5235291a28..9b0f5cedcd79 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -2,26 +2,3 @@
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn at gmail.com>
*/
-
-/*
- * board/config.h - configuration options, board specific
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include <configs/x86-common.h>
-
-#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \
- "stdout=serial,vidconsole\0" \
- "stderr=serial,vidconsole\0"
-
-/*
- * ATA/SATA support for QEMU x86 targets
- * - Only legacy IDE controller is supported for QEMU '-M pc' target
- * - AHCI controller is supported for QEMU '-M q35' target
- */
-
-#endif /* __CONFIG_H */
--
2.41.0.487.g6d72f3e995-goog
More information about the U-Boot
mailing list