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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 874B5C07E99 for ; Mon, 12 Jul 2021 20:15:03 +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 01BFD61245 for ; Mon, 12 Jul 2021 20:15:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01BFD61245 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36C4282ECC; Mon, 12 Jul 2021 22:14:45 +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="H4mjL0kV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0EBF182E8D; Mon, 12 Jul 2021 22:14:41 +0200 (CEST) Received: from GBR01-CWL-obe.outbound.protection.outlook.com (mail-cwlgbr01on0710.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe14::710]) (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 870FB82E41 for ; Mon, 12 Jul 2021 22:14:36 +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=Rfl65zzIq55SBk9lOhYx0RYhzbdag9b1SJR8b+XQ6x/Wu7CNPlrY7Wy/b4MKfpTmCUm/LURh2INXWSayPNSvmWkgipcW8cCMJQTWw1hprSgRk3cZ2SHtUiEXTkc+P2MBzIWxg2Deo4EvQV3OMtn7qKOSq5CYci2CNBvp/WT3S5k9FrkTFW9tC481lR+nxFWzNnFn32MnfK7fBmoaYG2GqnQ/cutLMOqxnf0LT0ykmsJN0h/8PnnVXvgkIVU80C7yaJGcN75C3fxcHHDeVhDLE6STYQi+tKIrasVcrjHkHeRwgpgLdih7PraGxZLKBWQYm0YaQKfTp4c923vGkiVXbw== 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-SenderADCheck; bh=UVquP0FMZYLsuVuL0jH0Uap1Mi38AKbNq4m9hITdSbk=; b=R1eWfWu9j64st2/4wPHTaB34hlSxHB6FnHHG+Wrfzkt1CYZToWCX1jGd2dd0/QQ7HM6HxmI/wgu5Gli6gz1oQC8W6E5vDJe0Rsau5OXT5HPrIZWuvuEsLSv/6bVVvQEYD+ysBjOdhXUmtT70TvrZywzJSzEl+4vrByI68g3/UBSqUZQUI2otFS9DKhrTX1Lln3mArPxNm5+pStBN3htDBoCf1Bzu/7jwey053eG7lm1efhXnGQKKAcYWuHfE+AW9nhBtPmSyKJ84KVWhC+hhar1HWdQx6goyWAMY7dF7PcINCu+EniKw7Qt6SrRst7yZaIUEMcG88JdqFaqHbOj8/A== 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=UVquP0FMZYLsuVuL0jH0Uap1Mi38AKbNq4m9hITdSbk=; b=H4mjL0kVbrGJH+ik38VIx5chuu6R46PsNh/mtSgm9cD+OUwRHbS2S5hgi0e/V7unmoQVyQX84+sxNuvTbaZJC9VVwJgzuCJPYr+4R6AMI+9ZhjD43X63h4zBRz3tMoFC0xsQkTIKcRcuVCecNHxHPkoCPPbv47EvmQfFDA0loZ4= Authentication-Results: konsulko.com; dkim=none (message not signed) header.d=none;konsulko.com; dmarc=none action=none header.from=sancloud.com; Received: from CWXP123MB2248.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:7e::18) by CWLP123MB4417.GBRP123.PROD.OUTLOOK.COM (2603:10a6:400:ea::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.23; Mon, 12 Jul 2021 20:14:36 +0000 Received: from CWXP123MB2248.GBRP123.PROD.OUTLOOK.COM ([fe80::6120:17d4:90c8:fe4]) by CWXP123MB2248.GBRP123.PROD.OUTLOOK.COM ([fe80::6120:17d4:90c8:fe4%7]) with mapi id 15.20.4308.027; Mon, 12 Jul 2021 20:14:36 +0000 From: Paul Barker To: Tom Rini , Peter Robinson , Lokesh Vutla Cc: Paul Barker , u-boot@lists.denx.de Subject: [PATCH v2 5/5] configs: am335x_evm: Fix BeagleBone Green DTB selection Date: Mon, 12 Jul 2021 21:14:12 +0100 Message-Id: <20210712201412.13306-6-paul.barker@sancloud.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210712201412.13306-1-paul.barker@sancloud.com> References: <20210712201412.13306-1-paul.barker@sancloud.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0267.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:194::20) To CWXP123MB2248.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:7e::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from owl.home.b5net.uk (80.7.160.81) by LO4P123CA0267.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:194::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.19 via Frontend Transport; Mon, 12 Jul 2021 20:14:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed1bc72a-348a-49ba-cd32-08d94571ab4e X-MS-TrafficTypeDiagnostic: CWLP123MB4417: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2wfhXf2PAZ5GCQ6R1BnVIcPeZUQrqFatAwFZdNrefG9KmxKvcHctSv9mle0X3zMoJfkIV4PquWqGiSqFiTO/vTbk37gbmEZPObzP5sKNDTHTzPi5LOUjK0iJTCTDkKnfQgU4oCyBEvMMmO85LVByl7j9O+X9MsqvySk7ZYwB1gcEy72oB+zOvSSL9wiFvNFfLn2NF4w6SZCPf2kXWtXGiMEi1abeKSe4yjWvr9OyQdV/0VXk3eWClDMg1TKijNAbdwOSpn8KdgidchKPjp6D2R68orh6NPKt5ZX2w3GrqimPKtuUMCuFYffez7J1EQFVbW2CoO2QPa3H10ewpogSUpAhc0l/Exc/Y0KrmHB5Nqp3ePoLseKB8S+LjU7UO6gPy5itGimmiqE5RQUHDrOQ7V8TpBpX/qvZpgrpSRXk4fAMxrmG8co3yaON+Ba3uva/9yTwvnrEU5UGinqgYVE/7KY84uXZp99GPCkva5vDzhf6/dn4otQnFxQbSgMOqFzj65csTrBdVc8xTCClmqNYqleV8S1hw905mB089qNCe0i99L0kkKK/SGKj0OJSUc1QjaxoZ2jXH6vxGJik8gFPBwF3cspupjGlzx0H2qDqfbzDDQMExsGQ1ORvNbKUxoOKO2ujAxtucunlKtSaNf++L2v/AFJWyvTWmG5dgpqEAen7zN7I5D9v48lG60m7e3EUzFXAb32AJWARdW4IR3NsXw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CWXP123MB2248.GBRP123.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(39830400003)(136003)(396003)(376002)(346002)(366004)(44832011)(66476007)(956004)(2616005)(66556008)(6666004)(66946007)(6486002)(6512007)(6506007)(316002)(4326008)(5660300002)(8936002)(8676002)(2906002)(110136005)(478600001)(52116002)(26005)(36756003)(186003)(83380400001)(1076003)(86362001)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vJYOGKV35LbzEwXDc+wHqK/fz1nSHqsIZ4bMRh4PWe3VOtT3BYbm29cssGhW?= =?us-ascii?Q?/xb5lwomvcgVChsq1rRrJzPplLCryjVfBI7hKirMzzTL5Jt0PtUMD5aRwZBO?= =?us-ascii?Q?ffO1gpZqniymqohwsEMkOOQWsTylEHfC0gCROcpMkj44dfkSrdis0Y3xWVoD?= =?us-ascii?Q?c9jo7R1UF4qqblkie8yQg0WG9R8jbopaVyKKvhu2NWA0/GZEwjlbND9MhZbm?= =?us-ascii?Q?BqVDRob5QAhRLNd4JfDk3K2QhcH3DDlJxxk2NiLB6ZFL5O6io9jNJtmC0Ntd?= =?us-ascii?Q?Ypaqae0Q5m5jUEm+yszGHQtihUGgNxveKYhPu/Rna+D6QOPyidM0twAIhgwS?= =?us-ascii?Q?LbL+q4XSt+lpWiM+cXUXCQFgSaK4YulsJnZSAZLis57DC0VT6I6qkzL4JVjP?= =?us-ascii?Q?ZDQpdC96VOvf/vqyMJNJLE1LnM3ckaRj9GUQkBwzZ13jSQngTQ4J/xcSMoky?= =?us-ascii?Q?xPso1WMb7KO4RJ2ActfgWdoM681+ao+u1LpUR3b091u1P3NWWDzy1782XD3J?= =?us-ascii?Q?ZPPSsZXDORxwUfU0WDGmLmmbN+EmdUMbY/C1F2RXUeAmtpuEN3YEHI3KrWj4?= =?us-ascii?Q?qqwGMekeT+EoFBbLYg976v1YE4HyQzh6WS/tc/3Yfa/Lp8r/kgtl+vEVEyR4?= =?us-ascii?Q?+WHTrGQn190vZGEfkmZoiFBCQLUIuJQ6tQC0btxtWDNBBtHw37Pl1nmEIvOb?= =?us-ascii?Q?zVTPU+1hfLu+tgSI/NtXub/XwdXeKyERcygZ0x82EEWibdZ06D/X+jlxpuZf?= =?us-ascii?Q?/eQI63+7MQXybX2qGSMXaNdbylqkmlMTFOmzimWCc6BcMBOb/csuVQg19cQJ?= =?us-ascii?Q?ujTIiJMzcVxLZa9gH2+MiMWLcIwVnZHIJ5IJ5ITCAbZ4Pr4lLKShMWXpGO2d?= =?us-ascii?Q?8Ca42U5hSEN+jnjfV32TscT3bsdkQcWRQo6GU20A1DVof+jjK2deO5KI0Wi7?= =?us-ascii?Q?b7Shye+DnTj6//z+HKzi8eQ5VblGzLp8cuvnFhN3Z810gDECz3jRCvjx2TUs?= =?us-ascii?Q?9l4pEW+05RKRgDlIgHK906F0U/anSUrAM9mmly6Bqg9u1//so2nj1QfBNxie?= =?us-ascii?Q?EC0wcJnKWzpsFACIHPyTHjI4f/UVz/YGQJ2Vp5jo5wkgzcV2KjLCDEbg07N1?= =?us-ascii?Q?zFZe99ySVN6rGj34T67sFqIgFt0XnOT3uxIttc8LMhUPU8lgMrHF9cZjrkU2?= =?us-ascii?Q?c7MMkki0FOq3pZplZ7t0h/WoEnaTHPOshw7oZcZiU+BW3mNRgJ1TZZtknY/h?= =?us-ascii?Q?lFm5BMIthcqm2kBeg0Be4GNlRwh4siYZSxi+jShLg3JHpcw3IxOx/vTHXOSi?= =?us-ascii?Q?+j59s9sQa3le52y3NtdQGnmI?= X-OriginatorOrg: sancloud.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed1bc72a-348a-49ba-cd32-08d94571ab4e X-MS-Exchange-CrossTenant-AuthSource: CWXP123MB2248.GBRP123.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2021 20:14:35.9244 (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: gH4u59juAYNCr18T3838UAbOpIZ0csp9q53QSuWq13S6tudCXciiEPzuOME8q1N2nauw0E9d5wFsiwboNRq1Kkv6gA9ZeVm5jV1FPqd9x4o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWLP123MB4417 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 The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST. The new am335x-sancloud-bbe name is already in an appropriate place in the list so we just need to move am335x-bonegreen. Signed-off-by: Paul Barker --- configs/am335x_evm_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 1c8093ae6a..647e199608 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -37,7 +37,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-bonegreen am335x-boneblack am335x-evmsk am335x-icev2 am335x-pocketbeagle" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -- 2.26.2