mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 07:31:15 +00:00
powerpc/mpc85xx: support application without resetvec segment in the linker script
For SD/SPI 2-stage bootloader, the On-Chip Rom code loads the SPL into L2 SRAM, then jump to it to begin execution. After that, the SPL loads the final uboot image into DDR, then jump to it to begin execution. The segment .resetvec in the SPL and in final U-boot is useless. So, add new symbols CONFIG_SYS_MPC85XX_NO_RESETVEC for this application. If CONFIG_SYS_MPC85XX_NO_RESETVEC is set, the segment .resetvec is excluded and the segment .bootpg is placed in the previous 4K of the segment .text. Signed-off-by: Ying Zhang <b40530@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
parent
505c293ffd
commit
5df572f013
3 changed files with 27 additions and 0 deletions
5
README
5
README
|
@ -4088,6 +4088,11 @@ Low Level (hardware related) configuration options:
|
|||
that is executed before the actual U-Boot. E.g. when
|
||||
compiling a NAND SPL.
|
||||
|
||||
- CONFIG_SYS_MPC85XX_NO_RESETVEC
|
||||
Only for 85xx systems. If this variable is specified, the section
|
||||
.resetvec is not kept and the section .bootpg is placed in the
|
||||
previous 4k of the .text section.
|
||||
|
||||
- CONFIG_ARCH_MAP_SYSMEM
|
||||
Generally U-Boot (and in particular the md command) uses
|
||||
effective address. It is therefore not necessary to regard
|
||||
|
|
|
@ -26,6 +26,13 @@
|
|||
#include "config.h" /* CONFIG_BOARDDIR */
|
||||
|
||||
OUTPUT_ARCH(powerpc)
|
||||
#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
|
||||
PHDRS
|
||||
{
|
||||
text PT_LOAD;
|
||||
bss PT_LOAD;
|
||||
}
|
||||
#endif
|
||||
SECTIONS
|
||||
{
|
||||
. = CONFIG_SPL_TEXT_BASE;
|
||||
|
@ -68,9 +75,16 @@ SECTIONS
|
|||
#else
|
||||
#error unknown NAND controller
|
||||
#endif
|
||||
#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
|
||||
.bootpg ADDR(.text) - 0x1000 :
|
||||
{
|
||||
KEEP(*(.bootpg))
|
||||
} :text = 0xffff
|
||||
#else
|
||||
.resetvec ADDR(.text) + RESET_VECTOR_OFFSET : {
|
||||
KEEP(*(.resetvec))
|
||||
} = 0xffff
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Make sure that the bss segment isn't linked at 0x0, otherwise its
|
||||
|
|
|
@ -95,6 +95,13 @@ SECTIONS
|
|||
. = ALIGN(256);
|
||||
__init_end = .;
|
||||
|
||||
#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
|
||||
.bootpg ADDR(.text) - 0x1000 :
|
||||
{
|
||||
KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
|
||||
} :text = 0xffff
|
||||
. = ADDR(.text) + 0x80000;
|
||||
#else
|
||||
.bootpg RESET_VECTOR_ADDRESS - 0xffc :
|
||||
{
|
||||
arch/powerpc/cpu/mpc85xx/start.o (.bootpg)
|
||||
|
@ -116,6 +123,7 @@ SECTIONS
|
|||
*/
|
||||
#if (RESET_VECTOR_ADDRESS == 0xfffffffc)
|
||||
. |= 0x10;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
__bss_start = .;
|
||||
|
|
Loading…
Reference in a new issue