From patchwork Thu Sep 29 20:23:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 676761 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3slR2W2vvqz9s4n for ; Fri, 30 Sep 2016 06:27:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=comBxqLe; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2CC7EA7740; Thu, 29 Sep 2016 22:26:35 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3psDYdridmZh; Thu, 29 Sep 2016 22:26:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3411EB389E; Thu, 29 Sep 2016 22:26:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5FCC1B3867 for ; Thu, 29 Sep 2016 22:24:28 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v6V33Yhtgc98 for ; Thu, 29 Sep 2016 22:24:28 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-it0-f41.google.com (mail-it0-f41.google.com [209.85.214.41]) by theia.denx.de (Postfix) with ESMTPS id 188B4B387E for ; Thu, 29 Sep 2016 22:24:17 +0200 (CEST) Received: by mail-it0-f41.google.com with SMTP id j69so6945232itb.0 for ; Thu, 29 Sep 2016 13:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qyC4swbcLBmxMvPdvYTrTz22DtJV0H5vl/N8OZBgFSE=; b=comBxqLexJqxFnAX203fWH0QoSu9Ne8H5o//TPqjjBhc93VFYYpxhb0YSk9i9Ktfn6 6PX4WdLL2ibQNM9BpBAO7DG24rvXyGKuY6RQbtI5t3uOCQEnpPYnD7ZIIVKV0r4fFV+2 QU7ko81YBDfYijF4q2QpUjjg4wDupVE8iF08etgJQ7bkRfx29A7XcAx4OFniPE2srG4A 9fsYkaAUDTt37qDfvnHp3k3HWKLITlcweRb3uCg7tDhWKhO9ZVgW8VO2AQSoOneH0WNv R95aZdXEJFDG0kiKO4PW9CLCQ8yRKWKQkbivz9gmkNzeppTGj73lkCy164f/JMVhADaa yELQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=qyC4swbcLBmxMvPdvYTrTz22DtJV0H5vl/N8OZBgFSE=; b=RgYaofM+6SW+tN3FMhdVlkYqzqxzqF6QHNlFv5YU8ZEDIPaA7Rl5IAcXnuDBiyRiYE 8Y6oHhzwWTPwNj8ayDpMlMjTuFBt0ZmHOSKr3XvkunOkg7LjdjMgNK6dyCKwkOahIprj pRTuj284czuvrc0BveHbU1KBuzp6YHVqcZ6JQZkr/K7se8sobFhfZptH+8Z9V3vvFJVR xqCoJTYkjqm2ZK5dd1eXIUOCeqDSaQ3nWZN4fs4S3hqjT0TsPuelpmjAqKC6lapPUDZX cWmifdfzCPUCIMLnyh8QKgytWZrvB/ksAF+QNI4366Ig/lV47X3gq15oMRsFmHvr3LUI X87g== X-Gm-Message-State: AA6/9RkdXostT2HjJ9Me4OpW5PA4AOWUDxfHqQKWCKjqCHGZ4s9MV90sZM5mlfBQH0Aw8Ag/ X-Received: by 10.107.10.75 with SMTP id u72mr5840386ioi.22.1475180655705; Thu, 29 Sep 2016 13:24:15 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.55]) by smtp.gmail.com with ESMTPSA id 188sm220156itm.16.2016.09.29.13.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Sep 2016 13:24:14 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 3E277220939; Thu, 29 Sep 2016 14:24:14 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 29 Sep 2016 14:23:17 -0600 Message-Id: <1475180609-14716-19-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475180609-14716-1-git-send-email-sjg@chromium.org> References: <1475180609-14716-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v3 18/29] Convert CONFIG_VIDEO_SW_CURSOR to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_VIDEO_SW_CURSOR Signed-off-by: Simon Glass Reviewed-by: Tom Rini Reviewed-by: Heiko Schocher --- Changes in v3: None Changes in v2: None drivers/video/Kconfig | 10 ++++++++++ drivers/video/cfb_console.c | 6 ------ include/configs/MIP405.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/P1022DS.h | 2 -- include/configs/PIP405.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/TQM5200.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/icon.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/ipek01.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/sequoia.h | 1 - include/configs/socrates.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tbs2910.h | 1 - include/configs/x86-common.h | 1 - scripts/config_whitelist.txt | 1 - 34 files changed, 10 insertions(+), 39 deletions(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 2c5ef2b..4caa92a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -482,6 +482,16 @@ config VGA_AS_SINGLE_DEVICE may be used if you have no keyboard device, or more than one (USB Keyboard, AT Keyboard). +config VIDEO_SW_CURSOR + bool "Enable a software cursor" + depends on CFB_CONSOLE + default y if CFB_CONSOLE + help + This draws a cursor after the last character. No blinking is + provided. This makes it possible to see the current cursor + position when entering text on the console. It is recommended to + enable this. + config VIDEO_CT69000 bool "Enable Chips & Technologies 69000 video driver" depends on VIDEO diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index a99fc00..56d3c15 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -141,12 +141,6 @@ #include #endif -/* - * Cursor definition: - * CONFIG_VIDEO_SW_CURSOR: Draws a cursor after the last character. No - * blinking is provided. Uses the macros CURSOR_SET - * and CURSOR_OFF. - */ #if !defined(CONFIG_VIDEO_SW_CURSOR) /* no Cursor defined */ #define CURSOR_ON diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 0fc3131..257fa47 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -344,7 +344,6 @@ ************************************************************/ #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VIDEO_SW_CURSOR #undef CONFIG_VIDEO_ONBOARD /************************************************************ * USB support EXPERIMENTAL diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0900540..cba393a 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -507,7 +507,6 @@ #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 76eb674..c3d69cb 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -280,7 +280,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 3f43d75..509728c 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -467,7 +467,6 @@ #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index c5295f9..7882b35 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -26,7 +26,6 @@ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 37dd44e..2c15f3d 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -380,7 +380,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index e391088..347a88d 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -381,7 +381,6 @@ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS @@ -398,7 +397,6 @@ #ifdef CONFIG_ATI #define VIDEO_IO_OFFSET CONFIG_SYS_PCIE1_IO_VIRT #define CONFIG_BIOSEMU -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 2b3cf19..70e75c1 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -304,7 +304,6 @@ ************************************************************/ #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_ONBOARD /* Video controller is on-board */ /************************************************************ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 1c18495..1a97858 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -502,7 +502,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 9b0b917..c471b60 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -500,7 +500,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 2ae6573..5808868 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -414,7 +414,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4b5e451..d542d15 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -484,7 +484,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_FSL_DIU_CH7301 #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index c5705f5..06d2be5 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -108,7 +108,6 @@ #define CONFIG_VIDEO_BMP_LOGO #endif -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #endif /* #ifndef CONFIG_TQM5200S */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index bb036dc..325c019 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -256,7 +256,6 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_HDMI -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SOURCE diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index ded26f9..3acdc74 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -226,7 +226,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 2551de4..26554b7 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -80,7 +80,6 @@ #define CONFIG_VIDEO_CORALP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */ diff --git a/include/configs/icon.h b/include/configs/icon.h index c38a254..3a72a66 100644 --- a/include/configs/icon.h +++ b/include/configs/icon.h @@ -134,7 +134,6 @@ #define VIDEO_FB_LITTLE_ENDIAN #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CFG_CONSOLE_IS_IN_ENV diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index f833f7d..968c26d 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -183,7 +183,6 @@ #define CONFIG_VIDEO_MX3 #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 436bc75..5298376 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -51,7 +51,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index d812e66..2e89b1a 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -360,7 +360,6 @@ #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN /* diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 50a6ccd..509097f 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -38,7 +38,6 @@ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100) #define CONFIG_CMD_BMP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index b45ad72..ecaeccf 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -208,7 +208,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 8002796..df11e08 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -231,7 +231,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index bf0cb2e..557aee5 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -255,7 +255,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 33459d7..df0cc23 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -144,7 +144,6 @@ /* LCD */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS -#define CONFIG_VIDEO_SW_CURSOR #endif /* MMC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index c106ae3..eafa415 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -233,7 +233,6 @@ #define CONFIG_VIDEO_LOGO #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN /* functions for cfb_console */ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 153646f..ff2f6c0 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -408,7 +408,6 @@ #define CONFIG_ATI_RADEON_FB /* use radeon framebuffer driver */ #define VIDEO_IO_OFFSET 0xe8000000 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 9d92a06..16e4b02 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -176,7 +176,6 @@ #define CONFIG_CONSOLE_EXTRA_INFO #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 3b9c688..a2969e7 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -290,7 +290,6 @@ extern int soft_i2c_gpio_scl; #define CONFIG_VIDEO_SUNXI -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_STD_TIMINGS #define CONFIG_I2C_EDID diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index da1dea8..8fdeaa1 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -74,7 +74,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index c1f6b91..352de68 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -129,7 +129,6 @@ /*----------------------------------------------------------------------- * Video Configuration */ -#define CONFIG_VIDEO_SW_CURSOR #define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_CONSOLE_SCROLL_LINES 5 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9d66e6a..dd36855 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8293,7 +8293,6 @@ CONFIG_VIDEO_SM501_8BPP CONFIG_VIDEO_SM501_PCI CONFIG_VIDEO_STD_TIMINGS CONFIG_VIDEO_SUNXI -CONFIG_VIDEO_SW_CURSOR CONFIG_VIDEO_VCXK CONFIG_VID_FLS_ENV CONFIG_VM86