leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AT91: convert cpu.c to struct SoC access

Browse Source 
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
This commit is contained in:
Reinhard Meyer
2010-09-14 16:38:57 +02:00
parent 38bda019e4
commit 6341c5cf87
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/cpu/arm926ejs/at91/cpu.c
View File

@@ -1,4 +1,6 @@
/* /*
* (C) Copyright 2010
* Reinhard Meyer, reinhard.meyer@emk-elektronik.de
* (C) Copyright 2009 * (C) Copyright 2009
* Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> * Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* *
@@ -22,12 +24,10 @@
*/ */
#include <common.h> #include <common.h>
#ifdef CONFIG_AT91_LEGACY
#warning Your board is using legacy SoC access. Please update!
#endif
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/at91_pmc.h> #include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_gpbr.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <asm/arch/io.h> #include <asm/arch/io.h>
@@ -35,13 +35,6 @@
#define CONFIG_SYS_AT91_MAIN_CLOCK 0 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
#endif #endif
/*
* The at91sam9260 has 4 GPBR (0-3), we'll use the last one, nr 3,
* to keep track of the bootcount.
*/
#define AT91_GPBR_BOOTCOUNT_REGISTER 3
#define AT91_BOOTCOUNT_ADDRESS (AT91_GPBR + 4*AT91_GPBR_BOOTCOUNT_REGISTER)
int arch_cpu_init(void) int arch_cpu_init(void)
{ {
return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK); return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
@@ -66,27 +59,26 @@ int print_cpuinfo(void)
#ifdef CONFIG_BOOTCOUNT_LIMIT #ifdef CONFIG_BOOTCOUNT_LIMIT
/* /*
* Just as the mpc5xxx, we combine the BOOTCOUNT_MAGIC and boocount * We combine the BOOTCOUNT_MAGIC and bootcount in one 32-bit register.
* in one 32-bit register. This is done, as the AT91SAM9260 only has * This is done so we need to use only one of the four GPBR registers.
* 4 GPBR.
*/ */
void bootcount_store (ulong a) void bootcount_store (ulong a)
{ {
volatile ulong *save_addr = at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE;
(volatile ulong *)(AT91_BASE_SYS + AT91_BOOTCOUNT_ADDRESS);
*save_addr = (BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff); writel((BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff),
&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
} }
ulong bootcount_load (void) ulong bootcount_load (void)
{ {
volatile ulong *save_addr = at91_gpbr_t *gpbr = (at91_gpbr_t *) AT91_GPR_BASE;
(volatile ulong *)(AT91_BASE_SYS + AT91_BOOTCOUNT_ADDRESS);
if ((*save_addr & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000)) ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
return 0; return 0;
else else
return (*save_addr & 0x0000ffff); return val & 0x0000ffff;
} }
#endif /* CONFIG_BOOTCOUNT_LIMIT */ #endif /* CONFIG_BOOTCOUNT_LIMIT */