test/py: Import 'configparser' lower case to be python 3.x safe

[u-boot] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index fa667c764bc650a13b29ddd15d2859dfa657ce68..e943347ce3dfdf32a6f9b8dc233833539295da66 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -394,19 +394,21 @@ static int reserve_trace(void)
 
 static int reserve_uboot(void)
 {
-       /*
-        * reserve memory for U-Boot code, data & bss
-        * round down to next 4 kB limit
-        */
-       gd->relocaddr -= gd->mon_len;
-       gd->relocaddr &= ~(4096 - 1);
-#if defined(CONFIG_E500) || defined(CONFIG_MIPS)
-       /* round down to next 64 kB limit so that IVPR stays aligned */
-       gd->relocaddr &= ~(65536 - 1);
-#endif
-
-       debug("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10,
-             gd->relocaddr);
+       if (!(gd->flags & GD_FLG_SKIP_RELOC)) {
+               /*
+                * reserve memory for U-Boot code, data & bss
+                * round down to next 4 kB limit
+                */
+               gd->relocaddr -= gd->mon_len;
+               gd->relocaddr &= ~(4096 - 1);
+       #if defined(CONFIG_E500) || defined(CONFIG_MIPS)
+               /* round down to next 64 kB limit so that IVPR stays aligned */
+               gd->relocaddr &= ~(65536 - 1);
+       #endif
+
+               debug("Reserving %ldk for U-Boot at: %08lx\n",
+                     gd->mon_len >> 10, gd->relocaddr);
+       }
 
        gd->start_addr_sp = gd->relocaddr;