From patchwork Tue Dec 4 13:44:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1007624 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 438NQG0yhmz9s6w for ; Wed, 5 Dec 2018 00:44:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C6B73C223A5; Tue, 4 Dec 2018 13:44:34 +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 B37DAC22308; Tue, 4 Dec 2018 13:44:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 11F15C22308; Tue, 4 Dec 2018 13:44:30 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id AB6AFC2220B for ; Tue, 4 Dec 2018 13:44:29 +0000 (UTC) Received: from [80.146.191.154] ([80.146.191.154]) by web-mail.gmx.net (3c-app-gmx-bs31.server.lan [172.19.170.83]) (via HTTP); Tue, 4 Dec 2018 14:44:28 +0100 MIME-Version: 1.0 Message-ID: From: "Frank Wunderlich" To: "U-Boot Mailing List" Date: Tue, 4 Dec 2018 14:44:28 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:rrT6PZZslZPnvI9NXjmHiTntkHt7V/y0+jvGe6Cxct+G8dS3a3Jd2uMcUi3a/+xTmL6j6 m99wsVFkEhIKOX811zjzAII+ANTj9rPfySQPxaB7Bnbi5yuMCtAZVq1DH3w6XJjj9pqs9lqRKrtk ncN69uxp4bEh5Fzzd+Id0kgmRA5J24G0xhvt1cZmyCxnp6rRD4USVmwzpRRR2kXMMsmAxBhmYYg6 JWCqLvpXwr4MRb7I7X5/YfuUoM1b3Bq6EbSugwKmqC7SVcglyBU2xNpCziWQHo12oQvQOMi0pDxI 0U= X-UI-Out-Filterresults: notjunk:1; V03:K0:7+e3JCCrMgg=:f6tRvtBM4P9bvxIEufPhac ZhkoOBrJAiGhH2n2DVGnoxgDJwB+u1gU82SSgqR+RfiKWl6Hp/x0U4aVbnmI57SxEVWkgu9uM rX3jSUmjIeUA69QIet4DrJnEOiRKVRzOGXupnOo3ZYOr+PAdZSslvIYVjPz/rkJRxTWJGVWc/ aGxvOLQPHLoGrW4ddZ4qR5WIjdTbveGOGh4ltqX2uFjCWgvqMCAgtVf0AJKiUEc4jNAZd8cx6 T9GcFSZkInX8cq+Alha1d2WAF7iKwVLLhy3lOycdcQLKavZW0I0/h1hNt2bUtywKC7AmqJu7M /sBwWkve9xjdvYuZk2QRD85/FDAdxsGzqN9GpzJVGK0P8U6Orb/xrWZovFR+P5zDflfU6OoOU mZGJbCv15nXehnUYYkugOVIiEMpGgQo8aw5zvo1dsl3EdtUBWGMF7gFiCf+9UqIgmWugyftDG KIyVhpEv3LMuVEuh2dl1pjkB/xijf3iHy551lbKWbhh3+ZfZdptEjc9IaUWS3HFADqYGFMjy4 2PVy5NB3lGMmyR1P6GVPfAZzCkw7Wxfh0yoBcYjFC99L/8af5bBLvXL4hgTXkL30BK/zCtHPV wW4V46xB0zERY= Subject: [U-Boot] [PATCH v2] 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" changes since v1: fixed bracket-style in if-else statement From 47701fbea478ce09a5ef43d914261bf00eb50544 Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Mon, 3 Dec 2018 15:32:58 +0100 Subject: [PATCH] adding saveenv-command for bananapi r2 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 Signed-off-by: Frank Wunderlich --- board/mediatek/mt7623/mt7623_rfb.c | 19 +++++++++++++++++++ configs/mt7623n_bpir2_defconfig | 3 +++ include/configs/mt7623.h | 3 +++ 3 files changed, 25 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 3a4de72e23..640c881ce9 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -52,3 +52,6 @@ CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y CONFIG_LZMA=y # CONFIG_EFI_LOADER is not set + +#enables savenenv-command +CONFIG_ENV_IS_IN_MMC=y diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 68da920e30..91d6369dd2 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