summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorIcenowy Zheng <icenowy@aosc.io>2017-10-26 11:14:44 +0800
committerAnatolij Gustschin <agust@denx.de>2017-10-26 11:48:49 +0200
commit401a3ca0fb7070ab1654dde67192037b64fe0873 (patch)
tree5f170d24aae8fabfae7ce04b30ae3f8d97b415f6 /include/configs
parent4c7a211046a3956058b512edd8533f7df031cc4a (diff)
downloadu-boot-401a3ca0fb7070ab1654dde67192037b64fe0873.tar.gz
sunxi: change the DE1 video option to CONFIG_VIDEO_SUNXI
The sunxi DE1 video option used to be CONFIG_VIDEO, which has the same name as the "Enable legacy video support" option in drivers/video/Kconfig. Change the option name to CONFIG_VIDEO_SUNXI, which is really used by Makefile under drivers/video/sunxi/, and defined in sunxi-common.h when CONFIG_VIDEO is selected before this change. Now CONFIG_VIDEO_SUNXI selects CONFIG_VIDEO and the usages of CONFIG_VIDEO in sunxi Kconfig and config headers are all converted to use CONFIG_VIDEO_SUNXI. Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/sunxi-common.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 91751171ec..7d86b58417 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -268,7 +268,7 @@ extern int soft_i2c_gpio_scl;
/* GPIO */
#define CONFIG_SUNXI_GPIO
-#ifdef CONFIG_VIDEO
+#ifdef CONFIG_VIDEO_SUNXI
/*
* The amount of RAM to keep free at the top of RAM when relocating u-boot,
* to use as framebuffer. This must be a multiple of 4096.
@@ -278,8 +278,6 @@ extern int soft_i2c_gpio_scl;
/* Do we want to initialize a simple FB? */
#define CONFIG_VIDEO_DT_SIMPLEFB
-#define CONFIG_VIDEO_SUNXI
-
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_STD_TIMINGS
#define CONFIG_I2C_EDID
@@ -288,7 +286,7 @@ extern int soft_i2c_gpio_scl;
/* allow both serial and cfb console. */
/* stop x86 thinking in cfbconsole from trying to init a pc keyboard */
-#endif /* CONFIG_VIDEO */
+#endif /* CONFIG_VIDEO_SUNXI */
/* Ethernet support */
#ifdef CONFIG_SUNXI_EMAC