summaryrefslogtreecommitdiff
path: root/board/amcc/kilauea
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-29 09:25:52 +0200
committerWolfgang Denk <wd@denx.de>2009-07-29 09:25:52 +0200
commitd7b0781e2b734ff64ba71847a3ab5340ca547a51 (patch)
tree3d7701523799c106759d9598a9977472e1f38543 /board/amcc/kilauea
parent03a14104f1ccd395caa774c077b4305963afebf7 (diff)
parent042d01c72e0ea95731708dd24bb8b6cf42e75c80 (diff)
downloadu-boot-imx-d7b0781e2b734ff64ba71847a3ab5340ca547a51.zip
u-boot-imx-d7b0781e2b734ff64ba71847a3ab5340ca547a51.tar.gz
u-boot-imx-d7b0781e2b734ff64ba71847a3ab5340ca547a51.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board/amcc/kilauea')
-rw-r--r--board/amcc/kilauea/chip_config.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/board/amcc/kilauea/chip_config.c b/board/amcc/kilauea/chip_config.c
index 9a3fc15..919ec7f 100644
--- a/board/amcc/kilauea/chip_config.c
+++ b/board/amcc/kilauea/chip_config.c
@@ -25,6 +25,8 @@
#include <common.h>
#include <asm/ppc4xx_config.h>
+/* NAND booting versions differ in bytes: 6, 8, 9, 11, 12 */
+
struct ppc4xx_config ppc4xx_config_val[] = {
{
"333-nor","NOR CPU: 333 PLB: 166 OPB: 83 EBC: 83",
@@ -49,10 +51,17 @@ struct ppc4xx_config ppc4xx_config_val[] = {
},
{
"533-nor", "NOR CPU: 533 PLB: 177 OPB: 88 EBC: 88",
- {
- 0x8e, 0x43, 0x60, 0x13, 0x98, 0x00, 0x0a, 0x00,
- 0x40, 0x08, 0x23, 0x50, 0x00, 0x05, 0x00, 0x00
- }
+ {
+ 0x8e, 0x43, 0x60, 0x13, 0x98, 0x00, 0x0a, 0x00,
+ 0x40, 0x08, 0x23, 0x50, 0x00, 0x05, 0x00, 0x00
+ }
+ },
+ {
+ "533-nand", "NOR CPU: 533 PLB: 177 OPB: 88 EBC: 88",
+ {
+ 0x8e, 0x43, 0x60, 0x13, 0x98, 0x00, 0x0f, 0x00,
+ 0xa0, 0x68, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
+ }
},
{
"600-nor", "NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100",
@@ -62,6 +71,13 @@ struct ppc4xx_config ppc4xx_config_val[] = {
}
},
{
+ "600-nand", "NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100",
+ {
+ 0x8d, 0x02, 0x34, 0x13, 0x98, 0x00, 0x0f, 0x00,
+ 0xa0, 0x68, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
+ }
+ },
+ {
"666-nor", "NOR CPU: 666 PLB: 222 OPB: 111 EBC: 111",
{
0x8d, 0x03, 0x78, 0x13, 0x98, 0x00, 0x0a, 0x00,