Merge "ipq6018: Adding the config_no_reloc in cypress config"

This commit is contained in:
Linux Build Service Account 2018-12-18 06:34:03 -08:00 committed by Gerrit - the friendly Code Review server
commit d63d4e2a85
2 changed files with 3 additions and 2 deletions

View file

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

View file

@ -25,6 +25,7 @@
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_VSNPRINTF
#define CONFIG_IPQ_NO_RELOC
#define CONFIG_IPQ6018_UART
#define CONFIG_NR_DRAM_BANKS 1