diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-17 11:46:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-17 11:46:51 -0400 |
| commit | c07f38208a73bbe3efaa939d6742096c1cb7e0ce (patch) | |
| tree | 147b5e7f26a4e8e240feeb9c919cdec0c7b6de37 /include | |
| parent | 08cebeeaadd9192dd501308ac6a8b858ffa255c1 (diff) | |
| parent | 8a1c44271c55961fb70fb6177f9c02fdb05287c5 (diff) | |
| download | u-boot-c07f38208a73bbe3efaa939d6742096c1cb7e0ce.tar.gz | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootstage.h | 6 | ||||
| -rw-r--r-- | include/configs/cherryhill.h | 22 |
2 files changed, 22 insertions, 6 deletions
diff --git a/include/bootstage.h b/include/bootstage.h index c5d93f57fd..7a524782ba 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -12,11 +12,6 @@ #ifndef _BOOTSTAGE_H #define _BOOTSTAGE_H -/* Define this for host tools */ -#ifndef CONFIG_BOOTSTAGE_USER_COUNT -#define CONFIG_BOOTSTAGE_USER_COUNT 20 -#endif - /* Flags for each bootstage record */ enum bootstage_flags { BOOTSTAGEF_ERROR = 1 << 0, /* Error record */ @@ -208,7 +203,6 @@ enum bootstage_id { /* a few spare for the user, from here */ BOOTSTAGE_ID_USER, - BOOTSTAGE_ID_COUNT = BOOTSTAGE_ID_USER + CONFIG_BOOTSTAGE_USER_COUNT, BOOTSTAGE_ID_ALLOC, }; diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h new file mode 100644 index 0000000000..14da9caade --- /dev/null +++ b/include/configs/cherryhill.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/x86-common.h> + +#define CONFIG_SYS_MONITOR_LEN (2 << 20) + +#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ + "stdout=vidconsole,serial\0" \ + "stderr=vidconsole,serial\0" + +/* Environment configuration */ +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_OFFSET 0x005f0000 + +#endif /* __CONFIG_H */ |