From 401a3ca0fb7070ab1654dde67192037b64fe0873 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 26 Oct 2017 11:14:44 +0800 Subject: 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 --- include/configs/sunxi-common.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/configs/sunxi-common.h') 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 -- cgit From f6bdddc92bbbd555868067cc529275327d1ba0fa Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 26 Oct 2017 11:14:46 +0800 Subject: video: add an option for video simplefb via DT Add an option to indicate that the video driver should setup a SimpleFB node that passes the video framebuffer initialized by U-Boot to the operating system kernel. Currently only the Allwinner DE driver uses this option, and the definition of this option in the sunxi-common.h config header is converted to an imply of this option from CONFIG_VIDEO_SUNXI. Signed-off-by: Icenowy Zheng Acked-by: Maxime Ripard --- include/configs/sunxi-common.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/configs/sunxi-common.h') diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 7d86b58417..4207398eb9 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -275,9 +275,6 @@ extern int soft_i2c_gpio_scl; */ #define CONFIG_SUNXI_MAX_FB_SIZE (16 << 20) -/* Do we want to initialize a simple FB? */ -#define CONFIG_VIDEO_DT_SIMPLEFB - #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_STD_TIMINGS #define CONFIG_I2C_EDID -- cgit