| Message ID | trinity-8900a327-f067-48e2-ae1f-c7344a07606f-1543931068900@3c-app-gmx-bs31 |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2] adding saveenv-command for bananapi r2 | expand |
On Tue, Dec 04, 2018 at 02:44:28PM +0100, Frank Wunderlich wrote: > changes since v1: fixed bracket-style in if-else statement > > >From 47701fbea478ce09a5ef43d914261bf00eb50544 Mon Sep 17 00:00:00 2001 > From: Frank Wunderlich <frank-w@public-files.de> > 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 <frank-w@public-files.de> Applied to u-boot/master, thanks!
On Tue, Jan 15, 2019 at 09:39:39PM -0500, Tom Rini wrote: > On Tue, Dec 04, 2018 at 02:44:28PM +0100, Frank Wunderlich wrote: > > > changes since v1: fixed bracket-style in if-else statement > > > > >From 47701fbea478ce09a5ef43d914261bf00eb50544 Mon Sep 17 00:00:00 2001 > > From: Frank Wunderlich <frank-w@public-files.de> > > 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 <frank-w@public-files.de> > > Applied to u-boot/master, thanks! Wait, no, silly me, I forgot to remove this from my local bundle. I'm expecting a v3 and have been talking with Frank off-list.
Hi, Here is v3 :) https://patchwork.ozlabs.org/patch/1025345/ Regards Frank Am 16. Januar 2019 03:54:07 MEZ schrieb Tom Rini <>: >> Applied to u-boot/master, thanks! > >Wait, no, silly me, I forgot to remove this from my local bundle. I'm >expecting a v3 and have been talking with Frank off-list.
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