mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-07 04:58:57 +00:00
arm-bsp/fvp-base*: move to u-boot 2021.04
Remove fvp-base patch that has been merged upstream and rebase fvp-base-arm32 patch Change-Id: Iac16598933b94c1db13d3e40f1d5b3a137c8bd4c Signed-off-by: Anders Dellien <anders.dellien@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Anders Dellien
committed by
Jon Mason
Jon Mason
parent
2b887e62f3
commit
5832d2738d
@@ -15,7 +15,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
|
||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
|
||||
PREFERRED_VERSION_linux-yocto ?= "5.10%"
|
||||
|
||||
PREFERRED_VERSION_u-boot ?= "2021.01"
|
||||
PREFERRED_VERSION_u-boot ?= "2021.04"
|
||||
PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
|
||||
|
||||
EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From eb241dfffcf641d7f37e853e1795557796671b19 Mon Sep 17 00:00:00 2001
|
||||
From 6ae7b384eef45dd9f70e5e53c32cb14c56733013 Mon Sep 17 00:00:00 2001
|
||||
From: Anders Dellien <anders.dellien@arm.com>
|
||||
Date: Thu, 23 Jul 2020 17:32:55 +0100
|
||||
Subject: [PATCH] Add vexpress_aemv8a_aarch32 variant
|
||||
@@ -25,15 +25,15 @@ Signed-off-by: Anders Dellien <anders.dellien@arm.com>
|
||||
arch/arm/Kconfig | 5 +++
|
||||
board/armltd/vexpress64/Kconfig | 2 +-
|
||||
configs/vexpress_aemv8a_aarch32_defconfig | 40 +++++++++++++++++++++++
|
||||
include/configs/vexpress_aemv8a.h | 24 +++++++++-----
|
||||
4 files changed, 62 insertions(+), 9 deletions(-)
|
||||
include/configs/vexpress_aemv8a.h | 23 +++++++++----
|
||||
4 files changed, 62 insertions(+), 8 deletions(-)
|
||||
create mode 100644 configs/vexpress_aemv8a_aarch32_defconfig
|
||||
|
||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||
index fbe90875ae..8468bfb45b 100644
|
||||
index 3307f2b3fc..0389e04cfb 100644
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1187,6 +1187,11 @@ config TARGET_VEXPRESS64_BASE_FVP
|
||||
@@ -1184,6 +1184,11 @@ config TARGET_VEXPRESS64_BASE_FVP
|
||||
select PL01X_SERIAL
|
||||
select SEMIHOSTING
|
||||
|
||||
@@ -57,7 +57,7 @@ index 1d13f542e6..dad181c93c 100644
|
||||
default "vexpress64"
|
||||
diff --git a/configs/vexpress_aemv8a_aarch32_defconfig b/configs/vexpress_aemv8a_aarch32_defconfig
|
||||
new file mode 100644
|
||||
index 0000000000..cf1e8d5cae
|
||||
index 0000000000..0726e0d0db
|
||||
--- /dev/null
|
||||
+++ b/configs/vexpress_aemv8a_aarch32_defconfig
|
||||
@@ -0,0 +1,40 @@
|
||||
@@ -102,7 +102,7 @@ index 0000000000..cf1e8d5cae
|
||||
+CONFIG_DM_SERIAL=y
|
||||
+CONFIG_PL01X_SERIAL=y
|
||||
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
|
||||
index e63c335f85..edded8c52b 100644
|
||||
index 7318fb6c58..f223811134 100644
|
||||
--- a/include/configs/vexpress_aemv8a.h
|
||||
+++ b/include/configs/vexpress_aemv8a.h
|
||||
@@ -9,8 +9,15 @@
|
||||
@@ -132,8 +132,8 @@ index e63c335f85..edded8c52b 100644
|
||||
#define GICD_BASE (0x2f000000)
|
||||
#define GICC_BASE (0x2c000000)
|
||||
#elif CONFIG_TARGET_VEXPRESS64_JUNO
|
||||
@@ -159,7 +167,8 @@
|
||||
"booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
|
||||
@@ -164,7 +172,8 @@
|
||||
#endif
|
||||
|
||||
|
||||
-#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
|
||||
@@ -142,7 +142,7 @@ index e63c335f85..edded8c52b 100644
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"kernel_name=Image\0" \
|
||||
"kernel_addr=0x80080000\0" \
|
||||
@@ -168,7 +177,9 @@
|
||||
@@ -173,7 +182,9 @@
|
||||
"fdtfile=devtree.dtb\0" \
|
||||
"fdt_addr=0x83000000\0" \
|
||||
"boot_name=boot.img\0" \
|
||||
@@ -151,9 +151,9 @@ index e63c335f85..edded8c52b 100644
|
||||
+ "fdt_high=0xffffffffffffffff\0" \
|
||||
+ "initrd_high=0xffffffffffffffff\0"
|
||||
|
||||
#ifndef CONFIG_BOOTCOMMAND
|
||||
#define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \
|
||||
" set bootargs; " \
|
||||
@@ -177,18 +188,15 @@
|
||||
@@ -183,15 +194,13 @@
|
||||
" bootm ${boot_addr} ${boot_addr} " \
|
||||
" ${fdt_addr}; " \
|
||||
"else; " \
|
||||
@@ -168,11 +168,8 @@ index e63c335f85..edded8c52b 100644
|
||||
- " booti $kernel_addr - $fdt_addr; " \
|
||||
+ BOOT_TYPE " $kernel_addr - $fdt_addr; " \
|
||||
"fi"
|
||||
|
||||
-
|
||||
#endif
|
||||
|
||||
/* Monitor Command Prompt */
|
||||
#endif
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
From 9abe5e68033dab0d521475090ffd0cef9cb2c581 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <9abe5e68033dab0d521475090ffd0cef9cb2c581.1614260356.git.diego.sueiro@arm.com>
|
||||
From: Diego Sueiro <diego.sueiro@arm.com>
|
||||
Date: Mon, 15 Feb 2021 07:27:57 +0000
|
||||
Subject: [PATCH] vexpress64_fvp: Set DRAM to 4G to match with kernel
|
||||
devicetree
|
||||
|
||||
Currently, the kernel devicetree is setting the DRAM size to ~4G.
|
||||
|
||||
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
|
||||
---
|
||||
configs/vexpress_aemv8a_semi_defconfig | 2 +-
|
||||
include/configs/vexpress_aemv8a.h | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
|
||||
index a26137ef5d..2ecb7762ce 100644
|
||||
--- a/configs/vexpress_aemv8a_semi_defconfig
|
||||
+++ b/configs/vexpress_aemv8a_semi_defconfig
|
||||
@@ -2,7 +2,7 @@ CONFIG_ARM=y
|
||||
CONFIG_TARGET_VEXPRESS64_BASE_FVP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x88000000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
-CONFIG_NR_DRAM_BANKS=1
|
||||
+CONFIG_NR_DRAM_BANKS=2
|
||||
CONFIG_SYS_MEMTEST_START=0x80000000
|
||||
CONFIG_SYS_MEMTEST_END=0xff000000
|
||||
CONFIG_ENV_SIZE=0x40000
|
||||
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
|
||||
index 566bee5b87..7318fb6c58 100644
|
||||
--- a/include/configs/vexpress_aemv8a.h
|
||||
+++ b/include/configs/vexpress_aemv8a.h
|
||||
@@ -117,6 +117,9 @@
|
||||
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
||||
#define PHYS_SDRAM_2 (0x880000000)
|
||||
#define PHYS_SDRAM_2_SIZE 0x180000000
|
||||
+#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP && CONFIG_NR_DRAM_BANKS == 2
|
||||
+#define PHYS_SDRAM_2 (0x880000000)
|
||||
+#define PHYS_SDRAM_2_SIZE 0x80000000
|
||||
#endif
|
||||
|
||||
/* Enable memtest */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -5,9 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
#
|
||||
# FVP BASE
|
||||
#
|
||||
SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch \
|
||||
file://0001-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch \
|
||||
"
|
||||
SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
|
||||
|
||||
#
|
||||
# FVP BASE ARM32
|
||||
|
||||
Reference in New Issue
Block a user