[PATCH 15/22] x86: cherryhill: Convert to text environment

[Simon Glass]

Use the common include.

Drop everything from the config.h file.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 board/intel/cherryhill/cherryhill.env |  9 +++++++++
 include/configs/cherryhill.h          | 13 -------------
 2 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 board/intel/cherryhill/cherryhill.env

diff --git a/board/intel/cherryhill/cherryhill.env b/board/intel/cherryhill/cherryhill.env
new file mode 100644
index 000000000000..929b6a18a745
--- /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 at 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 d6ce70a96aea..a3009571de98 100644
--- a/include/configs/cherryhill.h
+++ b/include/configs/cherryhill.h
@@ -2,16 +2,3 @@
 /*
  * Copyright (C) 2017, Bin Meng <bmeng.cn at 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 */
-- 
2.41.0.487.g6d72f3e995-goog