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.8 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 65854C432BE for ; Mon, 30 Aug 2021 15:40:29 +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 B31FC60F44 for ; Mon, 30 Aug 2021 15:40:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B31FC60F44 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 54A778338B; Mon, 30 Aug 2021 17:40:17 +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="XcvQaDcR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA98C833A5; Mon, 30 Aug 2021 17:40:07 +0200 (CEST) Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (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 BBF50805DF for ; Mon, 30 Aug 2021 17:40:03 +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-xd2d.google.com with SMTP id j18so20418938ioj.8 for ; Mon, 30 Aug 2021 08:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NMGZ2LZgdJPHTD+VwRC3B7E5o0vxAxiRcfarDtRMPxc=; b=XcvQaDcRFR9aYyjA0wL9ujor8nfrjkWXVVUF2cGKqyPbk0dU1/26/13VhxKyrQ6Csx VLOeY5nhLlARJWjMv3swvzSrzBct+TF9Hfo8PPzaBVowSBBKDnCYkVnm1TRiAgV0W/Ne T2W2RzD1UYFySKuF21nAWeq5u/J8fZJlS6cggiLp7Shhe4j9rv07Nr+5Es9xFMDTHIsa UjGxkBtgDoZJUBi32EyLP2WqoLz9+7VlnpFx/tMw7SvrV8EQ+vYL6qICv0uFY1rri725 mjjjLpa3l80/7yQ87Y94HwGIbETqHprenp6MTw3hxZTgn/5sTUPYL04vfQPIrTXvH6/i yxhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NMGZ2LZgdJPHTD+VwRC3B7E5o0vxAxiRcfarDtRMPxc=; b=bwJSBILYqGHuHkMCcIcrrs4BleJEjB1Ye1PSGVltG1CZUzveO+RqiYWpvC4wFMzVZY crcVjZ7OtvE3cca4tZ4evIeNXMZAjtg1YgIWlnceM6zrhzWyO14XEmj/uhGe+7xN/zJT Ogd6bpSvh4sfDe9e+VoIjIEafp/oQgHvKQO+3Wcv1lxMz855pXaxwBYkd9CcyVfT4Yui pL0/piK1JMf2MPJOFhw7/7T7HkZAxZTEN8hGFqj0LQSRoa3ICqPy5IQ3vPsp1R6/4I9v 3Ev79SbA3e8hQjfmHto+3EEogxLql6yzskXvIjfgDfmSUfn8tXVMDfQNCcT0SRq2nxGW CzXw== X-Gm-Message-State: AOAM530ejN2GJosZnojGcFc0VMawWqYQMqbqA6iFSvxBNgn2PSqLQl1X wHu9KyTb/K9I67O1sSsi08up6j48nI6KSg== X-Google-Smtp-Source: ABdhPJyFFu9shpSknMU8HHBdN8lF+dNQn0+x2rnCZm6yquAWhPDN9oswY+IlYy26UB6G5l8Tkv+aFg== X-Received: by 2002:a6b:d90b:: with SMTP id r11mr18179066ioc.99.1630338001920; Mon, 30 Aug 2021 08:40:01 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id z15sm8012565ioh.28.2021.08.30.08.40.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 08:40:01 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: biju.das.jz@bp.renesas.com, marek.vasut+renesas@gmail.com, Adam Ford Subject: [PATCH 1/5] ARM: rmobile: Enable board detection when FIT is enabled Date: Mon, 30 Aug 2021 10:39:48 -0500 Message-Id: <20210830153952.598658-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 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