LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge http://git.denx.de/u-boot-dm

This commit is contained in:
Tom Rini 2014-08-04 10:16:27 -04:00
parent 6e7b7df4df 76a1e584e1
commit aa159e681e
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -3752,6 +3752,9 @@ Configuration Settings:
Pre-relocation malloc() is only supported on sandbox Pre-relocation malloc() is only supported on sandbox
at present but is fairly easy to enable for other archs. at present but is fairly easy to enable for other archs.
Pre-relocation malloc() is only supported on ARM at present
but is fairly easy to enable for other archs.
- CONFIG_SYS_BOOTM_LEN: - CONFIG_SYS_BOOTM_LEN:
Normally compressed uImages are limited to an Normally compressed uImages are limited to an
uncompressed size of 8 MBytes. If this is not enough, uncompressed size of 8 MBytes. If this is not enough,

2
arch/arm/include/asm/config.h
View File

@ -7,7 +7,9 @@
#ifndef _ASM_CONFIG_H_ #ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
#ifdef __aarch64__
#define CONFIG_SYS_GENERIC_GLOBAL_DATA #define CONFIG_SYS_GENERIC_GLOBAL_DATA
#endif
#define CONFIG_LMB #define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_SYS_BOOT_RAMDISK_HIGH

12
arch/arm/lib/crt0.S
View File

@ -67,10 +67,22 @@ ENTRY(_main)
ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
#endif #endif
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
mov r2, sp
sub sp, sp, #GD_SIZE /* allocate one GD above SP */ sub sp, sp, #GD_SIZE /* allocate one GD above SP */
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
mov r9, sp /* GD is above SP */ mov r9, sp /* GD is above SP */
mov r1, sp
mov r0, #0 mov r0, #0
clr_gd:
cmp r1, r2 /* while not at end of GD */
strlo r0, [r1] /* clear 32-bit GD word */
addlo r1, r1, #4 /* move to next */
blo clr_gd
#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_BUILD)
sub sp, sp, #CONFIG_SYS_MALLOC_F_LEN
str sp, [r9, #GD_MALLOC_BASE]
#endif
/* mov r0, #0 not needed due to above code */
bl board_init_f bl board_init_f
#if ! defined(CONFIG_SPL_BUILD) #if ! defined(CONFIG_SPL_BUILD)