Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D968CC433F5 for ; Sun, 23 Jan 2022 14:04:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E194837DA; Sun, 23 Jan 2022 15:04:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="nDOk0Duf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EDAD7837C5; Sun, 23 Jan 2022 15:04:43 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0394482FC8 for ; Sun, 23 Jan 2022 15:04:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd29.google.com with SMTP id e79so16436783iof.13 for ; Sun, 23 Jan 2022 06:04:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oQUmWHIBYPbgpThRD46OM2IvDXLDlhSyq6GmhyVUuBg=; b=nDOk0DufZF8X6lGoX1S872C9knS4V8exoSF6PWP7gqXOCeAUJdQH6QO0Jo6gxJKNuo MCp2adrhslsMtoGUsg9LE6GcLXyr1p8L1V/I3tUSjU9tyo8dSszbAK5TcFQV5FL/6Aej 969bEGpjvhNpkxzUYI0ZMs8yGxdCffgpb6YEM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oQUmWHIBYPbgpThRD46OM2IvDXLDlhSyq6GmhyVUuBg=; b=lQOaGrjK6v+w+LtkQ7u40FgxjQqrUnr6bf2ON40pKwbRBtdhO0JEzs0lyWVGeZOd2T McsnkiUf7avs9HNRxjkDImbMlCZmg31aoCLum4LQU6IKm/6XzprYMENVwtEl9uCS351R WRDxrf1IZGG6fAio31vypFjD7IgjzT4MtyWRM2zxD/C33XXvieb12HlQczlyK8Otvcj2 yfuLnS+QT2S6g/GY/aGaFlSkCYS3fPRQBMSrOrWvw0VTrhGfvG5Z6sK3H3c9mQKNLVkF gB1ZPUn/6ldQ4++jpK+nd1oRedeVreWF182cdJzd47rn0vPQ1tLxHG4yq9j5uamvFrBO d6Lw== X-Gm-Message-State: AOAM532D5hRnbSo3We2tBvS2XlZdkDd/2VuzQfa8BTPZV6i6vdBe9GBm Z/YQMfhFouYOYd7A2ypOdDsHi17qhD+ZVQ== X-Google-Smtp-Source: ABdhPJz/C8dJdd1U259TFpOR77e7iYk+GdP2ZzEKq654t2QQBU+VJJQD5MdkSEQQQ9RqCD2pMclKWA== X-Received: by 2002:a6b:148a:: with SMTP id 132mr6057070iou.153.1642946674625; Sun, 23 Jan 2022 06:04:34 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id m1sm6136361ilu.87.2022.01.23.06.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jan 2022 06:04:34 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Jagan Teki , Andre Przywara , Simon Glass , =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 02/14] video: nokia_rx51: Drop obsolete video code Date: Sun, 23 Jan 2022 07:04:03 -0700 Message-Id: <20220123140415.3091482-3-sjg@chromium.org> X-Mailer: git-send-email 2.35.0.rc0.227.g00780c9af4-goog In-Reply-To: <20220123140415.3091482-1-sjg@chromium.org> References: <20220123140415.3091482-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Drop this code which uses a header that is about to be deleted. Signed-off-by: Simon Glass --- board/nokia/rx51/rx51.c | 19 ------------------- configs/nokia_rx51_defconfig | 1 - include/configs/nokia_rx51.h | 11 ----------- 3 files changed, 31 deletions(-) diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 99ca36fbbea..45c569f83a3 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -61,8 +60,6 @@ struct emu_hal_params_rx51 { DECLARE_GLOBAL_DATA_PTR; -GraphicDevice gdev; - const omap3_sysinfo sysinfo = { DDR_STACKED, "Nokia RX-51", @@ -341,22 +338,6 @@ void setup_board_tags(struct tag **in_params) *in_params = params; } -/* - * Routine: video_hw_init - * Description: Set up the GraphicDevice depending on sys_boot. - */ -void *video_hw_init(void) -{ - /* fill in Graphic Device */ - gdev.frameAdrs = 0x8f9c0000; - gdev.winSizeX = 800; - gdev.winSizeY = 480; - gdev.gdfBytesPP = 2; - gdev.gdfIndex = GDF_16BIT_565RGB; - memset((void *)gdev.frameAdrs, 0, 0xbb800); - return (void *) &gdev; -} - /* * Routine: twl4030_regulator_set_mode * Description: Set twl4030 regulator mode over i2c powerbus. diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 71b0b95c672..0ef5a84b3f3 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -76,7 +76,6 @@ CONFIG_SPI=y CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -# CONFIG_VGA_AS_SINGLE_DEVICE is not set CONFIG_SPLASH_SCREEN=y CONFIG_WATCHDOG_TIMEOUT_MSECS=31000 CONFIG_WDT=y diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index adfc055a2c9..0163f3b9852 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,17 +70,6 @@ #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -/* - * Framebuffer - */ -/* Video console */ -#define VIDEO_FB_16BPP_PIXEL_SWAP -#define VIDEO_FB_16BPP_WORD_SWAP - -/* functions for cfb_console */ -#define VIDEO_KBD_INIT_FCT rx51_kp_init() -#define VIDEO_TSTC_FCT rx51_kp_tstc -#define VIDEO_GETC_FCT rx51_kp_getc #ifndef __ASSEMBLY__ struct stdio_dev; int rx51_kp_init(void); -- 2.35.0.rc0.227.g00780c9af4-goog