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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 09EF7C4332F for ; Mon, 20 Sep 2021 16:14:55 +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 269DE60F58 for ; Mon, 20 Sep 2021 16:14:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 269DE60F58 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 BA4EB83257; Mon, 20 Sep 2021 18:14:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="ovOye9KC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AACB7807FE; Mon, 20 Sep 2021 18:14:47 +0200 (CEST) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2DC268032E for ; Mon, 20 Sep 2021 18:14:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-io1-xd2f.google.com with SMTP id m11so22868963ioo.6 for ; Mon, 20 Sep 2021 09:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rUkCWi4uFUw2FhpL6AxQiZJZjdVlvBh1oWKvae82WEk=; b=ovOye9KC7j6u6trhem1b4dLLv18hPSy8mxoj7M0tjC1fczyvFDNyQTb5izPWhtAqL0 GM226r0pODwHRGpdf2EGTIkB4NA6Hs0EX9yl7G+bNLpIHbZm+j0tu/G2JaAXV8+QHfQ+ qFsNffvjVJJKE1hIxMvKC46M0Wp5vQc3vvFfkyFc62IaqD1sqYRDbeIZEcQuzXx7mdbc a4oxDl+BiiLhti17bUN0n2EFnOvTvpAWIq/J/vtHQDnRUPaV8KhTuMCEJykI2o9OUITh rNXAGRTejs1Gln3hK7dv6HYyruEdENQKHeT7KPXUTmwLR4E18QTaelwsIOF61Z6eO8sY vFrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rUkCWi4uFUw2FhpL6AxQiZJZjdVlvBh1oWKvae82WEk=; b=vWnabtIzOiKlfzt2MpDSTkucWCDOcnk71XcC9L0aLOvwBNox8tD0t+f57DJedgZIo4 US0eDmQkmnsxlQ7BAqselGyeHSg7NVm5eR0fDsbOPUYlKZJY8ANvXjsEYLcUYmudqGdq u4SEbdxQJy8QWvamX0/Xq7bN9C7PqL+SkNtasQlf2YBEPMXqaOEOT9lq2Q1aELGBufMq SsZuEb9jBMAkKxe2BrLdbf5c/REblg1EGx3DSIm61dvOt2lM7WyDlO+ISQfIduFEvYRC lSdS0Uaoxl+6hHF/qS1sddBa61Hujk49mU6Hbjn5wpXzsyF5h9z1gr8zNPlBPy8+sj/p BXlg== X-Gm-Message-State: AOAM530UpmRJd9Kw2p7p3P7fNxJctY8iD1OREHh2ifcCYNMZSpp40oFl kAvk4jspfISHNhtzkihLf5f8ZRL3nNM= X-Google-Smtp-Source: ABdhPJw7EfYFgOrnyzvcnFbMbpO11zdcIpg/8mvGHcBujYlYlhXLAfF8mRb7LMKKzDtd2FnFjD1/hA== X-Received: by 2002:a6b:6603:: with SMTP id a3mr19067350ioc.68.1632154482273; Mon, 20 Sep 2021 09:14:42 -0700 (PDT) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id e13sm8699294iod.36.2021.09.20.09.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 09:14:41 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: marek.vasut+renesas@gmail.com, aford@beaconembedded.com, Adam Ford Subject: [PATCH V2 1/6] ARM: rmobile: Enable board detection when FIT is enabled Date: Mon, 20 Sep 2021 11:14:27 -0500 Message-Id: <20210920161432.13110-1-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 There are three boards from Beacon, RZ/G2 M/N/H which all use the same board file, but different device trees. Add code to automatically select the proper device tree based on the CPU type. Signed-off-by: Adam Ford --- board/beacon/beacon-rzg2m/beacon-rzg2m.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index c12ff77fb2..b3521fcbc1 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -36,3 +36,19 @@ void reset_cpu(void) { writel(RST_CODE, RST_CA57RESCNT); } + +#if IS_ENABLED(CONFIG_MULTI_DTB_FIT) +int board_fit_config_name_match(const char *name) +{ + if (!strcmp(rzg_get_cpu_name(), "R8A774A1") && !strcmp(name, "r8a774a1-beacon-rzg2m-kit")) + return 0; + + if (!strcmp(rzg_get_cpu_name(), "R8A774B1") && !strcmp(name, "r8a774b1-beacon-rzg2n-kit")) + return 0; + + if (!strcmp(rzg_get_cpu_name(), "R8A774E1") && !strcmp(name, "r8a774e1-beacon-rzg2h-kit")) + return 0; + + return -1; +} +#endif -- 2.25.1