Message ID | aa0e6927-e35c-48b7-b3fb-785059f48910@siemens.com |
---|---|
State | Accepted |
Commit | b362ceb4896faf37130686357df7e821fe96421d |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=siemens.com header.i=@siemens.com header.a=rsa-sha256 header.s=selector2 header.b=nlfaI1mY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S1JhC3N9Mz1yqD for <incoming@patchwork.ozlabs.org>; Thu, 5 Oct 2023 15:37:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 277F286E4B; Thu, 5 Oct 2023 06:37:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=siemens.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=siemens.com header.i=@siemens.com header.b="nlfaI1mY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C159186E57; Thu, 5 Oct 2023 06:37:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::622]) (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 DF66F86DED for <u-boot@lists.denx.de>; Thu, 5 Oct 2023 06:37:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=siemens.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jan.kiszka@siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G+orISVbxTkpHC4Co9AU67Gxzx5lOg3du8g0IgPCg0KnCJ/btBjkWG13XbFPWDDImkcLNYwHgmqcYTUw8f4Sy6lyrNWBdw6Z1N+vUHQQK1+NHGKebCaxv/N++F4VB/Psd40JiPr0m80Y+GcHxK7HJEN1FDyu+WKqUT2p2qCf6tkgiv/BWTbWpZEkNZIIu24P8Wmpc8jI6Pulfib/9oHYYSC9DqQbHOzFBMsDLaO8FOWyNCITgUx4OZxKYdi0DLAb9XgWPcbVqZhrtVfs2KbaPL7wlL02d9iu7cUsRDg4YSuZjr2RoHHdqchmH6S5dwCWvwLv5nyxToq+2ylitqfu5g== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BvW+V82KBXTylmoLDvEaplstHvuc67Clhu0P8iSjveA=; b=B/vGJhfeBoFL6MNfpeiKZyOy6QFBDv1iLY6FiN2rkpfb9xLrfKOpdKigRXQXRyJdxUrPMNtj2mOGQJBb49QYsQqFmQXkwzUHECO6WBUNBR06vu2js/dhaIi2DquE2WZfihjJDyemUAkeSI6e2lbzteQfqELeevnKX8lnfBc8Nx+45VagiLOA0FqlSJrWXEfFA9SfyQuzO+0UhuFMyHNiFHgGvIp0qQoi/4epFldzoQq02IeMITiogCiizrsfxj9zkgQZIzybSRFdRa5JYhJmQjBWUguEw92eCjastcaqQiyFmZBYVJkdgrZ9vfwBzRw/ySHdkcaxhxYNZaUJ0iA0Cw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BvW+V82KBXTylmoLDvEaplstHvuc67Clhu0P8iSjveA=; b=nlfaI1mYA3qb6sY9Kz8yGOPdKipHM034Ib66V1yGSJqKiy51F3W8X2+oyUowLQokxbfAJ8kMd5kGOIFDFgQ+FTb1SAYX1ZDaG50wPJvz5cHs0HTI7iPHbWMvLhXtuCafnhg3x/+XZKSNiiGhx7eEjZ/Mg0oK1HZv9sdFb4XDCj2Rl67+HW+FlSp1a0MNcqLdQ8eEKiZCZvsN83MaINhNd4HER5BYxS3NEFOJv43K+/f6iDM+3DPfmwxGg3MvWFRsmprpKusTpDMOYW/rEd0vFGR3kOtVxlxg906zUhl+hDvtpYjARTR7GbElZAvh68lKXkK0dfEky7rkh/huFyKxuA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by PAXPR10MB5614.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:244::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Thu, 5 Oct 2023 04:37:25 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2%3]) with mapi id 15.20.6838.033; Thu, 5 Oct 2023 04:37:25 +0000 Message-ID: <aa0e6927-e35c-48b7-b3fb-785059f48910@siemens.com> Date: Thu, 5 Oct 2023 06:37:25 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka <jan.kiszka@siemens.com> Subject: [PATCH] board: siemens: iot2050: Fix logical bug in PG1/PG2 detection Content-Language: en-US To: U-Boot Mailing List <u-boot@lists.denx.de>, Tom Rini <trini@konsulko.com> Cc: "Su, Bao Cheng (RC-CN DF FA R&D)" <baocheng.su@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0109.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::8) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|PAXPR10MB5614:EE_ X-MS-Office365-Filtering-Correlation-Id: 08ebfa69-b353-4fa1-ac8c-08dbc55cc62b X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QyrsUnfEZ5f6izP9zPp/YIFUUf8iXO1/ri4GKIP7uuDaEJQDbST9XSNrw2ueI6dj4qlevvpsBHCbhGiir/Q3rW+ueoV6CjZ9bd+eQ01zCdBiyLeiYjx7KJChDXXgrufpsufHK9+nNOjcZGPOAFw70HONXx/OqUiqC1IGXXhTSn9i5jsubQMbQJxsgkEt3hUoBNmIzuOF19ZRYKpeeBFWwkym9/YdPJ2oM/o8ffDP/s5PY9PovD2aAtwRIyDUZYNNPmiiansR38H/qPheBiMHk9nUI7bhWd1fOOo8sdhaRING0XuOH07pETCuze9Xn0E7DS8Nkk46I/8n8Y9juisXEEQL6Qu0yfa3SJLh/h+WiXbqJNoclJGQ1vVuABg/QdrRPhtiBB7UqGHorjsOnbuaogboCKgm2I/27yIFsm0TyL+E9PYmrLWAZ8d3dph8aQU8P4i8mfXIbJqQLkFB2TuEdF7tgRKQxipaJ7q0l2oM/cE2nWU2M/MOW5aVRuT+zBmVcYY4di4hVAINccdXK7KFzxy6hIDyNpTbgiDjW0gOJ4uzIflKCyElg0oWbkOU/sJX5SkG6wRVF68gj2HnCCEsJAGEupGU8w33z1WdrNf/wM9dycV7Nib33POz5Lb5y1r+MQeK9XxzBAfXmeD10eKt+g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(366004)(376002)(136003)(346002)(396003)(39860400002)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(31686004)(44832011)(5660300002)(8676002)(2906002)(4744005)(4326008)(8936002)(41300700001)(2616005)(316002)(66946007)(66556008)(66476007)(110136005)(26005)(6506007)(36756003)(107886003)(6512007)(82960400001)(38100700002)(83380400001)(31696002)(86362001)(478600001)(6486002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?d5X69SetguFZqJ0lYDLKJziMRW5a?= =?utf-8?q?fx5KvFzoRdEo5dlt1zxrjzScV4xVU/N9nWrPsnWU9Lsk8r7r7vUqv+WIwpgIWvnau?= =?utf-8?q?N+XElDcM1GRhRlQc2gDNXKl8CFkoGCjggIUYTjR68+2sYZI35gcyi6Kwy21QG+RfK?= =?utf-8?q?lbfN2X9cnhIV45bb7K2uVgd/vcGo3azHP5BdE8mgy056iqV9wneTpSKaTz26pX1cb?= =?utf-8?q?7See0USbHPmkbO7fkVL7J3R9leU5JnKpKg/BPDS4umqPERxOukE2HTj8gdDWasr11?= =?utf-8?q?pthxbQsH0lpGS/+Myl7Qj5Oma4gEPsYYxE0N6RG6z3MeFnmNT0bcOEbMg5scJagDl?= =?utf-8?q?pM7vPrWtkY1SPnP8nWrWP6yd1IsLni0U45IxQfqjXrUWdMdrjSyWl9hTYADnevQJw?= =?utf-8?q?iY30EzNtJSXZV+CBuAw06cNHlJP2T5/NZfWxK3T+DSssr64iKRxmNZcww8zXA/T6C?= =?utf-8?q?axT2UqAHMGRjbvF3mT/mv4Lzlcw3UzC5AVnf5R3pVvTdqlTO/LZUPCwTPPfgoGNvF?= =?utf-8?q?JXC88TykAAd6hNcCJebVTKzSC4zpldsbPbLvQDPqmvOdeH9647qApiquRzuXj3h2w?= =?utf-8?q?oskJcYOReNzIAntxWJmCsOvus6VXO+P+IQnw+Km3DdDL+O2aPWf6x0T3OjgMfzk6J?= =?utf-8?q?K2KcmWmWQfkxX8hnORDLy6uplbJhmGEEPi4b72/A4xyxfucwq3G7jjdDb7Z7bgYH7?= =?utf-8?q?yDFqHkvc/ObcsYzNKr/PLR3HVTFM8GuFIw3pKf6+g9rvj8sYzr8EOETzncoHBQUJM?= =?utf-8?q?M8jemTkPYjFOcCStBCFSUjRwinJx3PrxHTUdDstUG3eRUKp9mRwtZOvfCp+4BZm2e?= =?utf-8?q?nzYuRE6efbOqYHKZZnzIHluSTkf9JrwQWwuRuuh3YbSWxfw+3alfdPvf5JrvrE9au?= =?utf-8?q?sTaKTBxtCQkv7gfN6iXW65veKDSnFceB3LCo0PIei/UPloTv7INGEAMBUIupVVEpQ?= =?utf-8?q?1g9QeLzHyZAo6mEAbzINxENyy3Y7VbHBGDBpyxun6vIg5GuFyFhVTC7IpZlr6V6oh?= =?utf-8?q?/7B/nIVL9JPAxKX3x6Pj64IbOQVmAJKeBwP4rlyUyuSbzvzSid3/pvrnIB2aBWmWg?= =?utf-8?q?XcKPLp7uQluF2O3sdDBhi4yQVpD7E3po4npcjcQ6oUCkamn2tV6jMbAnj2roTmNrG?= =?utf-8?q?ltyLflYKAysD67PSIl/YXLuIkEPAjheX3uIj02YrZy8El8VyGqG6wJq/urae8jpgY?= =?utf-8?q?T34/GeWqy1PaUYj89qy/1IdphGIWt5m00+tYE/KogSwmgQ1icegUt3a1EyM0pgWop?= =?utf-8?q?tOHJ59CN5HUx4K+vqvAmfxzYDAejq+eyEtDHUFz/SqefaEt5lRvaJig/oXFnvw5hX?= =?utf-8?q?p3m1oTlZ5PWR93Ld9L6Y89ohYyNBZn2vid361JP1//HHDr4R6AaA7JCzv1bVqshL1?= =?utf-8?q?txHrpB2l1RoSzjNK8CCneCGgw+2iQCu1TXZsQ2aHxkQoyy/Rej0+XLGNVTFZhb414?= =?utf-8?q?2+941ERiFrKwgcah3TuQD+nLMsFDB5Sy+5Kd6ffCZ4bdWat3FoZt6OAJbOcYT8Ltt?= =?utf-8?q?dMUp6GGBj+WQkFVq6M20gisjA5LMmKLtzg=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08ebfa69-b353-4fa1-ac8c-08dbc55cc62b X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2023 04:37:25.6540 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bZ74J7JgFV9AOZya+fvV1W5sWtlsVk+jJvzLKlmy+YVvG6CI1HO07P+DanfOqpEx0Ng+Kkpfl/g79Cb9FUu2hQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5614 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://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>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean |
Series |
board: siemens: iot2050: Fix logical bug in PG1/PG2 detection
|
expand
|
On Thu, Oct 05, 2023 at 06:37:25AM +0200, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > This caused the wrong fdtfile to be set and was failing to apply M.2 > settings. > > Fixes: badaa1f6a7a9 ("boards: siemens: iot2050: Unify PG1 and PG2/M.2 configurations again") > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Applied to u-boot/master, thanks!
diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c index 15f5310c7bf..e35e55fb5de 100644 --- a/board/siemens/iot2050/board.c +++ b/board/siemens/iot2050/board.c @@ -160,7 +160,7 @@ static bool board_is_sr1(void) struct iot2050_info *info = IOT2050_INFO_DATA; return info->magic == IOT2050_INFO_MAGIC && - strstr((char *)info->name, "-PG2") != NULL; + strstr((char *)info->name, "-PG2") == NULL; } static bool board_is_m2(void)