[U-Boot] AT91RM9200 relocation

[Nícolas Carneiro Lebedenco]

Hi,

I'm porting u-boot to a custom board based on the at91rm9200-dk (only 
exception is that only parallel nor flash is available on my board)

Soon I realized that I could load u-boot 1.1.4 from flash but not u-boot 
1.3.4. It really bugged me until I noticed some differences in 
cpu/arm920t/start.S and came across this patch
"Fix regression introduced by a typo in 'Tidied other..." introduced by 
Guennadi Liakhovetski in the main branch on 2008-04-18 as follows:

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
 index ae86002..acc00ad 100644 (file)
 
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -178,7 +178,7 @@ copyex:
        bl      cpu_init_crit
 #endif
 
-#ifdef CONFIG_AT91RM9200
+#ifndef        CONFIG_AT91RM9200
 
 #ifndef CONFIG_SKIP_RELOCATE_UBOOT
 relocate:                              /* relocate U-Boot to RAM           */
--

The point is I can only get u-boot to load from nor flash if I remove the 
#ifndef condition. So what was the reason behind this patch after all. Is the 
relocation supposed to take place somewhere else? Maybe someone has already 
pointed that out and got it fixed in the main branch?

Regards,

Nícolas