summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-07-31 00:30:09 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-07-31 00:30:09 +0200
commit0f18cb6eef469688a1c57647e486c1341c045b9f (patch)
treebeafdc2f5f3dc6269b7eb57a0dd99e448cb769ea
parentcf9919239415fee8e6733c0bd013b46888feb874 (diff)
downloadu-boot-imx-0f18cb6eef469688a1c57647e486c1341c045b9f.zip
u-boot-imx-0f18cb6eef469688a1c57647e486c1341c045b9f.tar.gz
u-boot-imx-0f18cb6eef469688a1c57647e486c1341c045b9f.tar.bz2
Minor fixes for PPChameleon Board:
* fix alignment of NAND size * make code do what the comment says
-rw-r--r--CHANGELOG4
-rw-r--r--board/dave/PPChameleonEVB/PPChameleonEVB.c2
-rw-r--r--include/configs/PPChameleonEVB.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bf23537..093169b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Minor fixes for PPChameleon Board:
+ - fix alignment of NAND size
+ - make code do what the comment says
+
* Implement h/w sector protection status synchronization at boot.
The code is provided for, and was tested on, the Yukon/Alaska
and PM520 boards only.
diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c
index 0bd43bd..1f6512d 100644
--- a/board/dave/PPChameleonEVB/PPChameleonEVB.c
+++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c
@@ -261,7 +261,7 @@ nand_init(void)
debug ("Probing at 0x%.8x\n", CFG_NAND1_BASE);
totlen += nand_probe (CFG_NAND1_BASE);
- printf ("%4lu MB\n", totlen >>20);
+ printf ("%3lu MB\n", totlen >>20);
}
#endif
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index d7025eb..ca0bd12 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -47,7 +47,7 @@
* CONFIG_PPCHAMELEON_CLK_33
*/
#if (!defined(CONFIG_PPCHAMELEON_CLK_25) && !defined(CONFIG_PPCHAMELEON_CLK_33))
-#define CONFIG_PPCHAMELEON_CLK_33
+#define CONFIG_PPCHAMELEON_CLK_25
#endif
#if (defined(CONFIG_PPCHAMELEON_CLK_25) && defined(CONFIG_PPCHAMELEON_CLK_33))