From patchwork Mon Aug 31 06:33:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1354133 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tb0YePTc; dkim-atps=neutral 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 (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bg0lL6CCpz9sPB for ; Mon, 31 Aug 2020 16:33:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 97833821DE; Mon, 31 Aug 2020 08:33:30 +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="tb0YePTc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C26978225A; Mon, 31 Aug 2020 08:33:29 +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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 C40C881BF1 for ; Mon, 31 Aug 2020 08:33:26 +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=a.heider@gmail.com Received: by mail-wm1-x32b.google.com with SMTP id e11so1597306wme.0 for ; Sun, 30 Aug 2020 23:33:26 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=3gMTgMjVHyg6Ak83/91haAubrqivRkBNeCGuBbqvBVw=; b=tb0YePTcMH5hnk7mSACoW6e0oxIbEOiJWdlYer3qkq2jHX5LAk4YiASLbcgKwbxMCs aP5XqTcQitDc9nYmmgXYfTvvPuL0mTO7mqa+VG+UZDbc2LZUNJM0yRpr0xZltZc34eeZ GIrpcMdGDKZYrMUrDzB6VI/gojKrITZtzdz6g/aUbOIsMETBVuZ3tFFFO0mAGwI8GVep WYraVvU5z83LdqCQka4TdH2HiVifkt7PWe5EAJHVnbsMGUNKJhcN+f22gv60XNdZSv0O 0Dgyd8JfZO0/OS+izVo1Zc4ZafSTzAt2uzwZBlwM//ADe56iML7S+iPptBsKWHj4jFJb 072w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3gMTgMjVHyg6Ak83/91haAubrqivRkBNeCGuBbqvBVw=; b=c36tZ07v1RL64mBYobg/A37sANsVH/QvOSmSziCTBZKyylDyOV0WpUBpO3WT7AIiA/ 1F6AW6LkLXRHBuap5CBWuV5TxyeKzHkXJFo69CLtXxMUNjalquvFp6cEqWv5wQ2cOXTZ HTMvPcxeuiiobxQkGBfvdbWZ355IbtWPnSyQ+uwDs4In2OKyJhIHBFcbKSYfdjEwsz2h hO2aLONZgrWyu/zo+3TNH5Iucw5xG28QnpYG+bS5SeCYs8R3zCFLK5+YBX1yA3S2CVRS Ui5l4+Y5c6O023CPpbkg3y+NwmQcjpTGpjj09AyKjEzmyVhyT4Bw/iodONKDii43iXvP UaKA== X-Gm-Message-State: AOAM530nFu+L2EpjnNlGqkrcyaEBd6M4l1QTv+VvWXXL3jNNKEmCNoE4 IOkqS5TXTPl8Yh6ngjncW+w= X-Google-Smtp-Source: ABdhPJzAt1Afh/TVKtOcGO617v8zKEt0DasVxjB3rbSa9gTjpMXCY1as87FMWFyCdb64H17b1ololA== X-Received: by 2002:a05:600c:252:: with SMTP id 18mr261554wmj.63.1598855606405; Sun, 30 Aug 2020 23:33:26 -0700 (PDT) Received: from localhost.localdomain (a89-183-75-181.net-htp.de. [89.183.75.181]) by smtp.gmail.com with ESMTPSA id r129sm10505143wmr.40.2020.08.30.23.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 23:33:26 -0700 (PDT) From: Andre Heider To: Stefan Roese , Konstantin Porotchkin Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , u-boot@lists.denx.de Subject: [PATCH v2 2/2] arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC Date: Mon, 31 Aug 2020 08:33:24 +0200 Message-Id: <20200831063324.512833-1-a.heider@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200831033408.467699-2-a.heider@gmail.com> References: <20200831033408.467699-2-a.heider@gmail.com> MIME-Version: 1.0 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.102.3 at phobos.denx.de X-Virus-Status: Clean From: Konstantin Porotchkin Add support for additional EspressoBIN board with installed eMMC device (U11). Starting from this patch the DEVICE_TREE= must be added to "make" in order to distinguish between platforms wth and without eMMC on board. Regualr (no eMMC) EspressoBIN builds should use DTS file named armada-3720-espressobin and build for boards with eMMC installed the DTS named armada-3720-espressobin-emmc. The default device tree string is now removed from mvebu_espressobin-88f3720_defconfig config file. Update build documentation accordingly. Change-Id: Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18 Signed-off-by: Konstantin Porotchkin Reviewed-on: http://vgitil04.il.marvell.com:8080/61290 Tested-by: iSoC Platform CI [a.heider: adapt to mainline] Signed-off-by: Andre Heider --- v2: base upon downstream patch arch/arm/dts/Makefile | 1 + arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++ configs/mvebu_espressobin-88f3720_defconfig | 1 - doc/README.marvell | 7 ++++++- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 5e34192be6..8f1958b5a7 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-3720-db.dtb \ armada-3720-espressobin.dtb \ + armada-3720-espressobin-emmc.dtb \ armada-3720-turris-mox.dtb \ armada-3720-uDPU.dtb \ armada-375-db.dtb \ diff --git a/arch/arm/dts/armada-3720-espressobin-emmc.dts b/arch/arm/dts/armada-3720-espressobin-emmc.dts new file mode 100644 index 0000000000..0dd59af9c0 --- /dev/null +++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Marvell International Ltd. + */ + +#include "armada-3720-espressobin.dts" + +/ { + model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)"; + compatible = "marvell,armada-3720-espressobin", + "marvell,armada-3720-espressobin-emmc", + "marvell,armada3720", "marvell,armada3710"; + +}; + +/* U11 */ +&sdhci1 { + status = "okay"; +}; diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig index 0c1c92d4ff..99f421d841 100644 --- a/configs/mvebu_espressobin-88f3720_defconfig +++ b/configs/mvebu_espressobin-88f3720_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=25804800 -CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin" CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y diff --git a/doc/README.marvell b/doc/README.marvell index 5416bc3035..ffd0544aef 100644 --- a/doc/README.marvell +++ b/doc/README.marvell @@ -43,7 +43,12 @@ Build Procedure In order to prevent this, the required device-tree MUST be set during compilation. All device-tree files are located in ./arch/arm/dts/ folder. - For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with + For the EspressoBin board without soldered eMMC device use + # make DEVICE_TREE=armada-3720-espressobin + For the EspressoBin board with populated eMMC device use + # make DEVICE_TREE=armada-3720-espressobin-emmc + + For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with just default device-tree from defconfig using: # make