From patchwork Fri Jul 8 09:25:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Barker X-Patchwork-Id: 1653971 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sancloud.onmicrosoft.com header.i=@sancloud.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sancloud-onmicrosoft-com header.b=Bk4xG0/I; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LfSZk2fQvz9ryY for ; Fri, 8 Jul 2022 19:26:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 339E58459A; Fri, 8 Jul 2022 11:26:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sancloud.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=sancloud.onmicrosoft.com header.i=@sancloud.onmicrosoft.com header.b="Bk4xG0/I"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FFDD84557; Fri, 8 Jul 2022 11:26:05 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from GBR01-CWL-obe.outbound.protection.outlook.com (mail-cwlgbr01on2134.outbound.protection.outlook.com [40.107.11.134]) (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 58E3784590 for ; Fri, 8 Jul 2022 11:26:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=paul.barker@sancloud.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j9d4kzaAto/Pjzcb9oDJydjX68j5XYhJ5vYBDglTN5a16xmsAc85TDm26bUp0REOt4Oa/2rn1kmYHa44p4dBGJYZHbjP1Do+GfiALYC+Kk5O00EEaG4IGp4itrV+ZIo2YJa7G7XW4UINesTP9qOYqQ/v9pRWZRTY2OYrvyDZv3Qgo0MRUOeSdwtPSWqHhCTffn8Eg4mUm4+WMblMALy1I/gGN6W8vD3GaBWjSIvXAc7UZOC3aVPhQxHq2Yl87y0sglKVrrqfmTCNgxB5BoiVHixfMpSCqWcLvHJVgrK6Le+FMqQI9WYtZ5bKMy+uraCkY6yiOou8Jl/tnDkpPUFkwA== 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=egiBtnLR6nl8MpPBOf9rUYKxab3eTSdmaPqFdxl+MVc=; b=FvxsD8L1RoMj/q8s8HyXAs9/QCdxI6yHTY22rjfyxuZoOkDa4Rxo2GtU8OU35/wNY0wCRDFNU5kz8tHPa7rWtaZhnthVhzGWu1mF29R8nSgMKZNH+LdJyRQLjC2ec/bfPgfCbrC1t8uscmt52YK9achs+gA6TgWMZC7fSJuvSkG+N7hgXT/2aN9M1bHxoqiYRkuE3XWu3PaWnQra2PS06sFyLSjsGBhYFRA0sORQF2GGgftafdCheqegeSoDlCapZ6zyVjAzU7bPxZXEFjZ3A7Zi+RD+b2VLM3vrzeSFzwQiDSoZgAcy6TkjkMPf2Pe8+L6YxdClYHoUzPm/zxWPTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sancloud.com; dmarc=pass action=none header.from=sancloud.com; dkim=pass header.d=sancloud.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sancloud.onmicrosoft.com; s=selector2-sancloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=egiBtnLR6nl8MpPBOf9rUYKxab3eTSdmaPqFdxl+MVc=; b=Bk4xG0/I2JN+NhSI4Goj+UEJ6v7uLCvvaSRaxbfT0POn2pUuOJZHLfnrupBcDjxV3movVu9lq6vkB3jg1kW20t88LtVKsUHcy8or3bNAP8jrHQilkZUJ8avLtwfFqMIU/7TLbKZiDYVVCChatTwNoqHSKWZRmpBt3CNWKXALLwM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=sancloud.com; Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) by CWLP123MB5244.GBRP123.PROD.OUTLOOK.COM (2603:10a6:400:14b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Fri, 8 Jul 2022 09:26:01 +0000 Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::ad94:b050:c1ee:fce0]) by CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::ad94:b050:c1ee:fce0%2]) with mapi id 15.20.5417.016; Fri, 8 Jul 2022 09:26:01 +0000 From: Paul Barker To: u-boot@lists.denx.de, Tom Rini Cc: Paul Barker Subject: [PATCH 2/2] board: ti: am335x: Use correct dtbs for SanCloud boards Date: Fri, 8 Jul 2022 10:25:46 +0100 Message-Id: <20220708092546.839914-2-paul.barker@sancloud.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220708092546.839914-1-paul.barker@sancloud.com> References: <20220708092546.839914-1-paul.barker@sancloud.com> X-ClientProxiedBy: LO4P265CA0236.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:315::15) To CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9be4162d-01e9-49ff-0ca5-08da60c3dfd2 X-MS-TrafficTypeDiagnostic: CWLP123MB5244:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xIibZvlvrKVoTN5AgmzKc3/fcp/ruPm+Yficeb5TQDLdG6l8MwnGYyRGJRwbHmeVSuDPupr1DgbSM+MIYX45iCZiUyAv6GL9bxiBEozQC2sa4Fv6DhVWCpNiHM2rXAhQa4sXS1VfVLoiDPLmGN5obZDmdSzEx64i+iFI9zosX7Hp4Gc10yfgjruPsOWc+7MyqlXJ8D06D0hzXkOD2hVOgLQZwFLdv6U52f19zPsReoTDhLUFbV4z+Qbkn4ANJZ3JU9Kfy6i5yRwnjjRuFpeScn2s/VqWDtyHmvvDcojT3jcYrzu1/A/GA318ghXmgS55zq6S2n4ZyrgdFN8xurtXZatxDTqMRjdSsnsXvS52Tww1I/zVvzRltSr5qYJ4hhGEdryoo9ZJ8hCcia6dXQeYEsV0j79oK+3ezpTAyc0sWqAO4j/GfZmbRaQkUOqLTTqKhEoCsiwQi8Tj56WIt87ZwhQx8aOBd8hLtQp2LjTxR/shCHxqqrsmV68YvyC2tfivc3KGN9mfxbPyaXWFA7vGnK+NwMghfmKZaNv8aBw8TIwrCiSbS7svq7OjDNTVKDtLT8U/7dtTd+MR5swzKF/Pr5p9nGoTRJHyHqWow0lCBquZ3oFTU4FhRB6/WlmnkX7B9x+oX4HfzT2pRXC3wdA66e44AZ/47mJU+eKpvKT4o6amPTobaMASBz1R7w4Ef/LLOOkQAY7gQFdcsFZ5rfvXk1JSihyiRXMOhXJIVfWH6vzl8bMREjr80Bl3/odsNwNlsP0CDexeaFGxHoBBzyNIoutGBO6HbBkKxgCkgCJoQy1se8ZagrliUGij5YNpKA5F X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(376002)(346002)(136003)(39830400003)(366004)(396003)(2906002)(6486002)(52116002)(1076003)(83380400001)(107886003)(44832011)(26005)(186003)(38100700002)(66556008)(86362001)(2616005)(316002)(36756003)(6512007)(66476007)(4326008)(66946007)(38350700002)(478600001)(5660300002)(41300700001)(6666004)(8676002)(8936002)(6506007)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ss3p4JW9sSmwdGTxgQb2515NDuu9jsgIIPr1ocnIO8xLsEr3EJnaahQEKClquc56I3Bqi2r17TfnoLGGK6VFwS/xxEez0Xm/1U+bl+xj24pff2IMXj0T9j/NvnFuHk/oZfPLrI3j5XQWheU/YFROh4yxiQxpxDxiWVK+Gcck7Q3InylsBhR3RCk2E0w1sENxtTUnxqPPtwkSOcalqgtzsTjjPX2nEQ4ChmQMakZqEfwQ0yN5CxZup9+RIT1I5c1gaEgjNunL/uH7qwqBZ0gYdx6DsvFmAmaTXG6zSqZ4UJ+K/iSciYqjRJV4UdHvavTU5eS4l0jdpgTEWA0UjnX12tPGtu5R2kP7yrY9M844V3Ol95fUGm0CVPs5wwEg4z99ESSCyPn1glfkZOAlO5rXZf9ReA4T2PSuuOcOQ7YrjZ/NffOfs06c3UrnrAT3zjZByMC48wUvZAsM9Zpz7qoLzasKPvhhEJGSzK4MirTSxsgm4hsGptffJIYiMPqDL80IMjOcUJ7mwMzFf9dY6t0Py33XZYbTofpPoyP5oiLpuhmXzF1Eexxd6/66sArvz9WzKqHf4BMeH7/Gn14QWzOlwPRPX9KIIE/MVJKrAlKoSNQV0JexQooygevnqxxk++vKrulZUhRZzfU7tC4KnrK8Qj1J1ixHb8icFlbGQ624Firqyij7COnWJutT4m5F2dF0TYA1reRjPZSLsxLVWl0HAmdWwNcA9+f/rJKM8LYBB4KS5MHf89lqIGmQ8rN7X3W12ShztMv/lF7BTDRKLv2dgyGlMNSG6qTBw0rRY9b/o3Blm8N2fTlLKGCl/szjv7wQfUmvhJmDAYxmYGwm8GHi5LozqhisHr5BIxC+accK+YlKYy4ta6ywbagCmlkV+mc4DXObTzEq8aO+LLNpPSr2a4X1iLWZDDmhnAGeoMediGbFUjGDRMfGe4nxQz5Kcw3pm43bwoVdB8QQ5jcdk4ErG06aY9CF1sMW0LhJeptZ5qL9uIv+QYJDJ8nLUCO32lUZ1g89O0gGOPninBPLWxcqBlAwOf4PMfCh0pz8ZpgDz6w3LBrOE7kLgKQ0KrvSCood4ML1ND5/mRurvVMEnkMZt0rtH5/TAxJeLBhO0Vg2oimp0qe77NM81ybJViLphT3cU/OS7daW+lvPwIr8V++38oEtGIdfd9fUCRLAWNF0p0VARz8FLM0/wVGIEfiefe2lBjRIJ+FY3og8UB8PJqe7FPfGCu7L7qVHU8Kdv3L4zp0wxStzEYk12bzQD8HVtRlqpKVLew750JUfE0xI/npbJ2q3nWgnvw0EXadbv5NM2mBz/OcaWDiCGyRUKmPDUHOpWqHDKMVPVN5VtHfhvKx3Zc3YcR8+3NBkoUwFiIg7jDGmJH1oCygEa71Xv0iqLuxL5lefffLuHfX78Ov8vi91rK3gVpkhRT+iCVGUIcTWYYbKCQTWVAyzEj6jDtLWH70mZ+0/archHxJv2U+sQyMCxcDS4XkdTWOy3BB8bhbRlHOfPg4yXrWvg+/23ooSanqO5Z8KL4BWZ9p7UH50Y1b2rGT/As0y/yKoqa1S17ZdXO5365CrTQKeLnMISbE7bvTRzWEqSqYg/8voupvqKfOBsA== X-OriginatorOrg: sancloud.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be4162d-01e9-49ff-0ca5-08da60c3dfd2 X-MS-Exchange-CrossTenant-AuthSource: CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2022 09:26:01.7570 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 840be37c-244a-450e-9bcc-2064862de1f4 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K9WCiT1RFCBG2o+qKZw5b94UJOByqYORwXHW8OtXdLSDH0ItOnVFqPlsIpO4lvzlW3FKTzFMOw8+15QaDTMEJ9uqcG60cR3LRBYHcQj7g4k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWLP123MB5244 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 We have different dtbs for the Lite and Extended WiFi variants of the SanCloud BBE. Signed-off-by: Paul Barker Reviewed-by: Tom Rini --- board/ti/am335x/board.c | 18 ++++++++++++++---- configs/am335x_evm_defconfig | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 2cb5b1cb3fc7..b97fedddd5e2 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -966,10 +966,20 @@ int board_fit_config_name_match(const char *name) return 0; else if (board_is_icev2() && !strcmp(name, "am335x-icev2")) return 0; - else if (board_is_bben() && !strcmp(name, "am335x-sancloud-bbe")) - return 0; - else - return -1; + else if (board_is_bben()) { + char subtype_id = board_ti_get_config()[1]; + + if (subtype_id == 'L') { + if (!strcmp(name, "am335x-sancloud-bbe-lite")) + return 0; + } else if (subtype_id == 'I') { + if (!strcmp(name, "am335x-sancloud-bbe-extended-wifi")) + return 0; + } else if (!strcmp(name, "am335x-sancloud-bbe")) { + return 0; + } + } + return -1; } #endif diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 30577a6fce42..3f677a2326c2 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -45,7 +45,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle" +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y