Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 360028
b: refs/heads/master
c: c448567
h: refs/heads/master
v: v3
  • Loading branch information
Hauke Mehrtens authored and John Crispin committed Feb 15, 2013
1 parent 21fb505 commit 82ee673
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc4403e02541af226ae6b7da0917c8959dd73a75
refs/heads/master: c4485671fbbb6fc453c2fb2dbb4bfc374770b0e7
7 changes: 7 additions & 0 deletions trunk/arch/mips/bcm47xx/nvram.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ static int nvram_find_and_copy(u32 base, u32 lim)
u32 off;
u32 *src, *dst;

/* TODO: when nvram is on nand flash check for bad blocks first. */
off = FLASH_MIN;
while (off <= lim) {
/* Windowed flash access */
Expand Down Expand Up @@ -88,6 +89,12 @@ static int nvram_init_bcma(void)
u32 base;
u32 lim;

#ifdef CONFIG_BCMA_NFLASH
if (cc->nflash.boot) {
base = BCMA_SOC_FLASH1;
lim = BCMA_SOC_FLASH1_SZ;
} else
#endif
if (cc->pflash.present) {
base = cc->pflash.window;
lim = cc->pflash.window_size;
Expand Down

0 comments on commit 82ee673

Please sign in to comment.