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 X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87DD6C433EF for ; Wed, 15 Sep 2021 11:35:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E41226103C for ; Wed, 15 Sep 2021 11:35:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E41226103C Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E582F82C2B; Wed, 15 Sep 2021 13:35:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=suse.com 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=suse.com header.i=@suse.com header.b="OmlhGBWA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE04982C45; Wed, 15 Sep 2021 13:35:35 +0200 (CEST) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4FA2282BC4 for ; Wed, 15 Sep 2021 13:35:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mbrugger@suse.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631705732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0AP4fk9aueIvD/n+y4vjWQSCdh1wx6KEq9896wi6wWM=; b=OmlhGBWAk1BR2hzLWWQ+z3ffe1vx3Uga/HG1x4WVvoptuEjx59EstlG960RQ0d27kIQidl xyUD0oLKsavViUeJhk3OTLa9Yg3Fnum9NiS1xD4uUN8om2zBwt5BxCpBt5HxuDJGFapDQo Z9Pqf9JsrMwAYSRC98kD9TPYTy5VF1k= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-22-Lh-eVauHPgaJU6YOo-4Djw-1; Wed, 15 Sep 2021 13:35:31 +0200 X-MC-Unique: Lh-eVauHPgaJU6YOo-4Djw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JrYj2dXWKBjwxwSWQ5U606OcAQQjgTWvwQx6ZTUfQUo3zCOpqagHPaehr/cnnz+ifxiRyG5eI37nsml/lSx7m5I/9lcCNCaX1BuYWnWdW5WWDJzR6oSU/dNT+tTCxSwLshIKrD7+T8oZnacVFVAeKR4kITGHYcuji83TWlmk7N83eCiqcfuPw8wQtHey5CD9qPBeL5HGqZpyhAnzT5rl98y6AHxUy/81z8aegtNS+aZG2Ejvg21TsVH13BtAGayoz+Xe/RnIpj9Hfxb5PLBCsSGRyP0Af7BPgwlOrmYh6aLzah7jIZjHJE1k47b8k+LDInRHOkDFYxycML6y1cl51g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=0AP4fk9aueIvD/n+y4vjWQSCdh1wx6KEq9896wi6wWM=; b=XLGRdTygR2IZOnFiiplJc/cwjWMgSCOtHiWb3o7bIH8dKFDbyeC0hsxIRD96uFcyAdLpuEdUkyDPVaIWI9JAwkj8JMVmOd6gUscdo/pQjLS1He55soFvPrrdBUIHU8kUi06aYw8J+Po8xVpjCtjvHDI6Hvmy02qz2ebpe4xxMyxJkNFlSVzZRbQ96l2lcfvQgAtLVdmegHjODdxUXQydcCFM6MaEz07pVuWCyHWVgm5NhfTkrKP2qKnqM57SilnMDm/4lJjIu5Wmjgj9CyewZzkmV5hOwzKlaGGTfDqAIqs1pVs4qr44LJzrAZiXo7jReuUL1dhGR400nmLuN0arog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: suse.de; dkim=none (message not signed) header.d=none;suse.de; dmarc=none action=none header.from=suse.com; Received: from AM6PR04MB5366.eurprd04.prod.outlook.com (2603:10a6:20b:9d::19) by AM6PR04MB4982.eurprd04.prod.outlook.com (2603:10a6:20b:5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Wed, 15 Sep 2021 11:35:29 +0000 Received: from AM6PR04MB5366.eurprd04.prod.outlook.com ([fe80::e9ae:619b:1fe9:46ce]) by AM6PR04MB5366.eurprd04.prod.outlook.com ([fe80::e9ae:619b:1fe9:46ce%6]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 11:35:29 +0000 Message-ID: <5cc69e75-c548-3b08-175e-977d5707116a@suse.com> Date: Wed, 15 Sep 2021 13:35:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.0.3 Subject: Re: [PATCH] rpi: Conditionally add simple-framebuffer node Content-Language: en-US To: "Ivan T. Ivanov" Cc: Nicolas Saenz Julienne , Peter Robinson , Marek Szyprowski , Jaehoon Chung , u-boot@lists.denx.de References: <20210810143114.32329-1-iivanov@suse.de> From: Matthias Brugger In-Reply-To: <20210810143114.32329-1-iivanov@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MR2P264CA0109.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:33::25) To AM6PR04MB5366.eurprd04.prod.outlook.com (2603:10a6:20b:9d::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.0.16] (37.223.140.66) by MR2P264CA0109.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:33::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Wed, 15 Sep 2021 11:35:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 612cfffa-3a5b-4fd9-16f9-08d9783ceb8c X-MS-TrafficTypeDiagnostic: AM6PR04MB4982: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YXjp+bd/k9tHRxSEhyRcHnFldAqQlyyZQNSn7XtSXGHD/0J4nMnERetbiC85QNKMu18P/2EVTo70F78Qsu8isyF7xGL2c+g8/8hG3yB6GGH3pk+Qt070F409sW6IPpaM9MGOQ+OdQWFoo5R4DMHmsharHcWmArTQ44XtOFxeX4bCasgfpZvZBm5QP2zzNxgc0gExNPDAjh4qEQLn5CnfCnzpwFubR2QCfOmhLXj5FbY3LlyMQoAzl33Rowb89F6cj2G2ijsjejGK+3zUURhD2tBxj/Taya5tpKoyxJkA2y5QLO6678Z0sVfhi62oJopHbtNJxEzju7sxQbMacWQi3P7ucigrd3aw8W7TF9om9RXfHKWoch0o/LlOoqp/ok5t59aM1Oy5UvvszQextfL9DpHzxUgujCoTH2k6vLFdf0P987yPGAFn7mhkFUUIZmZGR/eeMznUyOZHpfj+KB5UKls2c6EcKFAC2dbsvDZRnNSQg6f7LtobME7onnO5/Pn1P2D/fevPHv6xoONSBFToNZDimABKhOqyGyMeS0xZYtuNKtowYnJi5m5geKvP+DYXRANJXNz3xl+lSwmN+IJqenhxFUN6I6+ZrzFO2qFhUxkFP59PiGm5UvPauxJbUeTMZK4oUViEYsPkf/Nxf8xKdrEfDC8fBlVbzlOyxdAcy56924DvOYxl/EJ3w8nMYPJ2YFxpi67xl6SboA1QBeJJLmGyFh03m5qB35C+lVk6sLI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5366.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(396003)(376002)(136003)(39860400002)(366004)(478600001)(4326008)(16576012)(5660300002)(316002)(66476007)(36756003)(38100700002)(54906003)(31686004)(83380400001)(8676002)(31696002)(8936002)(86362001)(2906002)(6916009)(2616005)(956004)(66946007)(6486002)(186003)(53546011)(66556008)(26005)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WXJMekxVVWczT2VMeVVTU3AwQk0xZG5yYTdPaWpxWFZZWmtDRmNRMHZRcGJ6?= =?utf-8?B?RFFES09zQ2xHb0Rib3ZVdWhiRUdreGd3eTdIT0JvNUFkNGl2SmZjRTZGc0JW?= =?utf-8?B?SFc4ZmpGS29CUWJXSmZZWWMwTE0zOGRydDJnakNFdHFQY3gzL3pCNUkxVllu?= =?utf-8?B?aGFVWHV0aFVkMjJ6STZqMDVJQnk5VlNNajRNYVRQanNaYlFibDNCU0tScmVJ?= =?utf-8?B?S1hEK3V4NmRXRmFvdTJxZnc1Sm1sZ1BEWU83cmRlOGpFYktMVklyclVvcGQw?= =?utf-8?B?TC9WNVlabGxzODRTQ2xHTk5VdWkxMHI4RHFlRXF5ZERhQ3pMS1pZVkhBazIr?= =?utf-8?B?NEg1WXpUUDh6c0lDZEJFMGcxbE9id1gvNC9IOXVOZjI5M0xiTndEcVhtNXht?= =?utf-8?B?cXJ6N0M0UmpDb1VDdWVhT0kxOGFEZ0w2TDRXMlFoenFjL3pJbEhjYVgrRGJS?= =?utf-8?B?dEkzQTNDWjJudjR6WjZ1Uy94SFdMVjBGQ0pTWEJuU3VucFZzSytvOGFxcTJ0?= =?utf-8?B?MnB4a2RRYk5wcFdraTJYdGZYZmV5MzV4QTV6LzVOdEk0YmRORUlkY3B1OWs3?= =?utf-8?B?bTFBNU9uOEdVYnlSbHdQRGovVEpsbDhQQjFZd04wYXBsenVtOHkvMHlUN3BT?= =?utf-8?B?NEZqR041QXllbzlXYmhwemhjRE95cmlndGQ2WlVrVWpxUiszRzlzK1hUQ3Q2?= =?utf-8?B?aVNmS1pGMGVKSmpLNWFwdE5FS2d5a2U3RWptcEswd3BoZlNkZlFaWGg3SEhz?= =?utf-8?B?Z2MrcWYyUnFYVFBLb1FWMkNvM2pkVVRBL1owdjlpdnNCd1lYNk1TVnJuMWxq?= =?utf-8?B?bHE5YTM0Zms1MEtwQ0R0WnZYOC8wdDVBMnRCc01TM3JKaC9LK1RBUXordGxh?= =?utf-8?B?WGl0bjU3b3F6ZjVsYUhWVkpySm4xSy9OeHUyMVFUS2JMS2xkdHlqZVR6LzBS?= =?utf-8?B?RHhPeXJITG1lZE9HWEZWay9reHMzalY3K1RocG5KL1ZVdDF3NVhtMXEwL3dz?= =?utf-8?B?a3hFTVZwL1FJcmg1Rm4yWU0vSGJjUGl6U1VLRWhyMTltVjlZbkY5cUdOZy9Z?= =?utf-8?B?dDlldnhiWEhvM0NnS3laWHhqcGIrZlRkd2hHVFVmaWtuRnpHbmdRaXIveHNV?= =?utf-8?B?aUVNZWp5eGhPNFQ0UVlTemxjdjJnVmx5N2UyaWs2K0l0Vlc5SVZ1YkNvaFdX?= =?utf-8?B?dGF1bll5TWltYlk2NkZiYk5EQThoL245T1ZGck5TU2doNVZQYk1makgvdUpH?= =?utf-8?B?YmFvTWk5V3llajJ2REdURFlTa29pTGkxQ2R0TUNGWGNyTUdpcGpHQkh2aURq?= =?utf-8?B?dVJOUEhmYk9iMFRLT2xXWmpNd2EzRVlyd0Ixb25pTTB5ME54cWVjUjlyWUEw?= =?utf-8?B?RWN1cUEyc3NodG1ZWjhRY1F3TWhnTTNSZ01WbXl6Q1Vwc3lubFhIaDc3VC95?= =?utf-8?B?ak9BYTA5a09xM1h0RnJnOGgyVHZjUVZwTTFOQlplMmllT0c4M1NEc2VBUEFI?= =?utf-8?B?SkdnazBPZVpGNXl5RzVpQWlFM2xPVllPa29OYXFUMDBiOG5vVGNPd0QxNkgw?= =?utf-8?B?N2JhcUowS3UzNWhFajdXUU1UdmJPWlJjTkkyaTR3aG9LMlNkUUtSam9NT1pQ?= =?utf-8?B?R245M2ZRQk9lcDhOTnRadS9INFN1bXcvU29BS2prbFJQN0tJd045czljYjRj?= =?utf-8?B?REZmVkt5cTQ1QU5BNTF2UitmaUgwcXNTSVg2MEdhaFRvemRlajFtdEEyd3dG?= =?utf-8?Q?r3kvn/guKy4Fp9r7bgont4/uHD8aqUcuv7Vn5+k?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 612cfffa-3a5b-4fd9-16f9-08d9783ceb8c X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5366.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 11:35:29.6282 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iy+tJF8a7neqkz5ElL0BFXv2wIbOYEhFND206ubyZvEDBrEbaZcYneBkrxluGTv0bH+iudyMKwci0W0L9Pkp4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4982 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean On 10/08/2021 16:31, Ivan T. Ivanov wrote: > It appears that RPi firmware has already added framebuffer > node under /chosen, at least on RPi 2 versions. So check > for this and don't add duplicate node. > > Signed-off-by: Ivan T. Ivanov Applied to rpi-next now. Thanks, Matthias > --- > board/raspberrypi/rpi/rpi.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c > index df52a4689f..372b26b6f2 100644 > --- a/board/raspberrypi/rpi/rpi.c > +++ b/board/raspberrypi/rpi/rpi.c > @@ -497,12 +497,11 @@ void *board_fdt_blob_setup(void) > > int ft_board_setup(void *blob, struct bd_info *bd) > { > - /* > - * For now, we simply always add the simplefb DT node. Later, we > - * should be more intelligent, and e.g. only do this if no enabled DT > - * node exists for the "real" graphics driver. > - */ > - lcd_dt_simplefb_add_node(blob); > + int node; > + > + node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer"); > + if (node < 0) > + lcd_dt_simplefb_add_node(blob); > > #ifdef CONFIG_EFI_LOADER > /* Reserve the spin table */ >