diff options
| author | Simon Glass <sjg@chromium.org> | 2023-07-30 21:02:05 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2023-08-09 23:31:12 +0800 |
| commit | 9234b77b9d42ebd77585091a072b4ab958ba83ed (patch) | |
| tree | 96bc04ae5c9a8f00cff28cc24dae2a2286accad0 | |
| parent | 3cc409536232017cb69a2339c3d9c7e7a3d3d096 (diff) | |
| download | u-boot-9234b77b9d42ebd77585091a072b4ab958ba83ed.zip u-boot-9234b77b9d42ebd77585091a072b4ab958ba83ed.tar.gz u-boot-9234b77b9d42ebd77585091a072b4ab958ba83ed.tar.bz2 | |
x86: qemu-x86: 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/emulation/qemu-x86/qemu-x86.env | 6 | ||||
| -rw-r--r-- | include/configs/qemu-x86.h | 23 |
2 files changed, 6 insertions, 23 deletions
diff --git a/board/emulation/qemu-x86/qemu-x86.env b/board/emulation/qemu-x86/qemu-x86.env new file mode 100644 index 0000000..adcc1c5 --- /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@gmail.com> + */ + +#include <env/x86.env> diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 3e52352..9b0f5ce 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -2,26 +2,3 @@ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@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 */ |