dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

arm: mediatek: retrieve ram_base from dts node for armv8 platform

Browse Source 
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>
This commit is contained in:
Weijie Gao
2023-07-19 17:15:41 +08:00
committed by Tom Rini
parent 35e6c89b76
commit 5fd6d4c7b3
15 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/dts/mt7981-emmc-rfb.dts
View File

@@ -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";

5
arch/arm/dts/mt7981-rfb.dts
View File

@@ -17,6 +17,11 @@
stdout-path = &uart0;
tick-timer = &timer0;
};
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000>;
};
};
&uart0 {

5
arch/arm/dts/mt7981-sd-rfb.dts
View File

@@ -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";

5
arch/arm/dts/mt7986a-bpi-r3-sd.dts
View File

@@ -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";

5
arch/arm/dts/mt7986a-rfb.dts
View File

@@ -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";

5
arch/arm/dts/mt7986a-sd-rfb.dts
View File

@@ -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";

5
arch/arm/dts/mt7986b-rfb.dts
View File

@@ -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";

5
arch/arm/dts/mt7986b-sd-rfb.dts
View File

@@ -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";

14
arch/arm/mach-mediatek/mt7622/init.c
View File

@@ -4,11 +4,15 @@
* 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/system.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 +24,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)

11
arch/arm/mach-mediatek/mt7981/init.c
View File

@@ -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;
}

11
arch/arm/mach-mediatek/mt7986/init.c
View File

@@ -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;
}

1
board/mediatek/mt7622/mt7622_rfb.c
View File

@@ -14,7 +14,6 @@ DECLARE_GLOBAL_DATA_PTR;
int board_init(void)
{
gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
return 0;
}

10
include/configs/mt7622.h
View File

@@ -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

9
include/configs/mt7981.h
View File

@@ -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

9
include/configs/mt7986.h
View File

@@ -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