From patchwork Tue Jan 15 17:49:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1025345 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43fHtJ6K22z9sCr for ; Wed, 16 Jan 2019 04:50:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DDAA0C22030; Tue, 15 Jan 2019 17:50:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D612EC22030; Tue, 15 Jan 2019 17:50:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F1B7BC22030; Tue, 15 Jan 2019 17:50:03 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id 8F54FC21E90 for ; Tue, 15 Jan 2019 17:50:03 +0000 (UTC) Received: from localhost.localdomain ([91.14.93.24]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LqylH-1hE6ox3XH9-00eeo3; Tue, 15 Jan 2019 18:49:16 +0100 From: Frank Wunderlich To: Ryder Lee , Weijie Gao , u-boot@lists.denx.de Date: Tue, 15 Jan 2019 18:49:06 +0100 Message-Id: <20190115174906.27229-1-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:kFoo7mBGUc+SgNbAmY2kpjlGX5tiehGrjq+L3xnyWDpGtC24uw3 uUHooTzkbXrLLVecnIj9G4o1l79/jSRk3MDr3Dzk8NKLqOsoENkwryGMfXBsRcxR3bDYg62 mI1lAU9uTjydyfh7s5keZ4tIl6NY7RYThE0AorRbAfnUbvKCZ30FzOlXGtg5DBp2fCWybso WN7WWIWfay7eBbUR7yDIA== X-UI-Out-Filterresults: notjunk:1; V03:K0:3SHo3RyNb+4=:0gCO3ClD3sr47OBqOD5+FO Er+WRie2N6Uo+Kl7rWmVA76pTb+kwQ09fcKjOySug/+xqab9JvPoHWekS00tlA2qsK270p5PK Whj80tJwkAJME9DDwRPpE+X2ndmMVJxPLHl8j+WOQ5kkgN1E895HooyMIbwm8I87c69PWY9uv 9TrFUWXAGDH4U9pjjE/KonW+O6CfO62PSPkAbB0BXl3d48lNp43xTLgltql6LaEwDYi2YsLvB 3Bsyb9teRaYVaYycAUjtjkTJi8w6fOTC84j6+DQ/lWoom3/HalBEOGxIJxbE/KsMOanpw2xOa R612ZpV4McQ8k6hbekwhWhhHmawoGcR6caWJbPFWrcT4Y+9liDO361N/ckpiYuhlSZovkL9c/ i5aU/nci1Ih9sW16os+l7KtPwh9u6uzeSfdBD8X04ZPhBFDUL5itb32zMZo8hOrVlHlixGJXC U1EweMm2OYBQ8Ck4c00MticcGIRrnkbmqoNFqMK3sCpSKSJzLUVNRXPi4eqHy4c5UccNyIidc JyIg4B9sGaHL/M4Um1Ckpzfx181kTMnIcIcBfn+hBygb5IGBHN1AcNEdXheTjiVGb7l7LxSXD 8g0KxWe+tUOi1ul5QYvl9qs6L1IadDd54vX7DD9SCBj/1AKcseX9ltyY0koaKCJox5qxPmyc0 ccwThkFgp4NT1NBKPdQMWVyQzTj8eE3pXRgTY/Euuxrr/4CwMvJGl+FyfEiY+TacfgRau+EIS afy1RtNBdw7v4Hl257lxlfY1b8SAzDzk0hEj6gHDrtReJQ1G/x5VKo80c0KYTUDbbjzsy0VCl GG0Wi3znWpaffKgzp2gNZFD/XKsjYC8Z+2G2PVII8eAhL+8KdlunSvNa6GjWOG7PWFgUMg69i 609mkLWVd1H0aiWTFETwU3Hn7lozDVZQ3VrkS9l8dhTuoiPo9FinYpg8SbNhg/ Subject: [U-Boot] [PATCH v3] adding saveenv-command for bananapi r2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" bananapi r2 can be booted from sd-card and emmc saving the environment have to choose the storage from which the device has booted also the offset is set to 1MB to make sure env is written to block "user data area" between uboot and first partition https://www.fw-web.de/dokuwiki/lib/exe/fetch.php?cache=&media=bpi-r2:boot-structure.png v3: using generated defconfig v2: fixed bracket-style in if-else statement Signed-off-by: Frank Wunderlich --- board/mediatek/mt7623/mt7623_rfb.c | 19 +++++++++++++++++++ configs/mt7623n_bpir2_defconfig | 1 + include/configs/mt7623.h | 3 +++ 3 files changed, 23 insertions(+) diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c index 08468b50ea..4ec2764976 100644 --- a/board/mediatek/mt7623/mt7623_rfb.c +++ b/board/mediatek/mt7623/mt7623_rfb.c @@ -14,3 +14,22 @@ int board_init(void) return 0; } + +int mmc_get_boot_dev(void) +{ + int g_mmc_devid = -1; + char *uflag = (char *)0x81DFFFF0; + if (strncmp(uflag,"eMMC",4)==0) { + g_mmc_devid = 0; + printf("Boot From Emmc(id:%d)\n\n", g_mmc_devid); + } else { + g_mmc_devid = 1; + printf("Boot From SD(id:%d)\n\n", g_mmc_devid); + } + return g_mmc_devid; +} + +int mmc_get_env_dev(void) +{ + return mmc_get_boot_dev(); +} diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index ae4fb280dc..fcb02f5a7b 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2" +CONFIG_ENV_IS_IN_MMC=y CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_BLOCK_CACHE is not set diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index ba763501cf..fb6ac073f3 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -53,4 +53,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ FDT_HIGH +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_ENV_OFFSET 0x100000 + #endif