[U-Boot-Users] [Patch 11/17 Try 3] U-Boot-V2:ARM:OMAP3: Add support forOMAP3Silicon files
Menon, Nishanth
x0nishan at ti.com
Wed Jun 4 07:06:43 CEST 2008
Sascha,
> -----Original Message-----
> From: Sascha Hauer [mailto:s.hauer at pengutronix.de]
> Sent: Tuesday, June 03, 2008 12:49 PM
> To: Menon, Nishanth
> Cc: Peter Pearse; u-boot-users at lists.sourceforge.net; Kamat, Nishant; Syed Mohammed, Khasim; Laurent
> Desnogues; philip.balister at gmail.com
> Subject: Re: [Patch 11/17 Try 2] U-Boot-V2:ARM:OMAP3: Add support forOMAP3Silicon files
>
> On Tue, Jun 03, 2008 at 10:36:05AM -0500, Menon, Nishanth wrote:
> > Sascha,
> > > -----Original Message-----
> > > From: Sascha Hauer [mailto:s.hauer at pengutronix.de]
> > > Sent: Tuesday, June 03, 2008 3:18 AM
> > > To: Menon, Nishanth
> > > Cc: Peter Pearse; u-boot-users at lists.sourceforge.net; Kamat, Nishant; Syed Mohammed, Khasim;
> Laurent
> > > Desnogues; philip.balister at gmail.com
> > > Subject: Re: [Patch 11/17 Try 2] U-Boot-V2:ARM:OMAP3: Add support for OMAP3Silicon files
> > >
> > > On Wed, May 28, 2008 at 10:39:07AM -0500, Menon, Nishanth wrote:
> > > > As per the thread in:
> > > > http://www.nabble.com/-Patch-06-17--U-Boot-V2%3AARM%3A-Add-sizes.h-tt17372780.html#a17372780
> > > > sizes.h dependency is removed from the following patch. This is a resubmission.
> > > >
> > > > This patch introduces support for OMAP3430 - provides for generic OMAP3 files.
> > >
> > > Looks ok to me besides the occurences of return with the value in
> > > brackets.
> > >
> > > Sascha
> > Arrgh.. I have myself to blame for inconsistent return styles. Probably we need an equivalent of
> checkpatch and a Lindent for U-Boot v2? I suppose the right style is return without brackets?
>
> Yes it is, but that's somewhere on the boarder to nitpicking, don't know
> which side though ;)
With the cleanups :(.
Signed-off-by: Nishanth Menon<x0nishan at ti.com>
---
arch/arm/mach-omap/Kconfig | 65 +++++
arch/arm/mach-omap/Makefile | 25 ++
arch/arm/mach-omap/omap3_core.S | 101 ++++++++
arch/arm/mach-omap/omap3_generic.c | 450 +++++++++++++++++++++++++++++++++++++
arch/arm/mach-omap/syslib.c | 97 +++++++
5 files changed, 738 insertions(+)
Index: u-boot.v2/arch/arm/mach-omap/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot.v2/arch/arm/mach-omap/Kconfig 2008-06-03 22:47:24.000000000 -0500
@@ -0,0 +1,65 @@
+#
+# OMAP Architecture specific features
+#
+# (C) Copyright 2008
+# Texas Instruments, <www.ti.com>
+# Nishanth Menon <x0nishan at ti.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+
+menu "OMAP Features"
+ depends on ARCH_OMAP
+
+choice
+ prompt "Select OMAP Variant"
+
+config ARCH_OMAP3
+ bool "OMAP3"
+ select ARMCORTEXA8
+ select ARCH_HAS_LOWLEVEL_INIT
+ help
+ Say Y here if you are using Texas Instrument's OMAP343x based platform
+
+endchoice
+
+config OMAP_CONFIG_STACKSIZE
+ prompt "STACKSIZE"
+ hex
+ default 0x00020000
+ help
+ Select the Stack Size
+
+config OMAP_MALLOC_LEN
+ prompt "MALLOC LENGTH"
+ hex
+ default 0x00001000
+ help
+ Select the Malloc Length
+
+config ARCH_TEXT_BASE
+ prompt "ARCH TEXT BASE"
+ hex
+ default 0x80e80000
+ help
+ Select the load address
+
+config OMAP3_CLOCK_CONFIG
+ depends on ARCH_OMAP
+ bool "Clock Configuration"
+ help
+ Say Y here if you like to have OMAP3 Clock configuration done.
+
+endmenu
Index: u-boot.v2/arch/arm/mach-omap/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot.v2/arch/arm/mach-omap/Makefile 2008-06-03 22:47:24.000000000 -0500
@@ -0,0 +1,25 @@
+# OMAP Architecture Makefile
+#
+# (C) Copyright 2008
+# Texas Instruments, <www.ti.com>
+# Nishanth Menon <x0nishan at ti.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+obj-$(CONFIG_ARCH_OMAP) += syslib.o
+obj-$(CONFIG_OMAP_CLOCK_SOURCE_S32K) += s32k_clksource.o
+obj-$(CONFIG_ARCH_OMAP3) += omap3_core.o omap3_generic.o
+obj-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock_core.o omap3_clock.o
Index: u-boot.v2/arch/arm/mach-omap/omap3_core.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot.v2/arch/arm/mach-omap/omap3_core.S 2008-06-03 22:47:24.000000000 -0500
@@ -0,0 +1,101 @@
+/**
+ * @file
+ * @brief Provide Architecture level Initialization
+ *
+ * FileName: arch/arm/mach-omap/omap3_core.S
+ *
+ * This provides OMAP3 Architecture initialization. Among these,
+ * @li OMAP ROM Code is located in SRAM, we can piggy back on
+ * the same addresses
+ * @li If clock initialization is required, call the same.
+ * @li Setup a temporary SRAM stack which is necessary to call C
+ * functions.
+ * @li Call architecture initialization function a_init
+ *
+ * arch_init_lowlevel is enabled if CONFIG_ARCH_HAS_LOWLEVEL_INIT is defined
+ * cpy_clk_code is called if CONFIG_OMAP3_COPY_CLOCK_SRAM is defined
+ */
+/*
+ * (C) Copyright 2006-2008
+ * Texas Instruments, <www.ti.com>
+ * Nishanth Menon <x0nishan at ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <asm/arch/silicon.h>
+#include <asm/arch/wdt.h>
+#include <asm/arch/clocks.h>
+
+#ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT
+.globl arch_init_lowlevel
+arch_init_lowlevel:
+ /* Copy vectors to mask ROM indirect addr */
+ mov r0, pc /* Store the current pc address */
+ sub r0, r0, #8 /* Reduce offset */
+ ldr r1, arch_start /* Load the link address for arch_int */
+ ldr r2, uboot_start /* load the link address of start_init*/
+ sub r1, r1, r2 /* get the offset */
+ /* subtract the offset from PC of arch=Current start */
+ sub r0, r0, r1
+ mov r2, #OMAP_SRAM_INTVECT_COPYSIZE /* r2 <- size to copy */
+ add r2, r0, r2 /* r2 <- source end address */
+ ldr r1, SRAM_INTVECT /* build vect addr */
+next:
+ ldmia r0!, {r3-r10} /* copy from source address [r0] */
+ stmia r1!, {r3-r10} /* copy to target address [r1] */
+ cmp r0, r2 /* until source end address [r2] */
+ ble next /* loop until equal */
+
+#ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
+ /* No need to copy/exec the clock code - DPLL adjust already done
+ * in Perip/NAND/oneNAND Boot.
+ * Put dpll adjust code behind vectors. r1 has address to copy to
+ */
+ bl cpy_clk_code
+#endif
+ ldr r1, SRAM_INTVECT /* build vect addr */
+ /* Read the interrupt vector base address */
+ mrc p15, #0, r0, c12, c0, #0
+ /* Clear the vector base 4:0 is reserved. */
+ and r0, r0, #0xF
+ /* Store the SRAM_INTVECT address */
+ orr r0, r0, r1
+ /* Store the new vector address */
+ mcr p15, #0, r0, c12, c0, #0
+ /* Setup a temporary stack so that we can call C functions */
+ ldr sp, SRAM_STACK
+ str ip, [sp] /* stash old link register */
+ str lr, [sp] /* stash current link register */
+ mov ip, lr /* save link reg across call */
+ bl a_init /* Architecture init */
+ ldr lr, [sp] /* restore current link register */
+ ldr ip, [sp] /* restore save ip */
+
+ /* back to arch calling code */
+ mov pc, lr
+
+arch_start:
+ .word arch_init_lowlevel
+uboot_start:
+ .word _start
+SRAM_INTVECT:
+ .word OMAP_SRAM_INTVECT
+
+SRAM_STACK:
+ .word OMAP_SRAM_STACK
+#endif /* CONFIG_ARCH_HAS_LOWLEVEL_INIT */
Index: u-boot.v2/arch/arm/mach-omap/omap3_generic.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot.v2/arch/arm/mach-omap/omap3_generic.c 2008-06-03 22:48:42.000000000 -0500
@@ -0,0 +1,450 @@
+/**
+ * @file
+ * @brief Provide Generic implementations for OMAP3 architecture
+ *
+ * FileName: arch/arm/mach-omap/omap3_generic.c
+ *
+ * This file contains the generic implementations of various OMAP3
+ * relevant functions
+ * For more info on OMAP34XX, see http://focus.ti.com/pdfs/wtbu/swpu114g.pdf
+ *
+ * Important one is @ref a_init which is architecture init code.
+ * The implemented functions are present in sys_info.h
+ *
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ */
+/*
+ * (C) Copyright 2006-2008
+ * Texas Instruments, <www.ti.com>
+ * Richard Woodruff <r-woodruff2 at ti.com>
+ * Nishanth Menon <x0nishan at ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <common.h>
+#include <init.h>
+#include <asm/io.h>
+#include <asm/arch/silicon.h>
+#include <asm/arch/gpmc.h>
+#include <asm/arch/sdrc.h>
+#include <asm/arch/control.h>
+#include <asm/arch/omap3-smx.h>
+#include <asm/arch/clocks.h>
+#include <asm/arch/wdt.h>
+#include <asm/arch/sys_info.h>
+#include <asm/arch/syslib.h>
+
+/**
+ * @brief Reset the CPU
+ *
+ * In case of crashes, reset the CPU
+ *
+ * @param[in] addr -Cause of crash
+ *
+ * @return void
+ */
+void reset_cpu(ulong addr)
+{
+ /* FIXME: Enable WDT and cause reset */
+ hang();
+}
+EXPORT_SYMBOL(reset_cpu);
+
+/**
+ * @brief Low level CPU type
+ *
+ * @return CPU_3430
+ */
+u32 get_cpu_type(void)
+{
+ /* FIXME: need to get register defines for 3430 */
+ return CPU_3430;
+}
+
+/**
+ * @brief Extract the OMAP ES rev
+ *
+ * @return CPU_ES version
+ */
+u32 get_cpu_rev(void)
+{
+ u32 idcode_val;
+ idcode_val = __raw_readl(IDCODE_REG);
+ if ((idcode_val & (HAWKEYE_MASK | VERSION_MASK)) == HAWKEYE_ES2_1)
+ return CPU_ES2P1;
+ if ((idcode_val & HAWKEYE_MASK) == HAWKEYE_ES2)
+ return CPU_ES2;
+ /* unsupported! */
+ return CPU_ES1;
+}
+
+/**
+ * @brief Get size of chip select 0/1
+ *
+ * @param[in] offset give the offset if we need CS1
+ *
+ * @return return the sdram size.
+ */
+u32 get_sdr_cs_size(u32 offset)
+{
+ u32 size;
+ /* get ram size field */
+ size = __raw_readl(SDRC_REG(MCFG_0) + offset) >> 8;
+ size &= 0x3FF; /* remove unwanted bits */
+ size *= 2 * (1024 * 1024); /* find size in MB */
+ return size;
+}
+
+/**
+ * @brief Get the initial SYSBOOT value
+ *
+ * SYSBOOT is useful to know which state OMAP booted from.
+ *
+ * @return - Return the value of SYSBOOT.
+ */
+inline u32 get_sysboot_value(void)
+{
+ return (0x0000003F & __raw_readl(CONTROL_REG(STATUS)));
+}
+
+/**
+ * @brief Return the current CS0 base address
+ *
+ * Return current address hardware will be
+ * fetching from. The below effectively gives what is correct, its a bit
+ * mis-leading compared to the TRM. For the most general case the mask
+ * needs to be also taken into account this does work in practice.
+ *
+ * @return base address
+ */
+u32 get_gpmc0_base(void)
+{
+ u32 b;
+ b = __raw_readl(GPMC_REG(CONFIG7_0));
+ b &= 0x1F; /* keep base [5:0] */
+ b = b << 24; /* ret 0x0b000000 */
+ return b;
+}
+
+/**
+ * @brief Get the upper address of current execution
+ *
+ * we can use this to figure out if we are running in SRAM /
+ * XIP Flash or in SDRAM
+ *
+ * @return base address
+ */
+u32 get_base(void)
+{
+ u32 val;
+ __asm__ __volatile__("mov %0, pc \n":"=r"(val)::"memory");
+ val &= 0xF0000000;
+ val >>= 28;
+ return val;
+}
+
+/**
+ * @brief Are we running in Flash XIP?
+ *
+ * If the base is in GPMC address space, we probably are!
+ *
+ * @return 1 if we are running in XIP mode, else return 0
+ */
+u32 running_in_flash(void)
+{
+ if (get_base() < 4)
+ return 1; /* in flash */
+ return 0; /* running in SRAM or SDRAM */
+}
+
+/**
+ * @brief Are we running in OMAP internal SRAM?
+ *
+ * If in SRAM address, then yes!
+ *
+ * @return 1 if we are running in SRAM, else return 0
+ */
+u32 running_in_sram(void)
+{
+ if (get_base() == 4)
+ return 1; /* in SRAM */
+ return 0; /* running in FLASH or SDRAM */
+}
+
+/**
+ * @brief Are we running in SDRAM?
+ *
+ * if we are not in GPMC nor in SRAM address space,
+ * we are in SDRAM execution area
+ *
+ * @return 1 if we are running from SDRAM, else return 0
+ */
+u32 running_in_sdram(void)
+{
+ if (get_base() > 4)
+ return 1; /* in sdram */
+ return 0; /* running in SRAM or FLASH */
+}
+EXPORT_SYMBOL(running_in_sdram);
+
+/**
+ * @brief Is this an XIP type device or a stream one
+ *
+ * Sysboot bits 4-0 specify type. Bit 5, sys mem/perif
+ *
+ * @return Boot type
+ */
+u32 get_boot_type(void)
+{
+ u32 v;
+ v = get_sysboot_value() & ((0x1 << 4) | (0x1 << 3) | (0x1 << 2) |
+ (0x1 << 1) | (0x1 << 0));
+ return v;
+}
+
+/**
+ * @brief What type of device are we?
+ *
+ * are we on a GP/HS/EMU/TEST device?
+ *
+ * @return device type
+ */
+u32 get_device_type(void)
+{
+ int mode;
+ mode = __raw_readl(CONTROL_REG(STATUS)) & (DEVICE_MASK);
+ return (mode >>= 8);
+}
+
+/**
+ * @brief Setup security registers for access
+ *
+ * This can be done for GP Device only. for HS/EMU devices, read TRM.
+ *
+ * @return void
+ */
+static void secure_unlock_mem(void)
+{
+ /* Permission values for registers -Full fledged permissions to all */
+#define UNLOCK_1 0xFFFFFFFF
+#define UNLOCK_2 0x00000000
+#define UNLOCK_3 0x0000FFFF
+ /* Protection Module Register Target APE (PM_RT) */
+ __raw_writel(UNLOCK_1, RT_REQ_INFO_PERMISSION_1);
+ __raw_writel(UNLOCK_1, RT_READ_PERMISSION_0);
+ __raw_writel(UNLOCK_1, RT_WRITE_PERMISSION_0);
+ __raw_writel(UNLOCK_2, RT_ADDR_MATCH_1);
+
+ __raw_writel(UNLOCK_3, GPMC_REQ_INFO_PERMISSION_0);
+ __raw_writel(UNLOCK_3, GPMC_READ_PERMISSION_0);
+ __raw_writel(UNLOCK_3, GPMC_WRITE_PERMISSION_0);
+
+ __raw_writel(UNLOCK_3, OCM_REQ_INFO_PERMISSION_0);
+ __raw_writel(UNLOCK_3, OCM_READ_PERMISSION_0);
+ __raw_writel(UNLOCK_3, OCM_WRITE_PERMISSION_0);
+ __raw_writel(UNLOCK_2, OCM_ADDR_MATCH_2);
+
+ /* IVA Changes */
+ __raw_writel(UNLOCK_3, IVA2_REQ_INFO_PERMISSION_0);
+ __raw_writel(UNLOCK_3, IVA2_READ_PERMISSION_0);
+ __raw_writel(UNLOCK_3, IVA2_WRITE_PERMISSION_0);
+
+ __raw_writel(UNLOCK_1, SMS_RG_ATT0); /* SDRC region 0 public */
+}
+
+/**
+ * @brief Come out of secure mode
+ * If chip is EMU and boot type is external configure
+ * secure registers and exit secure world general use.
+ *
+ * @return void
+ */
+static void secureworld_exit(void)
+{
+ unsigned long i;
+
+ /* configrue non-secure access control register */
+ __asm__ __volatile__("mrc p15, 0, %0, c1, c1, 2":"=r"(i));
+ /* enabling co-processor CP10 and CP11 accesses in NS world */
+ __asm__ __volatile__("orr %0, %0, #0xC00":"=r"(i));
+ /* allow allocation of locked TLBs and L2 lines in NS world */
+ /* allow use of PLE registers in NS world also */
+ __asm__ __volatile__("orr %0, %0, #0x70000":"=r"(i));
+ __asm__ __volatile__("mcr p15, 0, %0, c1, c1, 2":"=r"(i));
+
+ /* Enable ASA in ACR register */
+ __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1":"=r"(i));
+ __asm__ __volatile__("orr %0, %0, #0x10":"=r"(i));
+ __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1":"=r"(i));
+
+ /* Exiting secure world */
+ __asm__ __volatile__("mrc p15, 0, %0, c1, c1, 0":"=r"(i));
+ __asm__ __volatile__("orr %0, %0, #0x31":"=r"(i));
+ __asm__ __volatile__("mcr p15, 0, %0, c1, c1, 0":"=r"(i));
+}
+
+/**
+ * @brief Shut down the watchdogs
+ *
+ * There are 3 watch dogs WD1=Secure, WD2=MPU, WD3=IVA. WD1 is
+ * either taken care of by ROM (HS/EMU) or not accessible (GP).
+ * We need to take care of WD2-MPU or take a PRCM reset. WD3
+ * should not be running and does not generate a PRCM reset.
+ *
+ * @return void
+ */
+static void watchdog_init(void)
+{
+ int pending = 1;
+
+ sr32(CM_REG(FCLKEN_WKUP), 5, 1, 1);
+ sr32(CM_REG(ICLKEN_WKUP), 5, 1, 1);
+ wait_on_value((0x1 << 5), 0x20, CM_REG(IDLEST_WKUP), 5);
+
+ __raw_writel(WDT_DISABLE_CODE1, WDT_REG(WSPR));
+
+ do {
+ pending = __raw_readl(WDT_REG(WWPS));
+ } while (pending);
+
+ __raw_writel(WDT_DISABLE_CODE2, WDT_REG(WSPR));
+}
+
+/**
+ * @brief Write to AuxCR desired value using SMI.
+ * general use.
+ *
+ * @return void
+ */
+static void setup_auxcr(void)
+{
+ unsigned long i;
+ volatile unsigned int j;
+ /* Save r0, r12 and restore them after usage */
+ __asm__ __volatile__("mov %0, r12":"=r"(j));
+ __asm__ __volatile__("mov %0, r0":"=r"(i));
+
+ /* GP Device ROM code API usage here */
+ /* r12 = AUXCR Write function and r0 value */
+ __asm__ __volatile__("mov r12, #0x3");
+ __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1");
+ /* Enabling ASA */
+ __asm__ __volatile__("orr r0, r0, #0x10");
+ /* SMI instruction to call ROM Code API */
+ __asm__ __volatile__(".word 0xE1600070");
+ __asm__ __volatile__("mov r0, %0":"=r"(i));
+ __asm__ __volatile__("mov r12, %0":"=r"(j));
+}
+
+/**
+ * @brief Try to unlock the SRAM for general use
+ *
+ * If chip is GP/EMU(special) type, unlock the SRAM for
+ * general use.
+ *
+ * @return void
+ */
+static void try_unlock_memory(void)
+{
+ int mode;
+ int in_sdram = running_in_sdram();
+
+ /* if GP device unlock device SRAM for general use */
+ /* secure code breaks for Secure/Emulation device - HS/E/T */
+ mode = get_device_type();
+ if (mode == GP_DEVICE)
+ secure_unlock_mem();
+ /* If device is EMU and boot is XIP external booting
+ * Unlock firewalls and disable L2 and put chip
+ * out of secure world
+ */
+ /* Assuming memories are unlocked by the demon who put us in SDRAM */
+ if ((mode <= EMU_DEVICE) && (get_boot_type() == 0x1F)
+ && (!in_sdram)) {
+ secure_unlock_mem();
+ secureworld_exit();
+ }
+
+ return;
+}
+
+/**
+ * @brief OMAP3 Architecture specific Initialization
+ *
+ * Does early system init of disabling the watchdog, enable
+ * memory and configuring the clocks.
+ *
+ * prcm_init is called only if CONFIG_OMAP3_CLOCK_CONFIG is defined.
+ * We depend on link time clean up to remove a_init if no caller exists.
+ *
+ * @warning Called path is with SRAM stack
+ *
+ * @return void
+ */
+void a_init(void)
+{
+ watchdog_init();
+
+ try_unlock_memory();
+
+ /* Writing to AuxCR in U-boot using SMI for GP DEV */
+ /* Currently SMI in Kernel on ES2 devices seems to have an isse
+ * Once that is resolved, we can postpone this config to kernel
+ */
+ if (get_device_type() == GP_DEVICE)
+ setup_auxcr();
+
+ sdelay(100);
+
+#ifdef CONFIG_OMAP3_CLOCK_CONFIG
+ prcm_init();
+#endif
+
+}
+
+/**
+ * @brief Uart port register read function for OMAP3
+ *
+ * @param base base address of UART
+ * @param reg_idx register index
+ *
+ * @return character read from register
+ */
+unsigned int omap_uart_read(unsigned long base, unsigned char reg_idx)
+{
+ unsigned int *reg_addr = (unsigned int *)base;
+ reg_addr += reg_idx;
+ return __raw_readb(reg_addr);
+}
+EXPORT_SYMBOL(omap_uart_read);
+
+/**
+ * @brief Uart port register write function for OMAP3
+ *
+ * @param val value to write
+ * @param base base address of UART
+ * @param reg_idx register index
+ *
+ * @return void
+ */
+void omap_uart_write(unsigned int val, unsigned long base,
+ unsigned char reg_idx)
+{
+ unsigned int *reg_addr = (unsigned int *)base;
+ reg_addr += reg_idx;
+ __raw_writeb(val, reg_addr);
+}
+EXPORT_SYMBOL(omap_uart_write);
Index: u-boot.v2/arch/arm/mach-omap/syslib.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot.v2/arch/arm/mach-omap/syslib.c 2008-06-03 22:47:24.000000000 -0500
@@ -0,0 +1,97 @@
+/**
+ * @file
+ * @brief Provide OMAP independent utility APIs
+ *
+ * FileName: arch/arm/mach-omap/syslib.c
+ *
+ * Provide APIs which can be used from platform/architecture code
+ * to operate on
+ *
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ */
+/*
+ * (C) Copyright 2006-2008
+ * Texas Instruments, <www.ti.com>
+ * Richard Woodruff <r-woodruff2 at ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <asm/io.h>
+#include <asm/arch/syslib.h>
+
+/**
+ * @brief simple spin loop
+ *
+ * Will be constant time as its generally used in bypass conditions only.
+ * This is necessary until timers are accessible. if you need timed delays
+ * use @ref mdelay or @udelay instead
+ *
+ * @param[in] loops number of loops
+ *
+ * @return void
+ */
+void sdelay(unsigned long loops)
+{
+ __asm__ volatile ("1:\n" "subs %0, %1, #1\n"
+ "bne 1b":"=r" (loops):"0"(loops));
+}
+
+/**
+ * @brief clear & set a value in a bit range for a 32 bit address
+ *
+ * @param[in] addr Address to set/read from
+ * @param[in] start_bit Where to put the value
+ * @param[in] num_bits number of bits the value should be set
+ * @param[in] value the value to set
+ *
+ * @return void
+ */
+void sr32(u32 addr, u32 start_bit, u32 num_bits, u32 value)
+{
+ u32 tmp, msk = 0;
+ msk = 1 << num_bits;
+ --msk;
+ tmp = __raw_readl(addr) & ~(msk << start_bit);
+ tmp |= value << start_bit;
+ __raw_writel(tmp, addr);
+}
+
+/**
+ * @brief common routine to allow waiting for changes in volatile regs.
+ *
+ * @param[in] read_bit_mask the bit mask to read
+ * @param[in] match_value match to which value
+ * @param[in] read_addr address to read from
+ * @param[in] bound max iterations
+ *
+ * @return 1 if match_value is found, else if bound iterations reached,
+ * returns 0
+ */
+u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 bound)
+{
+ u32 i = 0, val;
+ do {
+ ++i;
+ val = __raw_readl(read_addr) & read_bit_mask;
+ if (val == match_value)
+ return 1;
+ if (i == bound)
+ return 0;
+ } while (1);
+}
+
More information about the U-Boot
mailing list