summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-07-31 06:01:58 +0300
committerBin Meng <bmeng.cn@gmail.com>2023-08-09 18:31:12 +0300
commit5ccb18a75210c4f6a09255c430cd01466d1dd85d (patch)
treecf8b2fc4cc41e2a0ff79bf4a6d349a21ad5c59e1
parenta68a7abc3da15a6e441faed1c7dad2f57e66e259 (diff)
downloadu-boot-5ccb18a75210c4f6a09255c430cd01466d1dd85d.tar.xz
x86: cherryhill: 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/intel/cherryhill/cherryhill.env9
-rw-r--r--include/configs/cherryhill.h13
2 files changed, 9 insertions, 13 deletions
diff --git a/board/intel/cherryhill/cherryhill.env b/board/intel/cherryhill/cherryhill.env
new file mode 100644
index 0000000000..929b6a18a7
--- /dev/null
+++ b/board/intel/cherryhill/cherryhill.env
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
+ */
+
+#include <env/x86.env>
+
+/* don't use i8042-kbd */
+stdin=serial,usbkbd
diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h
index d6ce70a96a..a3009571de 100644
--- a/include/configs/cherryhill.h
+++ b/include/configs/cherryhill.h
@@ -2,16 +2,3 @@
/*
* Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <configs/x86-common.h>
-
-#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \
- "stdout=vidconsole,serial\0" \
- "stderr=vidconsole,serial\0"
-
-/* Environment configuration */
-
-#endif /* __CONFIG_H */