projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redundant Environment: protect full sector size
[platform/kernel/u-boot.git]
/
board
/
prodrive
/
pdnb3
/
flash.c
diff --git
a/board/prodrive/pdnb3/flash.c
b/board/prodrive/pdnb3/flash.c
index
d0e5fe7
..
fe8d100
100644
(file)
--- a/
board/prodrive/pdnb3/flash.c
+++ b/
board/prodrive/pdnb3/flash.c
@@
-24,6
+24,8
@@
#include <common.h>
#include <asm/arch/ixp425.h>
#include <common.h>
#include <asm/arch/ixp425.h>
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
+
/*
* include common flash code (for esd boards)
*/
/*
* include common flash code (for esd boards)
*/
@@
-50,7
+52,7
@@
unsigned long flash_init(void)
int i;
/* Init: no FLASHes known */
int i;
/* Init: no FLASHes known */
- for (i=0; i<C
FG
_MAX_FLASH_BANKS; i++)
+ for (i=0; i<C
ONFIG_SYS
_MAX_FLASH_BANKS; i++)
flash_info[i].flash_id = FLASH_UNKNOWN;
size = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
flash_info[i].flash_id = FLASH_UNKNOWN;
size = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
@@
-64,22
+66,24
@@
unsigned long flash_init(void)
/* Monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* Monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
FG_MONITOR_BASE, CFG
_MONITOR_BASE + monitor_flash_len - 1,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ C
ONFIG_SYS_MONITOR_BASE, CONFIG_SYS
_MONITOR_BASE + monitor_flash_len - 1,
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
/* Environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* Redundant environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND
- 1,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE
- 1,
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
flash_info[0].size = size;
return size;
}
flash_info[0].size = size;
return size;
}
+
+#endif /* CONFIG_FLASH_CFI_DRIVER */