mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04:00
572ea68070
Import pending patches adding support for MT7988 and provide builds for the reference board for all possible boot media. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
298 lines
6.9 KiB
Diff
298 lines
6.9 KiB
Diff
From 63336ec7fd7d480ac58a91f3b20d08bf1b3a13ad Mon Sep 17 00:00:00 2001
|
|
From: Weijie Gao <weijie.gao@mediatek.com>
|
|
Date: Wed, 19 Jul 2023 17:15:41 +0800
|
|
Subject: [PATCH 01/29] arm: mediatek: retrieve ram_base from dts node for
|
|
armv8 platform
|
|
|
|
Now we use fdtdec_setup_mem_size_base() to get DRAM base from fdt ram node
|
|
and update gd->ram_base. CFG_SYS_SDRAM_BASE is unused and will be removed.
|
|
|
|
Also, since mt7622 always passes fdt to linux kernel, there's no need to
|
|
assign value to gd->bd->bi_boot_params.
|
|
|
|
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
|
|
---
|
|
arch/arm/dts/mt7981-emmc-rfb.dts | 5 +++++
|
|
arch/arm/dts/mt7981-rfb.dts | 5 +++++
|
|
arch/arm/dts/mt7981-sd-rfb.dts | 5 +++++
|
|
arch/arm/dts/mt7986a-bpi-r3-sd.dts | 5 +++++
|
|
arch/arm/dts/mt7986a-rfb.dts | 5 +++++
|
|
arch/arm/dts/mt7986a-sd-rfb.dts | 5 +++++
|
|
arch/arm/dts/mt7986b-rfb.dts | 5 +++++
|
|
arch/arm/dts/mt7986b-sd-rfb.dts | 5 +++++
|
|
arch/arm/mach-mediatek/mt7622/init.c | 13 +++++++++----
|
|
arch/arm/mach-mediatek/mt7981/init.c | 11 +++++++++--
|
|
arch/arm/mach-mediatek/mt7986/init.c | 11 +++++++++--
|
|
board/mediatek/mt7622/mt7622_rfb.c | 1 -
|
|
include/configs/mt7622.h | 10 ----------
|
|
include/configs/mt7981.h | 9 ---------
|
|
include/configs/mt7986.h | 9 ---------
|
|
15 files changed, 67 insertions(+), 37 deletions(-)
|
|
|
|
--- a/arch/arm/dts/mt7981-emmc-rfb.dts
|
|
+++ b/arch/arm/dts/mt7981-emmc-rfb.dts
|
|
@@ -18,6 +18,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
+
|
|
reg_3p3v: regulator-3p3v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
--- a/arch/arm/dts/mt7981-rfb.dts
|
|
+++ b/arch/arm/dts/mt7981-rfb.dts
|
|
@@ -17,6 +17,11 @@
|
|
stdout-path = &uart0;
|
|
tick-timer = &timer0;
|
|
};
|
|
+
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
};
|
|
|
|
&uart0 {
|
|
--- a/arch/arm/dts/mt7981-sd-rfb.dts
|
|
+++ b/arch/arm/dts/mt7981-sd-rfb.dts
|
|
@@ -18,6 +18,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
+
|
|
reg_3p3v: regulator-3p3v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
--- a/arch/arm/dts/mt7986a-bpi-r3-sd.dts
|
|
+++ b/arch/arm/dts/mt7986a-bpi-r3-sd.dts
|
|
@@ -19,6 +19,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x80000000>;
|
|
+ };
|
|
+
|
|
reg_3p3v: regulator-3p3v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
--- a/arch/arm/dts/mt7986a-rfb.dts
|
|
+++ b/arch/arm/dts/mt7986a-rfb.dts
|
|
@@ -18,6 +18,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
+
|
|
reg_1p8v: regulator-1p8v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-1.8V";
|
|
--- a/arch/arm/dts/mt7986a-sd-rfb.dts
|
|
+++ b/arch/arm/dts/mt7986a-sd-rfb.dts
|
|
@@ -19,6 +19,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
+
|
|
reg_3p3v: regulator-3p3v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
--- a/arch/arm/dts/mt7986b-rfb.dts
|
|
+++ b/arch/arm/dts/mt7986b-rfb.dts
|
|
@@ -18,6 +18,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
+
|
|
reg_3p3v: regulator-3p3v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
--- a/arch/arm/dts/mt7986b-sd-rfb.dts
|
|
+++ b/arch/arm/dts/mt7986b-sd-rfb.dts
|
|
@@ -19,6 +19,11 @@
|
|
tick-timer = &timer0;
|
|
};
|
|
|
|
+ memory@40000000 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x40000000 0x10000000>;
|
|
+ };
|
|
+
|
|
reg_3p3v: regulator-3p3v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "fixed-3.3V";
|
|
--- a/arch/arm/mach-mediatek/mt7622/init.c
|
|
+++ b/arch/arm/mach-mediatek/mt7622/init.c
|
|
@@ -4,11 +4,14 @@
|
|
* Author: Sam Shih <sam.shih@mediatek.com>
|
|
*/
|
|
|
|
-#include <common.h>
|
|
#include <fdtdec.h>
|
|
#include <init.h>
|
|
#include <asm/armv8/mmu.h>
|
|
-#include <asm/cache.h>
|
|
+#include <asm/global_data.h>
|
|
+#include <asm/u-boot.h>
|
|
+#include <linux/sizes.h>
|
|
+
|
|
+DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int print_cpuinfo(void)
|
|
{
|
|
@@ -20,11 +23,13 @@ int dram_init(void)
|
|
{
|
|
int ret;
|
|
|
|
- ret = fdtdec_setup_memory_banksize();
|
|
+ ret = fdtdec_setup_mem_size_base();
|
|
if (ret)
|
|
return ret;
|
|
- return fdtdec_setup_mem_size_base();
|
|
|
|
+ gd->ram_size = get_ram_size((void *)gd->ram_base, SZ_2G);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
void reset_cpu(void)
|
|
--- a/arch/arm/mach-mediatek/mt7981/init.c
|
|
+++ b/arch/arm/mach-mediatek/mt7981/init.c
|
|
@@ -4,18 +4,25 @@
|
|
* Author: Sam Shih <sam.shih@mediatek.com>
|
|
*/
|
|
|
|
-#include <cpu_func.h>
|
|
+#include <fdtdec.h>
|
|
#include <init.h>
|
|
#include <asm/armv8/mmu.h>
|
|
#include <asm/system.h>
|
|
#include <asm/global_data.h>
|
|
+#include <asm/u-boot.h>
|
|
#include <linux/sizes.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int dram_init(void)
|
|
{
|
|
- gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_2G);
|
|
+ int ret;
|
|
+
|
|
+ ret = fdtdec_setup_mem_size_base();
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ gd->ram_size = get_ram_size((void *)gd->ram_base, SZ_1G);
|
|
|
|
return 0;
|
|
}
|
|
--- a/arch/arm/mach-mediatek/mt7986/init.c
|
|
+++ b/arch/arm/mach-mediatek/mt7986/init.c
|
|
@@ -4,18 +4,25 @@
|
|
* Author: Sam Shih <sam.shih@mediatek.com>
|
|
*/
|
|
|
|
-#include <cpu_func.h>
|
|
+#include <fdtdec.h>
|
|
#include <init.h>
|
|
#include <asm/armv8/mmu.h>
|
|
#include <asm/system.h>
|
|
#include <asm/global_data.h>
|
|
+#include <asm/u-boot.h>
|
|
#include <linux/sizes.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int dram_init(void)
|
|
{
|
|
- gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_2G);
|
|
+ int ret;
|
|
+
|
|
+ ret = fdtdec_setup_mem_size_base();
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ gd->ram_size = get_ram_size((void *)gd->ram_base, SZ_2G);
|
|
|
|
return 0;
|
|
}
|
|
--- a/board/mediatek/mt7622/mt7622_rfb.c
|
|
+++ b/board/mediatek/mt7622/mt7622_rfb.c
|
|
@@ -19,7 +19,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int board_init(void)
|
|
{
|
|
- gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
|
|
return 0;
|
|
}
|
|
|
|
--- a/include/configs/mt7622.h
|
|
+++ b/include/configs/mt7622.h
|
|
@@ -9,14 +9,4 @@
|
|
#ifndef __MT7622_H
|
|
#define __MT7622_H
|
|
|
|
-/* Uboot definition */
|
|
-#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE
|
|
-
|
|
-/* SPL -> Uboot */
|
|
-#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE
|
|
-/* DRAM */
|
|
-#define CFG_SYS_SDRAM_BASE 0x40000000
|
|
-
|
|
-/* Ethernet */
|
|
-
|
|
#endif
|
|
--- a/include/configs/mt7981.h
|
|
+++ b/include/configs/mt7981.h
|
|
@@ -9,13 +9,4 @@
|
|
#ifndef __MT7981_H
|
|
#define __MT7981_H
|
|
|
|
-/* Uboot definition */
|
|
-#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE
|
|
-
|
|
-/* SPL -> Uboot */
|
|
-#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE
|
|
-
|
|
-/* DRAM */
|
|
-#define CFG_SYS_SDRAM_BASE 0x40000000
|
|
-
|
|
#endif
|
|
--- a/include/configs/mt7986.h
|
|
+++ b/include/configs/mt7986.h
|
|
@@ -9,13 +9,4 @@
|
|
#ifndef __MT7986_H
|
|
#define __MT7986_H
|
|
|
|
-/* Uboot definition */
|
|
-#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE
|
|
-
|
|
-/* SPL -> Uboot */
|
|
-#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE
|
|
-
|
|
-/* DRAM */
|
|
-#define CFG_SYS_SDRAM_BASE 0x40000000
|
|
-
|
|
#endif
|