From ff78f91dd71f5537ae498d961f157574b9190075 Mon Sep 17 00:00:00 2001 From: sameeruddin shaik Date: Thu, 13 Dec 2018 13:01:06 +0530 Subject: [PATCH] ipq6018: Adding the config_no_reloc in cypress config making one config for relocation disabling in u-boot, rather than specifying target name and checking for every target Change-Id: I99895d0f0b1c750bbb796beb3a8f3e6cd5d1a20b Signed-off-by: sameeruddin shaik --- arch/arm/lib/crt0.S | 4 ++-- include/configs/ipq6018.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index e8afb7331f..408a058323 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -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 diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h index e00461369f..7d5012ceb2 100644 --- a/include/configs/ipq6018.h +++ b/include/configs/ipq6018.h @@ -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