mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

qca: ipq40xx: Skip arm relocation

Browse source 
Change-Id: Ia2ddea65a97a256ea729e24a11d4800bdeeba385
Signed-off-by: Akila N <akilan@codeaurora.org>
This commit is contained in:
Akila N 2016-04-19 12:32:31 +05:30
parent db12b96ef1
commit a69dc457ac
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/lib/crt0.S
View file

@ -86,7 +86,7 @@ ENTRY(_main)
bl board_init_f_mem bl board_init_f_mem
mov sp, r0 mov sp, r0
#ifdef CONFIG_ARCH_IPQ807x #if defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ40xx)
ldr r0, =__bss_start /* this is auto-relocated! */ ldr r0, =__bss_start /* this is auto-relocated! */
#ifdef CONFIG_USE_ARCH_MEMSET #ifdef CONFIG_USE_ARCH_MEMSET
@ -156,7 +156,7 @@ here:
cmp r0, #0 cmp r0, #0
movne sp, r0 movne sp, r0
# endif # endif
#ifndef CONFIG_ARCH_IPQ807x #if !defined(CONFIG_ARCH_IPQ807x) && !defined(CONFIG_ARCH_IPQ40xx)
ldr r0, =__bss_start /* this is auto-relocated! */ ldr r0, =__bss_start /* this is auto-relocated! */
#ifdef CONFIG_USE_ARCH_MEMSET #ifdef CONFIG_USE_ARCH_MEMSET

2
common/board_f.c
View file

@ -1061,7 +1061,7 @@ void board_init_f(ulong boot_flags)
gd->flags = boot_flags; gd->flags = boot_flags;
gd->have_console = 0; gd->have_console = 0;
#ifdef CONFIG_ARCH_IPQ807x #if defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ40xx)
gd->flags |= GD_FLG_SKIP_RELOC; gd->flags |= GD_FLG_SKIP_RELOC;
#endif #endif

5
include/configs/ipq40xx.h
View file

@ -46,7 +46,10 @@
#define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_TEXT_BASE 0x87300000 #define CONFIG_SYS_TEXT_BASE 0x87300000
#define CONFIG_SYS_SDRAM_SIZE 0x10000000 #define CONFIG_SYS_SDRAM_SIZE 0x10000000
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x100000 - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE -\
CONFIG_SYS_MALLOC_LEN -\
CONFIG_ENV_SIZE -\
GENERATED_BD_INFO_SIZE)
#define CONFIG_MAX_RAM_BANK_SIZE CONFIG_SYS_SDRAM_SIZE #define CONFIG_MAX_RAM_BANK_SIZE CONFIG_SYS_SDRAM_SIZE
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (64 << 20)) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (64 << 20))
#define CONFIG_DTB_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (96 << 20)) #define CONFIG_DTB_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (96 << 20))