summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <[email protected]>2023-07-30 21:01:59 -0600
committerBin Meng <[email protected]>2023-08-09 23:31:12 +0800
commitc166298ed238f2d654b0bbaafa354541a2de317a (patch)
treec9cacf8a7cfca76b09d7150bf0938458b14b792e
parent5ccb18a75210c4f6a09255c430cd01466d1dd85d (diff)
x86: cougarcanyon2: Convert to text environment
Use the common include. The existing environment includes "vga" but that is not valid anymore, so let it use vidconsole Drop everything from the config.h file. Signed-off-by: Simon Glass <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> # Intel Edison Reviewed-by: Bin Meng <[email protected]>
-rw-r--r--board/intel/cougarcanyon2/cougarcanyon2.env6
-rw-r--r--include/configs/cougarcanyon2.h13
2 files changed, 6 insertions, 13 deletions
diff --git a/board/intel/cougarcanyon2/cougarcanyon2.env b/board/intel/cougarcanyon2/cougarcanyon2.env
new file mode 100644
index 00000000000..6329b0f330b
--- /dev/null
+++ b/board/intel/cougarcanyon2/cougarcanyon2.env
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2016, Bin Meng <[email protected]>
+ */
+
+#include <env/x86.env>
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index 31639e48da8..0406786f7c6 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -2,16 +2,3 @@
/*
* Copyright (C) 2016, Bin Meng <[email protected]>
*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <configs/x86-common.h>
-
-#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0"
-
-/* Environment configuration */
-
-#endif /* __CONFIG_H */