erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARMv7/Exynos: Fix memory location assumptions

Browse source 
This patch cleans out a lot of unused variables in the
ARM Kconfig files and introduces CONFIG_RAMSTAGE_BASE
which is similar to CONFIG_RAMBASE on x86.
This gets rid of the hard coded assumption that on ARM
coreboot is always executed at the lowest DRAM address.
But in fact, this might not be true because we might want
coreboot to live at the end of RAM, or in SRAM

BUG=none
BRANCH=none
TEST=successfully booted on pit.

Change-Id: I03e992645f9eb730e39a521aa21f702959311f74
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/168645
Reviewed-by: David Hendrix <dhendrix@chromium.org>
Tested-by: David Hendrix <dhendrix@chromium.org>
This commit is contained in:
Stefan Reinauer 2013-09-09 14:37:03 -07:00 • committed by chrome-internal-fetch
commit 15b87892eb
5 changed files with 26 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/arch/armv7/coreboot_ram.ld
View file

@ -1,7 +1,7 @@
/*
* Memory map:
*
* CONFIG_RAMBASE : text segment
* CONFIG_RAMSTAGE_BASE : text segment
* : rodata segment
* : data segment
* : bss segment
@ -26,7 +26,7 @@ ENTRY(stage_entry)
SECTIONS
{
. = CONFIG_SYS_SDRAM_BASE;
. = CONFIG_RAMSTAGE_BASE;
/* First we place the code and read only data (typically const declared).
* This could theoretically be placed in rom.
*/
@ -110,9 +110,6 @@ SECTIONS
}
_eheap = .;
_stack = CONFIG_STACK_BOTTOM;
_estack = CONFIG_STACK_TOP;
/* The ram segment. This includes all memory used by the memory
* resident copy of coreboot, except the tables that are produced on
* the fly, but including stack and heap.
@ -120,6 +117,12 @@ SECTIONS
_ram_seg = _text;
_eram_seg = _eheap;
/* The stack lives in SRAM in a different location, so keep
* it out of ram_seg
*/
_stack = CONFIG_STACK_BOTTOM;
_estack = CONFIG_STACK_TOP;
/* Discard the sections we don't need/want */
/DISCARD/ : {

2
src/arch/armv7/romstage.ld
View file

@ -1,7 +1,7 @@
/*
* Memory map:
*
* CONFIG_RAMBASE : text segment
* CONFIG_ROMSTAGE_BASE : text segment
* : rodata segment
* : data segment
* : bss segment

19
src/cpu/samsung/exynos5250/Kconfig
View file

@ -38,6 +38,9 @@ config CBFS_ROM_OFFSET
hex "offset of CBFS data in ROM"
default 0x0A000
config SYS_SDRAM_BASE
hex
default 0x40000000
# Example SRAM/iRAM map for Exynos5250 platform:
#
@ -54,9 +57,9 @@ config ROMSTAGE_BASE
hex
default 0x02030000
config ROMSTAGE_SIZE
config RAMSTAGE_BASE
hex
default 0x10000
default SYS_SDRAM_BASE
# Stack may reside in either IRAM or DRAM. We will define it to live
# at the top of IRAM for now.
@ -90,18 +93,6 @@ config TTB_BUFFER
hex "memory address of the TTB buffer"
default 0x02058000
config TTB_SIZE
hex "size of the TTB buffer"
default 0x4000
config SYS_SDRAM_BASE
hex
default 0x40000000
config COREBOOT_TABLES_SIZE
hex
default 0x4000000
choice CONSOLE_SERIAL_UART_CHOICES
prompt "Serial Console UART"
default CONSOLE_SERIAL_UART3

24
src/cpu/samsung/exynos5420/Kconfig
View file

@ -40,6 +40,9 @@ config CBFS_ROM_OFFSET
hex "offset of CBFS data in ROM"
default 0x0A000
config SYS_SDRAM_BASE
hex
default 0x20000000
# Example SRAM/iRAM map for Exynos5420 platform:
#
@ -63,9 +66,9 @@ config ROMSTAGE_BASE
hex
default 0x02030000
config ROMSTAGE_SIZE
config RAMSTAGE_BASE
hex
default 0x20000
default SYS_SDRAM_BASE
# Stack may reside in either IRAM or DRAM. We will define it to live
# at the top of IRAM for now.
@ -90,11 +93,6 @@ config STACK_BOTTOM
hex
default 0x0206f000
# The romstage stack must be large enough to contain the lzma buffer
config ROMSTAGE_STACK_SIZE
hex
default 0x4000
# STACK_SIZE is for the ramstage core and thread stacks.
# It must be a power of 2, to make the cpu_info computation work,
# and cpu_info needs to work to make SMP startup and threads work.
@ -116,18 +114,6 @@ config TTB_BUFFER
hex "memory address of the TTB buffer"
default 0x02058000
config TTB_SIZE
hex "size of the TTB buffer"
default 0x4000
config SYS_SDRAM_BASE
hex
default 0x20000000
config COREBOOT_TABLES_SIZE
hex
default 0x4000000
choice CONSOLE_SERIAL_UART_CHOICES
prompt "Serial Console UART"
default CONSOLE_SERIAL_UART3

35
src/mainboard/emulation/qemu-armv7/Kconfig
View file

@ -35,7 +35,7 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
default "QEMU ARMV7"
default "QEMU ARMv7"
config MAX_CPUS
int
@ -45,6 +45,10 @@ config MAINBOARD_VENDOR
string
default "ARM Ltd."
config SYS_SDRAM_BASE
hex "SDRAM base address"
default 0x01000000
config DRAM_SIZE_MB
int
default 1024
@ -64,17 +68,13 @@ config BOOTBLOCK_BASE
hex
default 0x00010000
config ID_SECTION_BASE
hex
default 0x0001f000
config ROMSTAGE_BASE
hex
default 0x00020000
config ROMSTAGE_SIZE
config RAMSTAGE_BASE
hex
default 0x20000
default SYS_SDRAM_BASE
config CBFS_HEADER_ROM_OFFSET
hex
@ -84,25 +84,4 @@ config CBFS_ROM_OFFSET
hex
default 0x0110000
config IRAM_STACK
hex
default 0x0007ff00
config XIP_ROM_SIZE
hex
default ROMSTAGE_SIZE
config SYS_SDRAM_BASE
hex "SDRAM base address"
default 0x01000000
config RAMBASE
hex
default SYS_SDRAM_BASE
# according to stefan, this is RAMBASE + 1M.
config RAMTOP
hex
default 0x01100000
endif # BOARD_EMULATION_QEMU_ARMV7