diff options
| author | Stefan Roese <sr@denx.de> | 2012-08-16 17:55:41 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-01 14:26:02 +0200 |
| commit | 0044c42e94ecc258728190919b4619508fb83089 (patch) | |
| tree | 4964b48f60ad93a2b77a76104b0ca9f664bde3b3 /arch/blackfin | |
| parent | 7fe7701d322e9147c06d68ad6ebef91289b9a57e (diff) | |
| download | u-boot-imx-0044c42e94ecc258728190919b4619508fb83089.zip u-boot-imx-0044c42e94ecc258728190919b4619508fb83089.tar.gz u-boot-imx-0044c42e94ecc258728190919b4619508fb83089.tar.bz2 | |
Consolidate bootcount code into drivers/bootcount
This patch moves all bootcount implementations into a common
directory: drivers/bootcount. The generic bootcount driver
is now usable not only by powerpc platforms, but others as well.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Christian Riesch <christian.riesch@omicron.at>
Cc: Manfred Rudigier <manfred.rudigier@omicron.at>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Reinhard Meyer <reinhard.meyer@emk-elektronik.de>
Tested-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Tested-by: Christian Riesch <christian.riesch@omicron.at>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/cpu/Makefile | 1 | ||||
| -rw-r--r-- | arch/blackfin/cpu/bootcount.c | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index 5deaa9e..0a72ec5 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -17,7 +17,6 @@ EXTRA := init.elf CEXTRA := initcode.o SEXTRA := start.o SOBJS := interrupt.o cache.o -COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o COBJS-y += cpu.o COBJS-y += gpio.o COBJS-y += interrupts.o diff --git a/arch/blackfin/cpu/bootcount.c b/arch/blackfin/cpu/bootcount.c deleted file mode 100644 index 6cf6dd5..0000000 --- a/arch/blackfin/cpu/bootcount.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * functions for handling bootcount support - * - * Copyright (c) 2010 Analog Devices Inc. - * - * Licensed under the 2-clause BSD. - */ - -/* This version uses one 32bit storage and combines the magic/count */ - -#include <common.h> - -/* We abuse the EVT0 MMR for bootcount storage by default */ -#ifndef CONFIG_SYS_BOOTCOUNT_ADDR -# define CONFIG_SYS_BOOTCOUNT_ADDR EVT0 -#endif - -#define MAGIC_MASK 0xffff0000 -#define COUNT_MASK 0x0000ffff - -void bootcount_store(ulong cnt) -{ - ulong magic = (BOOTCOUNT_MAGIC & MAGIC_MASK) | (cnt & COUNT_MASK); - bfin_write32(CONFIG_SYS_BOOTCOUNT_ADDR, magic); -} - -ulong bootcount_load(void) -{ - ulong magic = bfin_read32(CONFIG_SYS_BOOTCOUNT_ADDR); - if ((magic & MAGIC_MASK) == (BOOTCOUNT_MAGIC & MAGIC_MASK)) - return magic & COUNT_MASK; - else - return 0; -} |