diff options
author | Stefan Roese <sr@denx.de> | 2009-08-17 16:57:53 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2009-08-18 09:16:33 +0200 |
commit | 514bab6609acd1a2a19fdd75c2f6255178db7c96 (patch) | |
tree | 3865a6578ec15d52d075fbb9db7824aa10d5538d /board/amcc | |
parent | 7dedefdf749ff02c1086f7ddb8cb83a77b00d030 (diff) | |
download | u-boot-imx-514bab6609acd1a2a19fdd75c2f6255178db7c96.zip u-boot-imx-514bab6609acd1a2a19fdd75c2f6255178db7c96.tar.gz u-boot-imx-514bab6609acd1a2a19fdd75c2f6255178db7c96.tar.bz2 |
ppc4xx: Fix "chip_config" command for AMCC Arches
This patch fixes the "chip_config" command for I2C bootstrap EEPROM
configuration. First it changes the I2C bootstrap EEPROM address to
0x54 as this is used on Arches (instead of 0x52 on Canyonlands/
Glacier). Additionally, the NAND bootstrap settings are removed
for Arches since Arches doesn't support NAND-booting.
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/amcc')
-rw-r--r-- | board/amcc/canyonlands/chip_config.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/board/amcc/canyonlands/chip_config.c b/board/amcc/canyonlands/chip_config.c index e46f4d8..5ad78b8 100644 --- a/board/amcc/canyonlands/chip_config.c +++ b/board/amcc/canyonlands/chip_config.c @@ -34,45 +34,46 @@ struct ppc4xx_config ppc4xx_config_val[] = { } }, { - "600-nand", "NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100", + "800-nor", "NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100", { - 0x86, 0x80, 0xce, 0x1f, 0x79, 0x90, 0x01, 0xa0, - 0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00 + 0x86, 0x80, 0xba, 0x14, 0x99, 0x80, 0x00, 0xa0, + 0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00 } }, { - "800-nor", "NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100", + "1000-nor", "NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100", { - 0x86, 0x80, 0xba, 0x14, 0x99, 0x80, 0x00, 0xa0, + 0x86, 0x82, 0x96, 0x19, 0xb9, 0x80, 0x00, 0xa0, 0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00 } }, { - "800-nand", "NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100", + "1066-nor", "NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88", { - 0x86, 0x80, 0xba, 0x14, 0x99, 0x90, 0x01, 0xa0, - 0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00 + 0x86, 0x80, 0xb3, 0x01, 0x9d, 0x80, 0x00, 0xa0, + 0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00 } }, +#if !defined(CONFIG_ARCHES) { - "1000-nor", "NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100", + "600-nand", "NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100", { - 0x86, 0x82, 0x96, 0x19, 0xb9, 0x80, 0x00, 0xa0, - 0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00 + 0x86, 0x80, 0xce, 0x1f, 0x79, 0x90, 0x01, 0xa0, + 0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00 } }, { - "1000-nand", "NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100", + "800-nand", "NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100", { - 0x86, 0x82, 0x96, 0x19, 0xb9, 0x90, 0x01, 0xa0, + 0x86, 0x80, 0xba, 0x14, 0x99, 0x90, 0x01, 0xa0, 0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00 } }, { - "1066-nor", "NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88", + "1000-nand", "NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100", { - 0x86, 0x80, 0xb3, 0x01, 0x9d, 0x80, 0x00, 0xa0, - 0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00 + 0x86, 0x82, 0x96, 0x19, 0xb9, 0x90, 0x01, 0xa0, + 0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00 } }, { @@ -82,6 +83,7 @@ struct ppc4xx_config ppc4xx_config_val[] = { 0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00 } }, +#endif }; int ppc4xx_config_count = ARRAY_SIZE(ppc4xx_config_val); |