Xilinx: ARM: Report a more helpful error on undefined header entry

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index f56d8c274dc578be4f5f800a92d42fba31729d3e..c04eb05f1d6e7bf81e8103b2cfbb4b9e150ff72a 100644 (file)
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -44,6 +44,9 @@ _start: b     reset
        ldr     pc, _fiq
 
 #ifdef CONFIG_PELE_XILINX_FLASH_HEADER
+#if !defined(CONFIG_PELE_XIP_START) || CONFIG_PELE_XIP_START == 0
+#error CONFIG_PELE_XIP_START must be defined for CONFIG_PELE_XILINX_FLASH_HEADER
+#else
 /* These fields MUST immediately follow the vectors */
 #define HDR_20 0xAA995566
 #define HDR_24 0x584C4E58
@@ -74,6 +77,7 @@ _start: b     reset
 .word   0xFFFFFFFF      /* 0xA0 */
 .word   0x00000000
 #endif
+#endif
 
 _undefined_instruction: .word undefined_instruction
 _software_interrupt:   .word software_interrupt