diff mbox series

[v1,3/3] arm: enable distro boot for bananapi-r2

Message ID 20200425231746.21953-3-matthias.bgg@kernel.org
State Accepted
Commit 37f2755a00c1b3223780d88c7a82e2f6af26a18e
Delegated to: Tom Rini
Headers show
Series [v1,1/3] timer MediaTek use upstream compatible | expand

Commit Message

Matthias Brugger April 25, 2020, 11:17 p.m. UTC 
From: Matthias Brugger <mbrugger@suse.com>

This patch enables distro boot for the bananapi-r2, based on
a MediaTek mt7623n.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---

 configs/mt7623n_bpir2_defconfig |  3 ++-
 include/configs/mt7623.h        | 24 ++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

Comments

Tom Rini May 1, 2020, 9:56 p.m. UTC | #1 
On Sun, Apr 26, 2020 at 01:17:46AM +0200, matthias.bgg@kernel.org wrote:

> From: Matthias Brugger <mbrugger@suse.com>
> 
> This patch enables distro boot for the bananapi-r2, based on
> a MediaTek mt7623n.
> 
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig
index 07ddade76a..fe28f37b9e 100644
--- a/configs/mt7623n_bpir2_defconfig
+++ b/configs/mt7623n_bpir2_defconfig
@@ -7,6 +7,7 @@  CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_TARGET_MT7623=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=3
@@ -56,4 +57,4 @@  CONFIG_TIMER=y
 CONFIG_MTK_TIMER=y
 CONFIG_WDT_MTK=y
 CONFIG_LZMA=y
-# CONFIG_EFI_LOADER is not set
+CONFIG_EFI_LOADER=y
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index faab0913fc..fe436cca38 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -45,11 +45,13 @@ 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
 /* This is needed for kernel booting */
-#define FDT_HIGH			"fdt_high=0xac000000\0"
+#define FDT_HIGH			"0xac000000"
 
-/* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
-	FDT_HIGH
+#define ENV_MEM_LAYOUT_SETTINGS				\
+	"fdt_high=" FDT_HIGH "\0"			\
+	"kernel_addr_r=0x84000000\0"			\
+	"fdt_addr_r=" FDT_HIGH "\0"			\
+	"fdtfile=mt7623n-bananapi-bpi-r2.dtb" "\0"
 
 /* Ethernet */
 #define CONFIG_IPADDR			192.168.1.1
@@ -57,4 +59,18 @@ 
 
 #define CONFIG_SYS_MMC_ENV_DEV		0
 
+#ifdef CONFIG_DISTRO_DEFAULTS
+
+#define BOOT_TARGET_DEVICES(func)	\
+		func(MMC, mmc, 1)
+
+#include <config_distro_bootcmd.h>
+
+/* Extra environment variables */
+#define CONFIG_EXTRA_ENV_SETTINGS	\
+	ENV_MEM_LAYOUT_SETTINGS		\
+	BOOTENV
+
+#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
+
 #endif