arm:omap: Fix a bug in SRAM init code

[sitara-epos/sitara-epos-kernel.git] / arch / arm / plat-omap / sram.c

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 343c4f9e2103c57002f8db9394245ede23b4604b..24100b528f88666e77795b0953aa22751aab7349 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -155,18 +155,6 @@ static void __init omap_detect_sram(void)
                        omap_sram_size = 0x4000;
                }
        }
                        omap_sram_size = 0x4000;
                }
        }

-       {
-               /* The first SRAM_BOOTLOADER_SZ of SRAM are reserved */
-               void *base = (void *)omap_sram_base + SRAM_BOOTLOADER_SZ;
-               phys_addr_t phys = omap_sram_start + SRAM_BOOTLOADER_SZ;
-               size_t len = omap_sram_size - SRAM_BOOTLOADER_SZ;
-
-               omap_gen_pool = gen_pool_create(ilog2(FNCPY_ALIGN), -1);
-               if (omap_gen_pool)
-                       WARN_ON(gen_pool_add_virt(omap_gen_pool,
-                                       (unsigned long)base, phys, len, -1));
-               WARN_ON(!omap_gen_pool);
-       }

 }
 
 /*
 }
 
 /*


@@ -208,6 +196,18 @@ static void __init omap_map_sram(void)
         */
        memset((void *)omap_sram_base + SRAM_BOOTLOADER_SZ, 0,
               omap_sram_size - SRAM_BOOTLOADER_SZ);
         */
        memset((void *)omap_sram_base + SRAM_BOOTLOADER_SZ, 0,
               omap_sram_size - SRAM_BOOTLOADER_SZ);

+       {
+               /* The first SRAM_BOOTLOADER_SZ of SRAM are reserved */
+               void *base = (void *)omap_sram_base + SRAM_BOOTLOADER_SZ;
+               phys_addr_t phys = omap_sram_start + SRAM_BOOTLOADER_SZ;
+               size_t len = omap_sram_size - SRAM_BOOTLOADER_SZ;
+
+               omap_gen_pool = gen_pool_create(ilog2(FNCPY_ALIGN), -1);
+               if (omap_gen_pool)
+                       WARN_ON(gen_pool_add_virt(omap_gen_pool,
+                                       (unsigned long)base, phys, len, -1));
+               WARN_ON(!omap_gen_pool);
+       }

 }
 
 #ifdef CONFIG_ARCH_OMAP1
 }
 
 #ifdef CONFIG_ARCH_OMAP1