armv7:TI: Add <asm/ti-common/sys_proto.h> and migrate omap_hw_init_context

[karo-tx-uboot.git] / arch / arm / include / asm / arch-omap5 / sys_proto.h

diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h
index bf12c7337247e9e969a826d1c1da34fd27f99e64..103830319a414d31f10a7d8ad05571111650ae9d 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap5/sys_proto.h
@@ -14,6 +14,7 @@
 #include <asm/omap_common.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/clock.h>
+#include <asm/ti-common/sys_proto.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -56,55 +57,6 @@ void get_ioregs(const struct ctrl_ioregs **regs);
 void srcomp_enable(void);
 void setup_warmreset_time(void);
 
-static inline u32 running_from_sdram(void)
-{
-       u32 pc;
-       asm volatile ("mov %0, pc" : "=r" (pc));
-       return ((pc >= OMAP54XX_DRAM_ADDR_SPACE_START) &&
-           (pc < OMAP54XX_DRAM_ADDR_SPACE_END));
-}
-
-static inline u8 uboot_loaded_by_spl(void)
-{
-       /*
-        * u-boot can be running from sdram either because of configuration
-        * Header or by SPL. If because of CH, then the romcode sets the
-        * CHSETTINGS executed bit to true in the boot parameter structure that
-        * it passes to the bootloader.This parameter is stored in the ch_flags
-        * variable by both SPL and u-boot.Check out for CHSETTINGS, which is a
-        * mandatory section if CH is present.
-        */
-       if ((gd->arch.omap_boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS))
-               return 0;
-       else
-               return running_from_sdram();
-}
-/*
- * The basic hardware init of OMAP(s_init()) can happen in 4
- * different contexts:
- *  1. SPL running from SRAM
- *  2. U-Boot running from FLASH
- *  3. Non-XIP U-Boot loaded to SDRAM by SPL
- *  4. Non-XIP U-Boot loaded to SDRAM by ROM code using the
- *     Configuration Header feature
- *
- * This function finds this context.
- * Defining as inline may help in compiling out unused functions in SPL
- */
-static inline u32 omap_hw_init_context(void)
-{
-#ifdef CONFIG_SPL_BUILD
-       return OMAP_INIT_CONTEXT_SPL;
-#else
-       if (uboot_loaded_by_spl())
-               return OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL;
-       else if (running_from_sdram())
-               return OMAP_INIT_CONTEXT_UBOOT_AFTER_CH;
-       else
-               return OMAP_INIT_CONTEXT_UBOOT_FROM_NOR;
-#endif
-}
-
 static inline u32 div_round_up(u32 num, u32 den)
 {
        return (num + den - 1)/den;