From 5ccb18a75210c4f6a09255c430cd01466d1dd85d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 30 Jul 2023 21:01:58 -0600 Subject: [PATCH] x86: cherryhill: Convert to text environment Use the common include. Drop everything from the config.h file. Signed-off-by: Simon Glass Reviewed-by: Andy Shevchenko # Intel Edison Reviewed-by: Bin Meng --- 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 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 + */ + +#include + +/* 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 */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include - -#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ - "stdout=vidconsole,serial\0" \ - "stderr=vidconsole,serial\0" - -/* Environment configuration */ - -#endif /* __CONFIG_H */ -- 2.39.5