karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / arch / arm / cpu / arm926ejs / mxs / mxs.c

diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 6f09f627ae9ce86efdc07a49c90244101c9c71a4..f3c1575a36897bff3c6913be37309d70c1db120f 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -113,8 +113,17 @@ void mx28_fixup_vt(uint32_t start_addr)
        uint32_t *vt = (uint32_t *)0x20;
        uint32_t cr = get_cr();
 
+<<<<<<< HEAD
+       for (i = 0; i < 8; i++) {
+               /* cppcheck-suppress nullPointer */
+               vt[i] = ldr_pc;
+               /* cppcheck-suppress nullPointer */
+               vt[i + 8] = start_addr + (4 * i);
+       }
+=======
        memcpy(vt, (void *)start_addr + 0x20, 32);
        set_cr(cr & ~CR_V);
+>>>>>>> karo-tx-uboot
 }
 
 #ifdef CONFIG_ARCH_MISC_INIT