diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/arch/arm/bootblock.ld | 1 | ||||
| -rw-r--r-- | src/arch/arm/verstage.ld | 67 |
3 files changed, 71 insertions, 2 deletions
diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index e339be10d2..25f764c25f 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -72,7 +72,10 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARM # verification stage ############################################################################### -verstage-y += early_console.c +$(objcbfs)/verstage.debug: $$(verstage-objs) $(src)/arch/arm/verstage.ld $(obj)/ldoptions $$(VB2_LIB) + @printf " LINK $(subst $(obj)/,,$(@))\n" + $(LD_verstage) --gc-sections -static -o $@ -L$(obj) --start-group $(verstage-objs) --end-group -T $(src)/arch/arm/verstage.ld + verstage-y += div0.c verstage-y += eabi_compat.c verstage-y += memset.S diff --git a/src/arch/arm/bootblock.ld b/src/arch/arm/bootblock.ld index 8a410ecfaf..23d66f1e76 100644 --- a/src/arch/arm/bootblock.ld +++ b/src/arch/arm/bootblock.ld @@ -51,7 +51,6 @@ SECTIONS } : to_load = 0xff preram_cbmem_console = CONFIG_CONSOLE_PRERAM_BUFFER_BASE; - verstage_preram_cbmem_console = CONFIG_CONSOLE_PRERAM_BUFFER_BASE; /DISCARD/ : { *(.comment) diff --git a/src/arch/arm/verstage.ld b/src/arch/arm/verstage.ld new file mode 100644 index 0000000000..f0e88e5902 --- /dev/null +++ b/src/arch/arm/verstage.ld @@ -0,0 +1,67 @@ +/* + * Memory map: + * + * CONFIG_VERSTAGE_BASE : text segment + * : rodata segment + * : data segment + * : bss segment + */ + +/* We use ELF as output format. So that we can debug the code in some form. */ +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +INCLUDE ldoptions + +PHDRS +{ + to_load PT_LOAD; +} + +ENTRY(stage_entry) + +SECTIONS +{ + . = CONFIG_VERSTAGE_BASE; + + .romtext . : { + _start = .; + *(.text.stage_entry.arm); + *(.text.startup); + *(.text); + *(.text.*); + } : to_load + + .romdata . : { + *(.rodata); + *(.rodata.*); + *(.data); + *(.data.*); + . = ALIGN(8); + } + + /* bss does not contain data, it is just a space that should be zero + * initialized on startup. (typically uninitialized global variables) + */ + .bss . : { + . = ALIGN(8); + _bss = .; + *(.bss) + *(.bss.*) + *(.sbss) + *(.sbss.*) + _ebss = .; + } + + _end = .; + + preram_cbmem_console = CONFIG_CONSOLE_PRERAM_BUFFER_BASE; + + /* Discard the sections we don't need/want */ + /DISCARD/ : { + *(.comment) + *(.note) + *(.comment.*) + *(.note.*) + *(.eh_frame); + } +} |