{"id":816340,"url":"http://patchwork.ozlabs.org/api/patches/816340/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170920161822.64503-2-icenowy@aosc.io/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920161822.64503-2-icenowy@aosc.io>","list_archive_url":null,"date":"2017-09-20T16:18:19","name":"[U-Boot,v5,1/4] sunxi: change the DE1 video option to CONFIG_VIDEO_SUNXI","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d1acec108412b841a2ffdbd645dccad6590cc6a3","submitter":{"id":71295,"url":"http://patchwork.ozlabs.org/api/people/71295/?format=json","name":"Icenowy Zheng","email":"icenowy@aosc.io"},"delegate":{"id":1700,"url":"http://patchwork.ozlabs.org/api/users/1700/?format=json","username":"ag","first_name":"Anatolij","last_name":"Gustschin","email":"agust@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170920161822.64503-2-icenowy@aosc.io/mbox/","series":[{"id":4164,"url":"http://patchwork.ozlabs.org/api/series/4164/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=4164","date":"2017-09-20T16:18:19","name":"Allwinner SimpleFB Kconfig cleanup and DE2 SimpleFB support","version":5,"mbox":"http://patchwork.ozlabs.org/series/4164/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816340/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816340/checks/","tags":{},"related":[],"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy4gV0zjnz9sNr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 21 Sep 2017 02:19:02 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid CE091C21DF1; Wed, 20 Sep 2017 16:18:59 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 35933C21D64;\n\tWed, 20 Sep 2017 16:18:54 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 981CAC21D5F; Wed, 20 Sep 2017 16:18:52 +0000 (UTC)","from earwig.birch.relay.mailchannels.net\n\t(earwig.birch.relay.mailchannels.net [23.83.209.54])\n\tby lists.denx.de (Postfix) with ESMTPS id ADE90C21D64\n\tfor <u-boot@lists.denx.de>; Wed, 20 Sep 2017 16:18:51 +0000 (UTC)","from relay.mailchannels.net (localhost [127.0.0.1])\n\tby relay.mailchannels.net (Postfix) with ESMTP id 797A7369F1F;\n\tWed, 20 Sep 2017 16:18:48 +0000 (UTC)","from hermes.aosc.io (unknown [100.96.146.203])\n\t(Authenticated sender: lmn-TZDUIOWCRQMW)\n\tby relay.mailchannels.net (Postfix) with ESMTPA id A4EBC369F54;\n\tWed, 20 Sep 2017 16:18:47 +0000 (UTC)","from hermes.aosc.io (hermes.aosc.io [172.20.108.37])\n\t(using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384)\n\tby 0.0.0.0:2500 (trex/5.9.14); Wed, 20 Sep 2017 16:18:48 +0000","from localhost (localhost [127.0.0.1]) (Authenticated sender:\n\ticenowy@aosc.io)\n\tby hermes.aosc.io (Postfix) with ESMTPSA id E69FC4777B;\n\tWed, 20 Sep 2017 16:18:43 +0000 (UTC)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H3,\n\tRCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","X-Sender-Id":["lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io","lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io"],"X-MC-Relay":"Neutral","X-MailChannels-SenderId":"lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io","X-MailChannels-Auth-Id":"lmn-TZDUIOWCRQMW","X-Soft-Keen":"5ac366b05a470229_1505924328282_1184543677","X-MC-Loop-Signature":"1505924328282:3422136859","X-MC-Ingress-Time":"1505924328282","From":"Icenowy Zheng <icenowy@aosc.io>","To":"Jagan Teki <jagan@openedev.com>,\n\tMaxime Ripard <maxime.ripard@free-electrons.com>,\n\tJernej Skrabec <jernej.skrabec@siol.net>","Date":"Thu, 21 Sep 2017 00:18:19 +0800","Message-Id":"<20170920161822.64503-2-icenowy@aosc.io>","In-Reply-To":"<20170920161822.64503-1-icenowy@aosc.io>","References":"<20170920161822.64503-1-icenowy@aosc.io>","Cc":"u-boot@lists.denx.de, linux-sunxi@googlegroups.com,\n\tIcenowy Zheng <icenowy@aosc.io>","Subject":"[U-Boot] [PATCH v5 1/4] sunxi: change the DE1 video option to\n\tCONFIG_VIDEO_SUNXI","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"},"content":"The sunxi DE1 video option used to be CONFIG_VIDEO, which has the same\nname as the \"Enable legacy video support\" option in\ndrivers/video/Kconfig.\n\nChange the option name to CONFIG_VIDEO_SUNXI, which is really used by\nMakefile under drivers/video/sunxi/, and defined in sunxi-common.h\nwhen CONFIG_VIDEO is selected before this change. Now CONFIG_VIDEO_SUNXI\nselects CONFIG_VIDEO and the usages of CONFIG_VIDEO in sunxi Kconfig and\nconfig headers are all converted to use CONFIG_VIDEO_SUNXI.\n\nSigned-off-by: Icenowy Zheng <icenowy@aosc.io>\n---\n arch/arm/mach-sunxi/Kconfig    | 29 +++++++++++++++--------------\n include/configs/sunxi-common.h |  6 ++----\n scripts/config_whitelist.txt   |  1 -\n 3 files changed, 17 insertions(+), 19 deletions(-)","diff":"diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig\nindex 2309f59999..3c29fc61f7 100644\n--- a/arch/arm/mach-sunxi/Kconfig\n+++ b/arch/arm/mach-sunxi/Kconfig\n@@ -606,7 +606,7 @@ config AXP_GPIO\n \t---help---\n \tSay Y here to enable support for the gpio pins of the axp PMIC ICs.\n \n-config VIDEO\n+config VIDEO_SUNXI\n \tbool \"Enable graphical uboot console on HDMI, LCD or VGA\"\n \tdepends on !MACH_SUN8I_A83T\n \tdepends on !MACH_SUNXI_H3_H5\n@@ -614,6 +614,7 @@ config VIDEO\n \tdepends on !MACH_SUN8I_V3S\n \tdepends on !MACH_SUN9I\n \tdepends on !MACH_SUN50I\n+\tselect VIDEO\n \tdefault y\n \t---help---\n \tSay Y here to add support for using a cfb console on the HDMI, LCD\n@@ -622,21 +623,21 @@ config VIDEO\n \n config VIDEO_HDMI\n \tbool \"HDMI output support\"\n-\tdepends on VIDEO && !MACH_SUN8I\n+\tdepends on VIDEO_SUNXI && !MACH_SUN8I\n \tdefault y\n \t---help---\n \tSay Y here to add support for outputting video over HDMI.\n \n config VIDEO_VGA\n \tbool \"VGA output support\"\n-\tdepends on VIDEO && (MACH_SUN4I || MACH_SUN7I)\n+\tdepends on VIDEO_SUNXI && (MACH_SUN4I || MACH_SUN7I)\n \tdefault n\n \t---help---\n \tSay Y here to add support for outputting video over VGA.\n \n config VIDEO_VGA_VIA_LCD\n \tbool \"VGA via LCD controller support\"\n-\tdepends on VIDEO && (MACH_SUN5I || MACH_SUN6I || MACH_SUN8I)\n+\tdepends on VIDEO_SUNXI && (MACH_SUN5I || MACH_SUN6I || MACH_SUN8I)\n \tdefault n\n \t---help---\n \tSay Y here to add support for external DACs connected to the parallel\n@@ -663,14 +664,14 @@ config VIDEO_VGA_EXTERNAL_DAC_EN\n \n config VIDEO_COMPOSITE\n \tbool \"Composite video output support\"\n-\tdepends on VIDEO && (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I)\n+\tdepends on VIDEO_SUNXI && (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I)\n \tdefault n\n \t---help---\n \tSay Y here to add support for outputting composite video.\n \n config VIDEO_LCD_MODE\n \tstring \"LCD panel timing details\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault \"\"\n \t---help---\n \tLCD panel timing details string, leave empty if there is no LCD panel.\n@@ -680,14 +681,14 @@ config VIDEO_LCD_MODE\n \n config VIDEO_LCD_DCLK_PHASE\n \tint \"LCD panel display clock phase\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault 1\n \t---help---\n \tSelect LCD panel display clock phase shift, range 0-3.\n \n config VIDEO_LCD_POWER\n \tstring \"LCD panel power enable pin\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault \"\"\n \t---help---\n \tSet the power enable pin for the LCD panel. This takes a string in the\n@@ -695,7 +696,7 @@ config VIDEO_LCD_POWER\n \n config VIDEO_LCD_RESET\n \tstring \"LCD panel reset pin\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault \"\"\n \t---help---\n \tSet the reset pin for the LCD panel. This takes a string in the format\n@@ -703,7 +704,7 @@ config VIDEO_LCD_RESET\n \n config VIDEO_LCD_BL_EN\n \tstring \"LCD panel backlight enable pin\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault \"\"\n \t---help---\n \tSet the backlight enable pin for the LCD panel. This takes a string in the\n@@ -712,7 +713,7 @@ config VIDEO_LCD_BL_EN\n \n config VIDEO_LCD_BL_PWM\n \tstring \"LCD panel backlight pwm pin\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault \"\"\n \t---help---\n \tSet the backlight pwm pin for the LCD panel. This takes a string in the\n@@ -720,14 +721,14 @@ config VIDEO_LCD_BL_PWM\n \n config VIDEO_LCD_BL_PWM_ACTIVE_LOW\n \tbool \"LCD panel backlight pwm is inverted\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault y\n \t---help---\n \tSet this if the backlight pwm output is active low.\n \n config VIDEO_LCD_PANEL_I2C\n \tbool \"LCD panel needs to be configured via i2c\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \tdefault n\n \tselect CMD_I2C\n \t---help---\n@@ -776,7 +777,7 @@ config VIDEO_DE2\n \n choice\n \tprompt \"LCD panel support\"\n-\tdepends on VIDEO\n+\tdepends on VIDEO_SUNXI\n \t---help---\n \tSelect which type of LCD panel to support.\n \ndiff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h\nindex 1373b1f037..0f16ea543e 100644\n--- a/include/configs/sunxi-common.h\n+++ b/include/configs/sunxi-common.h\n@@ -266,7 +266,7 @@ extern int soft_i2c_gpio_scl;\n /* GPIO */\n #define CONFIG_SUNXI_GPIO\n \n-#ifdef CONFIG_VIDEO\n+#ifdef CONFIG_VIDEO_SUNXI\n /*\n  * The amount of RAM to keep free at the top of RAM when relocating u-boot,\n  * to use as framebuffer. This must be a multiple of 4096.\n@@ -276,8 +276,6 @@ extern int soft_i2c_gpio_scl;\n /* Do we want to initialize a simple FB? */\n #define CONFIG_VIDEO_DT_SIMPLEFB\n \n-#define CONFIG_VIDEO_SUNXI\n-\n #define CONFIG_VIDEO_LOGO\n #define CONFIG_VIDEO_STD_TIMINGS\n #define CONFIG_I2C_EDID\n@@ -286,7 +284,7 @@ extern int soft_i2c_gpio_scl;\n /* allow both serial and cfb console. */\n /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */\n \n-#endif /* CONFIG_VIDEO */\n+#endif /* CONFIG_VIDEO_SUNXI */\n \n /* Ethernet support */\n #ifdef CONFIG_SUNXI_EMAC\ndiff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt\nindex 4651bb55e7..9ae774fca7 100644\n--- a/scripts/config_whitelist.txt\n+++ b/scripts/config_whitelist.txt\n@@ -5143,7 +5143,6 @@ CONFIG_VIDEO_MXS\n CONFIG_VIDEO_MXS_MODE_SYSTEM\n CONFIG_VIDEO_OMAP3\n CONFIG_VIDEO_STD_TIMINGS\n-CONFIG_VIDEO_SUNXI\n CONFIG_VIDEO_VCXK\n CONFIG_VID_FLS_ENV\n CONFIG_VM86\n","prefixes":["U-Boot","v5","1/4"]}