Add "cpu_config" command for PPC4xx bootstrap configuration
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included.
The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax.
Usage on Canyonlands:
=> cpu_config
Available configurations (I2C address 0x52):
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100 800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100 800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100 1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 *** 1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88
=> cpu_config 600-nor
Using configuration:
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100
done (dump via 'i2c md 52 0.1 10')
Reset the board for the changes to take effect
Other 4xx boards will be migrated to use this command soon as well.
---
v3:
- Line length of one printf reduced
v2:
- Patch authorship changes to Stefan
- s-o-b from Dirk added
- Added current configuration detection
- Minor coding style cleanup
board/amcc/canyonlands/Makefile | 5 +- board/amcc/canyonlands/bootstrap.c | 195 ----------------------------------- board/amcc/canyonlands/cpu_config.c | 55 ++++++++++ cpu/ppc4xx/Makefile | 3 + cpu/ppc4xx/cmd_cpu_config.c | 127 +++++++++++++++++++++++ include/asm-ppc/ppc4xx_config.h | 42 ++++++++ include/configs/canyonlands.h | 4 + 7 files changed, 234 insertions(+), 197 deletions(-) delete mode 100644 board/amcc/canyonlands/bootstrap.c create mode 100644 board/amcc/canyonlands/cpu_config.c create mode 100644 cpu/ppc4xx/cmd_cpu_config.c create mode 100644 include/asm-ppc/ppc4xx_config.h
board/amcc/canyonlands/Makefile +3 -2
@@ -25,10 +25,11 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o -COBJS += bootstrap.o +COBJS-y := $(BOARD).o +COBJS-$(CONFIG_CMD_CPU_CONFIG) += cpu_config.o SOBJS := init.o +COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS))
board/amcc/canyonlands/bootstrap.c deleted +0 -195
195 lines not on this page · raw message
board/amcc/canyonlands/cpu_config.c new file +55 -0
55 lines not on this page · raw message
cpu/ppc4xx/Makefile +3 -0
@@ -41,6 +41,9 @@ endif COBJS += 4xx_pci.o COBJS += 4xx_pcie.o COBJS += bedbug_405.o +ifdef CONFIG_CMD_CPU_CONFIG +COBJS += cmd_cpu_config.o +endif COBJS += commproc.o COBJS += cpu.o COBJS += cpu_init.o
cpu/ppc4xx/cmd_cpu_config.c new file +127 -0
127 lines not on this page · raw message
include/asm-ppc/ppc4xx_config.h new file +42 -0
42 lines not on this page · raw message
include/configs/canyonlands.h +4 -0
@@ -330,6 +330,9 @@#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 +#define CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR 0x52 +#define CONFIG_4xx_CONFIG_BLOCKSIZE 16 +/* I2C SYSMON (LM75, AD7414 is almost compatible) */ #define CONFIG_DTT_LM75 1/* ON Semi's LM75 */ #define CONFIG_DTT_AD7414 1/* use AD7414 */
@@ -442,6 +445,7 @@/* * Commands additional to the ones defined in amcc-common.h */ +#define CONFIG_CMD_CPU_CONFIG #if defined(CONFIG_ARCHES )#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI
Signature · 1 line
1.6.3.3
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Dear Stefan Roese,
Quoted 7 lines · In message <[email protected]> you wrote:
This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included.
The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax.
...
Quoted 4 lines
board/amcc/canyonlands/Makefile | 5 +- board/amcc/canyonlands/bootstrap.c | 195 ----------------------------------- board/amcc/canyonlands/cpu_config.c | 55 ++++++++++ cpu/ppc4xx/Makefile | 3 +
Quoted 8 lines
cpu/ppc4xx/cmd_cpu_config.c | 127 +++++++++++++++++++++++ include/asm-ppc/ppc4xx_config.h | 42 ++++++++ include/configs/canyonlands.h | 4 + 7 files changed, 234 insertions(+), 197 deletions(-) delete mode 100644 board/amcc/canyonlands/bootstrap.c create mode 100644 board/amcc/canyonlands/cpu_config.c create mode 100644 cpu/ppc4xx/cmd_cpu_config.c create mode 100644 include/asm-ppc/ppc4xx_config.h
Stefan, as this is mostly 4xx-related I suggest you run this through the ppc_4xx repo.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I wish Captain Vimes were here. He wouldn't have known what to do
either, but he's got a much better vocabulary to be baffled in.
- Terry Pratchett, _Guards! Guards!_PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Quoted 5 lines · On Friday 17 July 2009 16:39:35 Wolfgang Denk wrote:
Acked-by Wolfgang Denk <[email protected]>Stefan, as this is mostly 4xx-related I suggest you run this through the
ppc_4xxrepo.
OK, will do. Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
In reply to Stefan RoeseQuoted 26 lines · Stefan Roese
This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included.
The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax.
Usage on Canyonlands:
=>
cpu_config
Available configurations (I2C address0x52):600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100 800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100 800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100 1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 *** 1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88=>
cpu_config600-nor
Using configuration:
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100
done (dump via 'i2c md 52 0.1 10')
Reset the board for the changes to take effect
Quoted 6 lines
Other 4xx boards will be migrated to use this command soon as well.
Signed-off-by Stefan Roese <[email protected]>Signed-off-by Dirk Eibach <[email protected]>Cc Matthias Fuchs <[email protected]>
we could use something similar on some of the FSL SoCs. What about renaming this chip_config? When I see cpu I think of just CPU cores.
- k
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Quoted 30 lines · On Friday 17 July 2009 17:38:13 Kumar Gala wrote:
Quoted 29 lines · Stefan Roese
This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included.
The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax.
Usage on Canyonlands:
=>
cpu_config
Available configurations (I2C address0x52):600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100 800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100 800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100 1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 *** 1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88=>
cpu_config600-nor
Using configuration:
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100
done (dump via 'i2c md 52 0.1 10')
Reset the board for the changes to take effectOther 4xx boards will be migrated to use this command soon as well.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Stefan Roese <[email protected]>Signed-off-by Dirk Eibach <[email protected]>Cc Matthias Fuchs <[email protected]>we could use something similar on some of the FSL SoCs. What about renaming this
chip_config? When I see cpu I think of just CPU cores.
"chip_config" is fine for me as well. If nobody objects or suggest something else, I'll send a new patch version in a days or two.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Dear Stefan Roese,
Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 3 lines
we could use something similar on some of the FSL SoCs. What about renaming this
chip_config? When I see cpu I think of just CPU cores."
chip_config" is fine for me as well. If nobody objects or suggest something else, I'll send a new patch version in a days or two.
OK with me, too.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de God made the integers; all else is the work of Man. - Kronecker
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
In reply to Stefan RoesePlease see one comment below
Quoted 447 lines · On Friday 17 July 2009 15:53:56 Stefan Roese wrote:
This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included.
The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax.
Usage on Canyonlands:
=>
cpu_config
Available configurations (I2C address0x52):600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100 800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100 800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100 1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 *** 1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88=>
cpu_config600-nor
Using configuration:
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100
done (dump via 'i2c md 52 0.1 10')
Reset the board for the changes to take effectOther 4xx boards will be migrated to use this command soon as well.
Signed-off-by Stefan Roese <[email protected]>Signed-off-by Dirk Eibach <[email protected]>Cc Matthias Fuchs <[email protected]>---
v3:
- Line length of one printf reducedv2:
- Patch authorship changes to Stefan
- s-o-b from Dirk added
- Added current configuration detection
- Minor coding style cleanupboard/amcc/canyonlands/Makefile | 5 +- board/amcc/canyonlands/bootstrap.c | 195 ----------------------------------- board/amcc/canyonlands/cpu_config.c | 55 ++++++++++ cpu/ppc4xx/Makefile | 3 + cpu/ppc4xx/cmd_cpu_config.c | 127 +++++++++++++++++++++++ include/asm-ppc/ppc4xx_config.h | 42 ++++++++ include/configs/canyonlands.h | 4 + 7 files changed, 234 insertions(+), 197 deletions(-) delete mode 100644 board/amcc/canyonlands/bootstrap.c create mode 100644 board/amcc/canyonlands/cpu_config.c create mode 100644 cpu/ppc4xx/cmd_cpu_config.c create mode 100644 include/asm-ppc/ppc4xx_config.h(quoted diff) +0
-0b/board/amcc/canyonlands/Makefile index 2aeead6..b1dfb0b 100644
board/amcc/canyonlands/Makefile +3
-2@@ -25,10 +25,11 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o -COBJS += bootstrap.o +COBJS-y := $(BOARD).o +COBJS-$(CONFIG_CMD_CPU_CONFIG) += cpu_config.o SOBJS := init.o +COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS))(quoted diff) +0
-0
b/board/amcc/canyonlands/bootstrap.cdeleted file mode 100644 index 6dc2cca..0000000board/amcc/canyonlands/bootstrap.c deleted +0
-95@@ -1,195 +0,0 @@ -/* -* (C) Copyright 2008 -* Stefan Roese, DENX Software Engineering, sr at denx.de. -* -* See file CREDITS for list of people who contributed to this -* project. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA -* -*/ - -#include <common.h> -#include <command.h> -#include <i2c.h> -#include <asm/io.h> - -/* -* NOR and NAND boot options change bytes 5, 6, 8, 9, 11. The -* values are independent of the rest of the clock settings. -*/ - -#define NAND_COMPATIBLE 0x01 -#define NOR_COMPATIBLE 0x02 - -#define I2C_EEPROM_ADDR 0x52 - -static char *config_labels[] = { -"CPU: 600 PLB: 200 OPB: 100 EBC: 100" , -"CPU: 800 PLB: 200 OPB: 100 EBC: 100" , -"CPU:1000 PLB: 200 OPB: 100 EBC: 100" , -"CPU:1066 PLB: 266 OPB: 88 EBC: 88" , -NULL -}; - -static u8 boot_configs[][17 ] = { - { - (NAND_COMPATIBLE |NOR_COMPATIBLE ), -0x86 ,0x80 ,0xce ,0x1f ,0x79 ,0x80 ,0x00 ,0xa0 ,0x40 ,0x08 , -0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 - }, - { - (NAND_COMPATIBLE |NOR_COMPATIBLE ), -0x86 ,0x80 ,0xba ,0x14 ,0x99 ,0x80 ,0x00 ,0xa0 ,0x40 ,0x08 , -0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 - }, - { - (NAND_COMPATIBLE |NOR_COMPATIBLE ), -0x86 ,0x82 ,0x96 ,0x19 ,0xb9 ,0x80 ,0x00 ,0xa0 ,0x40 ,0x08 , -0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 - }, - { - (NAND_COMPATIBLE |NOR_COMPATIBLE ), -0x86 ,0x80 ,0xb3 ,0x01 ,0x9d ,0x80 ,0x00 ,0xa0 ,0x40 ,0x08 , -0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 - }, - { -0 , -0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 - } -}; - -/* -* Bytes 5,6,8,9,11 change for NAND boot -*/ -#if 0 -/* -* Values for 512 page size NAND chips, not used anymore, just -* keep them here for reference -*/ -static u8 nand_boot[] = { -0x90 ,0x01 ,0xa0 ,0x68 ,0x58 -}; -#else -/* -* Values for 2k page size NAND chips -*/ -static u8 nand_boot[] = { -0x90 ,0x01 ,0xa0 ,0xe8 ,0x58 -}; -#endif - -static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char*argv[]) -{
board/amcc/canyonlands/bootstrap.c deleted +0
-99-u8 *buf, b_nand; -int x, y, nbytes, selcfg; -extern char console_buffer[]; - -if (argc <2 ) { -cmd_usage (cmdtp); -return 1 ; - } - -if ((strcmp (argv[1 ],"nor" ) !=0 ) && - (strcmp (argv[1 ],"nand" ) !=0 )) { -printf ("Unsupported boot-device - only nor|nand support\n" ); -return 1 ; - } - -/* set the nand flag based on provided input */ -if ((strcmp (argv[1 ],"nand" ) ==0 )) - b_nand =1 ; -else - b_nand =0 ; - -printf ("Available configurations: \n\n" ); - -if (b_nand) { -for (x =0 , y =0 ; boot_configs[x][0 ] !=0 ; x++) { -/* filter on nand compatible */ -if (boot_configs[x][0 ] &NAND_COMPATIBLE ) { -printf (" %d - %s\n" , (y+1 ), config_labels[x]); - y++; - } - } - }else { -for (x =0 , y =0 ; boot_configs[x][0 ] !=0 ; x++) { -/* filter on nor compatible */ -if (boot_configs[x][0 ] &NOR_COMPATIBLE ) { -printf (" %d - %s\n" , (y+1 ), config_labels[x]); - y++; - } - } - } - -do { - nbytes =readline (" Selection [1-x / quit]: " ); - -if (nbytes) { -if (strcmp (console_buffer,"quit" ) ==0 ) -return 0 ; - selcfg =simple_strtol (console_buffer,NULL ,10 ); -if ((selcfg <1 ) || (selcfg > y)) - nbytes =0 ; - } - }while (nbytes ==0 ); - - - y = (selcfg -1 ); - -for (x =0 ; boot_configs[x][0 ] !=0 ; x++) { -if (b_nand) { -if (boot_configs[x][0 ] &NAND_COMPATIBLE ) { -if (y >0 ) - y--; -else if (y <1 ) -break ; - } - }else { -if (boot_configs[x][0 ] &NOR_COMPATIBLE ) { -if (y >0 ) - y--; -else if (y <1 ) -break ; - } - } - } - - buf = &boot_configs[x][1 ]; - -if (b_nand) { - buf[5 ] = nand_boot[0 ]; - buf[6 ] = nand_boot[1 ]; - buf[8 ] = nand_boot[2 ]; - buf[9 ] = nand_boot[3 ]; - buf[11 ] = nand_boot[4 ]; - } - -if (i2c_write (I2C_EEPROM_ADDR ,0 ,1 , buf,16 ) !=0 ) -printf ("Error writing to EEPROM at address 0x%x\n" ,I2C_EEPROM_ADDR ); -udelay (CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS *1000 ); - -printf ("Done\n" ); -printf ("Please power-cycle the board for the changes to take effect\n" ); - -return 0 ; -} - -U_BOOT_CMD ( - bootstrap,2 ,0 , do_bootstrap, -"program the I2C bootstrap EEPROM" , -"<nand|nor> - strap to boot from NAND or NOR flash" -);(quoted diff) +0
-0
b/board/amcc/canyonlands/cpu_config.cnew file mode 100644 index 0000000..8504171board/amcc/canyonlands/cpu_config.c new file +55
-0@@ -0,0 +1,55 @@ +/* +* (C) Copyright 2008-2009 +* Stefan Roese, DENX Software Engineering, sr at denx.de. +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +* +*/ + +#include <common.h> +#include <asm/ppc4xx_config.h> + +struct ppc4xx_config ppc4xx_config_val[] = { + {"600-nor" ,"NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100" , + {0x86 ,0x80 ,0xce ,0x1f ,0x79 ,0x80 ,0x00 ,0xa0 , +0x40 ,0x08 ,0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"600-nand" ,"NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100" , + {0x86 ,0x80 ,0xce ,0x1f ,0x79 ,0x90 ,0x01 ,0xa0 , +0xa0 ,0xe8 ,0x23 ,0x58 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"800-nor" ,"NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100" , + {0x86 ,0x80 ,0xba ,0x14 ,0x99 ,0x80 ,0x00 ,0xa0 , +0x40 ,0x08 ,0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"800-nand" ,"NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100" , + {0x86 ,0x80 ,0xba ,0x14 ,0x99 ,0x90 ,0x01 ,0xa0 , +0xa0 ,0xe8 ,0x23 ,0x58 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"1000-nor" ,"NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100" , + {0x86 ,0x82 ,0x96 ,0x19 ,0xb9 ,0x80 ,0x00 ,0xa0 , +0x40 ,0x08 ,0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"1000-nand" ,"NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100" , + {0x86 ,0x82 ,0x96 ,0x19 ,0xb9 ,0x90 ,0x01 ,0xa0 , +0xa0 ,0xe8 ,0x23 ,0x58 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"1066-nor" ,"NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88" , + {0x86 ,0x80 ,0xb3 ,0x01 ,0x9d ,0x80 ,0x00 ,0xa0 , +0x40 ,0x08 ,0x23 ,0x50 ,0x0d ,0x05 ,0x00 ,0x00 } }, + {"1066-nand" ,"NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88" , + {0x86 ,0x80 ,0xb3 ,0x01 ,0x9d ,0x90 ,0x01 ,0xa0 , +0xa0 ,0xe8 ,0x23 ,0x58 ,0x0d ,0x05 ,0x00 ,0x00 } }, +}; + +int ppc4xx_config_count =ARRAY_SIZE (ppc4xx_config_val);cpu/ppc4xx/Makefile +3
-0@@ -41,6 +41,9 @@ endif COBJS += 4xx_pci.o COBJS += 4xx_pcie.o COBJS += bedbug_405.o +ifdef CONFIG_CMD_CPU_CONFIG +COBJS += cmd_cpu_config.o +endif COBJS += commproc.o COBJS += cpu.o COBJS += cpu_init.ocpu/ppc4xx/cmd_cpu_config.c new file +48
-0@@ -0,0 +1,127 @@ +/* +* (C) Copyright 2008-2009 +* Stefan Roese, DENX Software Engineering, sr at denx.de. +* +* (C) Copyright 2009 +* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +* +*/ + +#include <common.h> +#include <command.h> +#include <i2c.h> +#include <asm/ppc4xx_config.h> +#include <asm/io.h> + +static void print_configs (int cur_config_nr) +{ +int i; + +for (i =0 ; i < ppc4xx_config_count; i++) { +printf ("%-16s - %s" , ppc4xx_config_val[i].label, + ppc4xx_config_val[i].description); +if (i == cur_config_nr) +printf (" ***" ); +printf ("\n" ); + } + +} + +static int do_cpu_config(cmd_tbl_t *cmdtp, int flag, int argc, char*argv[]) +{
cpu/ppc4xx/cmd_cpu_config.c new file +42
-0+int i; +int ret; +int cur_config_nr =-1 ; +u8 cur_config[CONFIG_4xx_CONFIG_BLOCKSIZE]; + + ret =i2c_read (CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR,0 ,1 , + cur_config, CONFIG_4xx_CONFIG_BLOCKSIZE); +if (ret) { +printf ("Error reading EEPROM at addr 0x%x\n" , + CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR); +return -1 ; + } + +/* +* Search the current configuration +*/ +for (i =0 ; i < ppc4xx_config_count; i++) { +if (memcmp (cur_config, ppc4xx_config_val[i].val, + CONFIG_4xx_CONFIG_BLOCKSIZE) ==0 ) + cur_config_nr = i; + } + +if (cur_config_nr ==-1 ) { +printf ("Warning: The I2C bootstrap values don't match any" +" of the available options!\n" ); +printf ("I2C bootstrap EEPROM values are (I2C address 0x%02x):\n" , + CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR); +for (i =0 ; i < CONFIG_4xx_CONFIG_BLOCKSIZE; i++) { +printf ("%02x " , cur_config[i]); + } +printf ("\n" ); + } + +if (argc <2 ) { +printf ("Available configurations (I2C address 0x%02x):\n" , + CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR); +print_configs (cur_config_nr); +return 0 ; + } + +for (i =0 ; i < ppc4xx_config_count; i++) { +/*
cpu/ppc4xx/cmd_cpu_config.c line 101
Quoted 10 lines
cpu/ppc4xx/cmd_cpu_config.c new file +10
-0+* Search for configuration name/label +*/ +if (strcmp (argv[1 ], ppc4xx_config_val[i].label) ==0 ) { +printf ("Using configuration:\n%-16s - %s\n" , + ppc4xx_config_val[i].label, + ppc4xx_config_val[i].description); + + ret =i2c_write (CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR,0 ,1 , + ppc4xx_config_val[i].val, + CONFIG_4xx_CONFIG_BLOCKSIZE);
I would like to see eeprom_write() here. On 405EP the strapping data is 0x20 bytes but the/our EEPROM has a page size of 16 bytes so i2c_write makes problems with the 2nd half of data. Also eeprom_write handles the write protection stuff. See some esd boards or the recent sbe command implementation in my last PMC405DE patch.
For the rest you got my ack.
Matthias
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Dear Matthias Fuchs,
In message <[email protected]> you wrote:
...
[450+ lines of full quote deleted.]
Please quote only relevant code snippets. Thanks.
Quoted 9 lines
Quoted 9 lines
cpu/ppc4xx/cmd_cpu_config.c new file +9
-0+for (i =0 ; i < ppc4xx_config_count; i++) { +/* +* Search for configuration name/label +*/ +if (strcmp (argv[1 ], ppc4xx_config_val[i].label) ==0 ) { +printf ("Using configuration:\n%-16s - %s\n" , + ppc4xx_config_val[i].label, + ppc4xx_config_val[i].description); +
Quoted 8 lines
cpu/ppc4xx/cmd_cpu_config.c line 101
Quoted 3 lines
cpu/ppc4xx/cmd_cpu_config.c new file +3
-0+ ret =i2c_write (CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR,0 ,1 , + ppc4xx_config_val[i].val, + CONFIG_4xx_CONFIG_BLOCKSIZE);I would like to see
eeprom_write()here. On 405EP the strapping data is0x20bytes but the/our EEPROM has a page size of 16 bytes soi2c_writemakes problems with the 2nd half of data. Alsoeeprom_writehandles the write protection stuff. See some esd boards or the recent sbe command implementation in my last PMC405DE patch.
I disagree here. There is no guarantee (and actually no need) that CONFIG_CMD_EEPROM is enabled in a configuration that want to use this feature.
If i2c_write() has issues on your boards that is IMO a bug that needs to be fixed (but that's another story).
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de HANDLE WITH EXTREME CARE: This Product Contains Minute Electrically Charged Particles Moving at Velocities in Excess of Five Hundred Million Miles Per Hour.
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Hi Wolfgang,
Quoted 27 lines · Wolfgang Denk
Dear Matthias Fuchs,
In message <[email protected]> you wrote:
...[450+ lines of full quote deleted.]
Please quote only relevant code snippets. Thanks.
Quoted 9 lines
Quoted 9 lines
cpu/ppc4xx/cmd_cpu_config.c new file +9
-0+for (i =0 ; i < ppc4xx_config_count; i++) { +/* +* Search for configuration name/label +*/ +if (strcmp (argv[1 ], ppc4xx_config_val[i].label) ==0 ) { +printf ("Using configuration:\n%-16s - %s\n" , + ppc4xx_config_val[i].label, + ppc4xx_config_val[i].description); +Quoted 8 lines
cpu/ppc4xx/cmd_cpu_config.c line 101
Quoted 3 lines
cpu/ppc4xx/cmd_cpu_config.c new file +3
-0+ ret =i2c_write (CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR,0 ,1 , + ppc4xx_config_val[i].val, + CONFIG_4xx_CONFIG_BLOCKSIZE);I would like to see
eeprom_write()here. On 405EP the strapping data is0x20bytes but the/our EEPROM has a page size of 16 bytes soi2c_writemakes problems with the 2nd half of data. Alsoeeprom_writehandles the write protection stuff. See some esd boards or the recent sbe command implementation in my last PMC405DE patch.
Quoted 3 lines
I disagree here. There is no guarantee (and actually no need) that
CONFIG_CMD_EEPROMis enabled in a configuration that want to use this feature.
correct.
Quoted 3 lines
If
i2c_write()has issues on your boards that is IMO a bug that needs to be fixed (but that's another story).
It's not an issue on our boards! And it's not a bug with i2c_write(). When writing more bytes to an eeprom than it's actual pagesize you have to take special care. This is done in eeprom_write(). i2c_write() to an eeprom only works with up to pagesize bytes!
Either we use eeprom_write() or we use multiple call of i2c_write(). If we do not change this, Stefan's code does not work with 405EP cpus. On these you have 0x20 strapping bytes and typicall EEPROMs with 8 or 16 bytes pagesize (24W01/02/04/08/16).
Matthias
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Dear Matthias Fuchs,
Quoted 9 lines · In message <[email protected]> you wrote:
When writing more bytes to an eeprom than it's actual pagesize you have to take special care. This is done in
eeprom_write().i2c_write()to an eeprom only works with up to pagesize bytes!Either we use
eeprom_write()or we use multiple call ofi2c_write(). If we do not change this, Stefan's code does not work with 405EP cpus. On these you have0x20strapping bytes and typicall EEPROMs with 8 or 16 bytes pagesize (24W01/02/04/08/16).
I see. So we should probably enable and export eeprom_write() in this case, and then use it.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Sex is like air. It's only a big deal if you can't get any.
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Stefan,
Quoted 7 lines · On Sunday 19 July 2009 09:55:10 Wolfgang Denk wrote:
Dear Matthias Fuchs,
Quoted 4 lines · In message <[email protected]> you wrote:
When writing more bytes to an eeprom than it's actual pagesize you have to take special care. This is done in
eeprom_write().i2c_write()to an eeprom only works with up to pagesize bytes!
Quoted 7 lines
Quoted 4 lines
Either we use
eeprom_write()or we use multiple call ofi2c_write(). If we do not change this, Stefan's code does not work with 405EP cpus. On these you have0x20strapping bytes and typicall EEPROMs with 8 or 16 bytes pagesize (24W01/02/04/08/16).I see. So we should probably enable and export
eeprom_write()in this case, and then use it.
I see no other way.
Stefan, could you then please also a a further CONFIG option "CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET" to give a starting address of the bootstrap data inside the EEPROM other than 0. On some 4xx CPUs you can select between different EEPROM offsets by external CPU pins. So bootstrap data could start at an address other than 0. It could also be helpful to pass this address somehow to the cpu_config during runtime. Let's say you have a 405EP based PCI adapter board that my use 33 or 66MHZ PCI clock dependant from the PCI M66EN signal. You could use that signal to make the bootstrap controller select between two configurations. In this case to have to call cpu_config on two EEPROM ranges with diffenrent arguments.
But to get cpu_config finally done, please add the _OFFSET option and I am happy. It could have a default of 0.
Matthias
Quoted 4 lines
Best regards,
Wolfgang Denk
PATCH v3 1/1 Add "cpu_config" command for PPC4xx bootstrap configuration
Quoted 21 lines · On Sunday 19 July 2009 13:23:49 Matthias Fuchs wrote:
Quoted 7 lines
Quoted 4 lines
Either we use
eeprom_write()or we use multiple call ofi2c_write(). If we do not change this, Stefan's code does not work with 405EP cpus. On these you have0x20strapping bytes and typicall EEPROMs with 8 or 16 bytes pagesize (24W01/02/04/08/16).I see. So we should probably enable and export
eeprom_write()in this case, and then use it.I see no other way.
Stefan, could you then please also a a further CONFIG option "
CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET" to give a starting address of the bootstrap data inside the EEPROM other than 0. On some 4xx CPUs you can select between different EEPROM offsets by external CPU pins. So bootstrap data could start at an address other than 0. It could also be helpful to pass this address somehow to thecpu_configduring runtime. Let's say you have a 405EP based PCI adapter board that my use 33 or 66MHZ PCI clock dependant from the PCI M66EN signal. You could use that signal to make the bootstrap controller select between two configurations. In this case to have to callcpu_configon two EEPROM ranges with diffenrent arguments.
Quoted 2 lines
But to get
cpu_configfinally done, please add the_OFFSEToption and I am happy. It could have a default of 0.
OK, I'll try wrap up a new patch version tomorrow which uses eeprom_write() if available and this new ..._EEPROM_OFFSET define. And then let's please get this patch in. We can always add functionality later on.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================