From mboxrd@z Thu Jan 1 00:00:00 1970 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 EC7A5C433FE for ; Wed, 19 Oct 2022 11:32:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B7DF85008; Wed, 19 Oct 2022 13:27:52 +0200 (CEST) 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="SnTZ01nZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE8A084F89; Wed, 19 Oct 2022 13:26:38 +0200 (CEST) Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (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 77D6284FAB for ; Wed, 19 Oct 2022 13:25:24 +0200 (CEST) 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-il1-x130.google.com with SMTP id o13so8978520ilc.7 for ; Wed, 19 Oct 2022 04:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dHIGtl970pG5313+RgpiEWl0NB9TtphAe0YObPscTP4=; b=SnTZ01nZmnguJBY3qxZfsx7QlfYPVEVpIQgwEGsfp1tP3B3zm1zxUwwGZ7a1nuiKIO W+akfvlkHygkl7sdbVJqgY8rXeYI3WoBOD16zIWTCeCoxm/8U8uW+GJCXbBo0MdwqcjU UpqPXSKiS3WXdFaCgrcibyF/tXvbdddKSYaa4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dHIGtl970pG5313+RgpiEWl0NB9TtphAe0YObPscTP4=; b=FXs1iiKsIz1rkeU9TR0iRLTOVTMydwaOdcdYsoVtBYIYsfyyWxlkg1UAAbjNwcMHnz 1Qe/ZojzNvUrvDT3RaiVy23ndhh2x0tGQZ2Tcalc3+YNqoDPkJT1GBgkTObBFUBgkJXI jPwf9qT9VElO0yARJH3gMrXG361PjkYVl3rtnQX+MaTxbXnFXp4JrJGlhf6U78FO3E7f twYURKFDzFB/tUA6VqVxojsbkBwmwn03/eBRRnb4Paa4RcFGvB3K5UYf0R9FATRdAMRN O/hKP/0Gr1OigP1sraxIk9DiGC8I6ebaGR2orOL6Pp4tMUM/sUd6NYyZos3Y8JL9s1Um L7gw== X-Gm-Message-State: ACrzQf11RCdXxJLmxzWjGpaO0MK0UYVaCXFPAga8QVZDA7eJ83ZYmbBg 4a9unKPayak+cgQ1X+CRfeSsNz2+MlgyIg== X-Google-Smtp-Source: AMsMyM7E0UWuELqXyL28UR1i19WvuB45mcXLaFAo/Ab7cSTz8gYrMOs3aZKbX15xrFlFy5MkhezUFQ== X-Received: by 2002:a05:6e02:1bc7:b0:2fa:876e:95a7 with SMTP id x7-20020a056e021bc700b002fa876e95a7mr5700950ilv.240.1666178701930; Wed, 19 Oct 2022 04:25:01 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id g34-20020a022722000000b003634aa4a55asm2041156jaa.82.2022.10.19.04.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:25:01 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Simon Glass , Jason Liu , Marek Vasut , Ovidiu Panait , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Stefan Roese Subject: [PATCH 26/39] video: cmd: Drop old LCD code Date: Wed, 19 Oct 2022 05:23:43 -0600 Message-Id: <20221019112356.1042065-27-sjg@chromium.org> X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog In-Reply-To: <20221019112356.1042065-1-sjg@chromium.org> References: <20221019112356.1042065-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.6 at phobos.denx.de X-Virus-Status: Clean This relies on the old LCD implementation which is to be removed. Drop it. Signed-off-by: Simon Glass --- cmd/bmp.c | 9 --------- common/board_f.c | 27 +++++++++++---------------- common/fdt_support.c | 29 ----------------------------- 3 files changed, 11 insertions(+), 54 deletions(-) diff --git a/cmd/bmp.c b/cmd/bmp.c index 880edad8898..46d0d916e86 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -223,9 +222,7 @@ static int bmp_info(ulong addr) int bmp_display(ulong addr, int x, int y) { -#ifdef CONFIG_DM_VIDEO struct udevice *dev; -#endif int ret; struct bmp_image *bmp = map_sysmem(addr, 0); void *bmp_alloc_addr = NULL; @@ -241,7 +238,6 @@ int bmp_display(ulong addr, int x, int y) } addr = map_to_sysmem(bmp); -#ifdef CONFIG_DM_VIDEO ret = uclass_first_device_err(UCLASS_VIDEO, &dev); if (!ret) { bool align = false; @@ -251,11 +247,6 @@ int bmp_display(ulong addr, int x, int y) ret = video_bmp_display(dev, addr, x, y, align); } -#elif defined(CONFIG_LCD) - ret = lcd_display_bitmap(addr, x, y); -#else -# error bmp_display() requires CONFIG_LCD -#endif if (bmp_alloc_addr) free(bmp_alloc_addr); diff --git a/common/board_f.c b/common/board_f.c index 5f1711181c7..2660ce67d8b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -402,22 +401,18 @@ __weak int arch_reserve_mmu(void) static int reserve_video(void) { -#ifdef CONFIG_DM_VIDEO - ulong addr; - int ret; + if (IS_ENABLED(CONFIG_DM_VIDEO)) { + ulong addr; + int ret; - addr = gd->relocaddr; - ret = video_reserve(&addr); - if (ret) - return ret; - debug("Reserving %luk for video at: %08lx\n", - ((unsigned long)gd->relocaddr - addr) >> 10, addr); - gd->relocaddr = addr; -#elif defined(CONFIG_LCD) - /* reserve memory for LCD display (always full pages) */ - gd->relocaddr = lcd_setmem(gd->relocaddr); - gd->fb_base = gd->relocaddr; -#endif + addr = gd->relocaddr; + ret = video_reserve(&addr); + if (ret) + return ret; + debug("Reserving %luk for video at: %08lx\n", + ((unsigned long)gd->relocaddr - addr) >> 10, addr); + gd->relocaddr = addr; + } return 0; } diff --git a/common/fdt_support.c b/common/fdt_support.c index baf7fb70659..ebebffc7890 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1740,35 +1740,6 @@ int fdt_set_status_by_pathf(void *fdt, enum fdt_status status, const char *fmt, return fdt_set_node_status(fdt, offset, status); } -#if defined(CONFIG_LCD) -int fdt_add_edid(void *blob, const char *compat, unsigned char *edid_buf) -{ - int noff; - int ret; - - noff = fdt_node_offset_by_compatible(blob, -1, compat); - if (noff != -FDT_ERR_NOTFOUND) { - debug("%s: %s\n", fdt_get_name(blob, noff, 0), compat); -add_edid: - ret = fdt_setprop(blob, noff, "edid", edid_buf, 128); - if (ret == -FDT_ERR_NOSPACE) { - ret = fdt_increase_size(blob, 512); - if (!ret) - goto add_edid; - else - goto err_size; - } else if (ret < 0) { - printf("Can't add property: %s\n", fdt_strerror(ret)); - return ret; - } - } - return 0; -err_size: - printf("Can't increase blob size: %s\n", fdt_strerror(ret)); - return ret; -} -#endif - /* * Verify the physical address of device tree node for a given alias * -- 2.38.0.413.g74048e4d9e-goog