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, 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 E1F9EC2B9F4 for ; Thu, 17 Jun 2021 09:03:19 +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 1F9FC613E9 for ; Thu, 17 Jun 2021 09:03:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F9FC613E9 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 93E9D82B00; Thu, 17 Jun 2021 11:02:53 +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="XsP3WBxK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 607FB82A07; Thu, 17 Jun 2021 11:02:41 +0200 (CEST) Received: from GBR01-LO2-obe.outbound.protection.outlook.com (mail-lo2gbr01on070a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe15::70a]) (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 7DEE9829F8 for ; Thu, 17 Jun 2021 11:02:32 +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=URmiGv6NWOIM/KwG2+vTj43hVJ/qDM++qAmYg2J8cm+379MiiBpTE9uUn92UCTPDjk+eY6V00zRXE3LfzRTpHAmwlFtjRQ3K1Dza2PA6i+DrZUEpyS7IPNn0PpVSG1FuPObsUoaFZ/JL48Yc9k3nW5CfmajLZY0vM8RRflIRaHrDrCa4ayQHwGL+myc42hR4wg6bmv8dhh0+UqHwyzGzTUpmgtAVRvzRxTpPXOLwnLPwLUDxmjLOQrKz3+dWxduliuvEQQ0csXTD5u1NwtoHhzGKVn1oKJzvjT5bkMLw7QI+guyheGymePcLYGa1ln8iDpJfx8Y0h9JII+ioHj5CVw== 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=JA5tTVMsLleOVnmfXKG3kCDG4ssKWLHKUp9FOp07ruw=; b=jryqevYmm29LWX8w2+rFLL4oNK5lGB/E553XDIl/fdpEUxhDk2unIUDQbqEFQsYqMkUGNbMm/An4bHME9mGW3nVY3Q/lqXHLlHruS7kJzcVK9BdUmLcWS4OE898rNPQqTJrQQi3rk4jhDNMMUS4qbvjzxIs7RFkhXGy8UXBzYAlK7iQjB/4yj/hnrKVGDbikLt7t36SzokyE32/ltM1SFYGnGQwwXpO2juNy4wO2B9HTRSVDszRp1gYM/BbljiLwDNt8U6MM6Tg76tyKSiGhe3LmeJ0RvbC6DcFm78tiNo96YVYHaC08klSz/Uelzpsdtsb+svQqLntNz/w7s4EBeA== 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=JA5tTVMsLleOVnmfXKG3kCDG4ssKWLHKUp9FOp07ruw=; b=XsP3WBxKQLVo3VdpXetyvi3/oZ68ByOO99riZeHIvLpXlgshJ4OrOGoP91ANSKY/YFPqF0OqLgChHy0C9Gj9D/IO8oQDgGYtSq+/3kY0nPaERNBFeZ21g9USj/hqfd/iT8glNROQSbRbR4B/UgS+HGqhjMXhfzU7fDOcxUmVuSY= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=sancloud.com; Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) by CWLP123MB3299.GBRP123.PROD.OUTLOOK.COM (2603:10a6:400:64::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Thu, 17 Jun 2021 09:02:31 +0000 Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::c84c:4809:6da7:ecf5]) by CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::c84c:4809:6da7:ecf5%6]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 09:02:31 +0000 From: Paul Barker To: u-boot@lists.denx.de, Tom Rini Cc: Paul Barker Subject: [PATCH 4/4] configs: am335x_evm: Fix BeagleBone Green DTB selection Date: Thu, 17 Jun 2021 10:02:22 +0100 Message-Id: <20210617090222.7516-4-paul.barker@sancloud.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210617090222.7516-1-paul.barker@sancloud.com> References: <20210617090222.7516-1-paul.barker@sancloud.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [80.7.160.81] X-ClientProxiedBy: LO4P123CA0353.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::16) To CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from owl.home.b5net.uk (80.7.160.81) by LO4P123CA0353.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19 via Frontend Transport; Thu, 17 Jun 2021 09:02:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e75914e-e3cb-49a9-9829-08d9316ea399 X-MS-TrafficTypeDiagnostic: CWLP123MB3299: 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: +LpQoaGZ6NcVjDfi1dJ4DnOwkVvPReCqq/QckFKGUQDpwbLSzoQ/Ep1wa2B8QYesofuELvZzAF58hfCOFqZcBCiCJBiTeqHGlN4FJZQE9QExSiUlPKRZkN14O+cGbjRkVxIaHstvYqy43Uet26qKDtuTYlyf7gYP9HS6aRkV+IexGqIyVTMAogBsIFAkBoVsSGwdqILDNdYa10oZsZm2GSHVC6P70lCCtbzgDG8wjwLIM8rnZZDAuoLySIJm2wE7avU0KTtki3VCkvGhgslxBA8zi5m4remRAWuxT7VtjaPOJHECDRidXBKxKETMiDVlGvElH+21s9G0l8BvSC7wAcdq/MP0O1YljuB4XJm5G6a3CEMG/T/pBdK897ENH8R8UBBoxQzdCYjXV7NN4r9SRAwiOYfPsU2LS6VLZaIbpgcnz+yhUOdpXHT2sFeIPmcAPlbSPFzDlmvK2Zyouf1nRuKyoxcpMMJZh5fiKyNzKPmv+piNHV/9sGu4ZQGoUvUzw+YkOFAuwhiLwD/mI38ZBiX/edySETV6od8AyaBf+ODW5Xzw6/RilHKMMZSqqSO+hQjrvvJe5FSqddxBSxOuQSVHlly+UfAckddYjdVA+cdYKtyp+Nt747XC4gMdHX0//0Gw35mH6d/ZKH9B35SrSw== 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:(396003)(136003)(376002)(366004)(39830400003)(346002)(83380400001)(16526019)(38350700002)(38100700002)(2906002)(52116002)(6916009)(6506007)(1076003)(107886003)(8936002)(186003)(6486002)(6512007)(8676002)(6666004)(66946007)(26005)(44832011)(36756003)(478600001)(86362001)(316002)(2616005)(4326008)(5660300002)(956004)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5eQUtkQFmMScrzadNZ1F/A+P3fOo96D/31iPxycBi2LbOvd2jxj7L2iksWva?= =?us-ascii?Q?xj2Iscza0eX9FD0mAUKxrq06J+S4HvLX+rEqm3j2UPJIWU4m0mjF+2WAEqyq?= =?us-ascii?Q?HPRlOBwQaCu0388pAfPktwvJrT/JsPQoFV9Z3jEY1klsz/LJersAEtO7J0u3?= =?us-ascii?Q?rISS6Ih0yyXKk1G/jqm6xDMw1swIGryxZizmZcN8uOTaVgCELIE0Y+upOqG1?= =?us-ascii?Q?VOxubCHg46UzD/uaqFRA1S4a85fKZ5iiMzKSr6BKm8jRwEX+BfKqhnE1kWLs?= =?us-ascii?Q?7zCCLETNebZxL8olA5MeVMGq5jAoe7aBYBjFFFcWzCewrFdKqWKJrh9rf0Ci?= =?us-ascii?Q?wRjC5yJEtIivBK6wAu5dn0zxSR/DlB9A/Q6uUhKTdUedYCAyJ5L6BJhnm0Qb?= =?us-ascii?Q?zWC816GxUJy6DBQdqZeam2hXYtcDH3x4iB/3z0WcaOUMLVy6JZw8akx4yTze?= =?us-ascii?Q?SrdNqD3EoGfUhuhfZjWwStGKNcSDkAcGAld2K9pbsRat1Z4jsPiJ3VOeqrF2?= =?us-ascii?Q?pidzrjxqOyQY8IZmodJAze2/oUBVjh2jpKjJg7w+Rrd7GD/fzB9RDdAtspXT?= =?us-ascii?Q?lqMrBReHMkz6fzq5lnSNluZaIGv+OYTL3ei1RRxryVUW00GoE/FSd/IzDocp?= =?us-ascii?Q?B2yMI0B2qbEu6KOjULnMSQauP+XknYc3cOHkf9UHZ8xiuGxIy2seP8KIr2xO?= =?us-ascii?Q?6+raAxWbTdfR+RCIqmNbHaRzqvASWAFb++PcJNOKDAfeMuhQ7wrqUJMVaPjW?= =?us-ascii?Q?hcBdQ3ZPLPHbkE2OKiAEIMjvzp63DVol7Do5yJEnN0H7K1P4fdTRm8EG0rlm?= =?us-ascii?Q?veGbgb0FKw8gzUdmXX/5XQNSIEJ0i5NXyFANYs060Mf50SKXoadvmURC9sYe?= =?us-ascii?Q?/s/7mw4ZvoB44TgDHRnGFfZc1gc/jvaUzU4fgNU2i0VneoqRwOAU9kdOV37f?= =?us-ascii?Q?QDxKQTb5r4Ln4VG5OO2swNl8klIOBTlOEQa2nJjwnEHoA4MjWP2qkaJogqkQ?= =?us-ascii?Q?LEmF6Qd00++Pq3GA1DdjEqd6OLE0oiuzrO65zqPnb+iLkaSPhGKqgMbQYdDj?= =?us-ascii?Q?JAGyKPkfxW2AaJm3YLOTY919BEA0Xs7X60k4vph7/+d8mjSkTVW4yS5qIl7X?= =?us-ascii?Q?+U7x5+PdsK3FpJsR4lwzAeGJpRTYiTADvYgGK/ievHbXFtrZrLsqA5oA0FE3?= =?us-ascii?Q?tjfDI9pmmVasYYUiDwmTFotfC587c6UDkfxvbusIXsD0cxAHke/Z2OhWRqfe?= =?us-ascii?Q?E4oBuVM2dv5KUTp12aQzerXgLw7yLYiYDxgtmIawnwMIINhEqAkTM2mxtPEH?= =?us-ascii?Q?fv/yDAcDE0sUNNZjiIDSZX2y?= X-OriginatorOrg: sancloud.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e75914e-e3cb-49a9-9829-08d9316ea399 X-MS-Exchange-CrossTenant-AuthSource: CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 09:02:31.1730 (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: lG5cBnS+bPHBQmoBSSPL+xCodt4PMMjBN3nogVPR5erYKKV99cMis0PPvZxvQUCj4wMYYZO3/5K3ypWY/lPxaO8t+6A7Qa245ify4KE0b0I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWLP123MB3299 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 7a372095a3..82674ac82f 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