diff options
| author | Tom Rini <trini@ti.com> | 2015-01-26 17:44:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-26 17:44:49 -0500 |
| commit | ab92da9f47d51d363c7de42e2a7bd807e2c1bd54 (patch) | |
| tree | dfabc29929e39a1ecc47edf5a4cf839ead062acd /include/configs/x86-common.h | |
| parent | aed03faa064cca56847571b13cbd4c849c6116aa (diff) | |
| parent | e43ade3749ff10bc313f33bf23705465e4163896 (diff) | |
| download | blackbird-obmc-uboot-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.tar.gz blackbird-obmc-uboot-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/configs/x86-common.h')
| -rw-r--r-- | include/configs/x86-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index f16ae32913..ecedfc3ab1 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -179,6 +179,7 @@ #define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_I8042_KBD #define CONFIG_CFB_CONSOLE +#define CONFIG_CONSOLE_SCROLL_LINES 5 /*----------------------------------------------------------------------- * CPU Features @@ -210,6 +211,7 @@ #define CONFIG_CMD_SF_TEST #define CONFIG_CMD_SPI #define CONFIG_SPI +#define CONFIG_OF_SPI_FLASH /*----------------------------------------------------------------------- * Environment configuration |
