diff options
author | Tom Rini <trini@konsulko.com> | 2016-10-12 08:32:09 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-10-12 13:59:26 -0400 |
commit | 5ebd27d860ec0c6e36f1b0f973653fe66a7360be (patch) | |
tree | 71ba0f39cc03c131889ce51803d85cf4c49b2941 /include/configs/x86-common.h | |
parent | f812574e61e9bfe37e76e620606fd1a65cc9cdc2 (diff) | |
parent | 00bcaedd5c4063c677d16af264bbcb991fb9675c (diff) | |
download | u-boot-imx-5ebd27d860ec0c6e36f1b0f973653fe66a7360be.zip u-boot-imx-5ebd27d860ec0c6e36f1b0f973653fe66a7360be.tar.gz u-boot-imx-5ebd27d860ec0c6e36f1b0f973653fe66a7360be.tar.bz2 |
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 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 7803aea..a286f05 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -130,11 +130,6 @@ /*----------------------------------------------------------------------- * Video Configuration */ -#define CONFIG_VIDEO -#define CONFIG_VIDEO_SW_CURSOR -#define VIDEO_FB_16BPP_WORD_SWAP -#define CONFIG_VGA_AS_SINGLE_DEVICE -#define CONFIG_CFB_CONSOLE #define CONFIG_CONSOLE_SCROLL_LINES 5 /*----------------------------------------------------------------------- |