Add gdsys ControlCenter Digital board
Subsystems (15)
v4 cover Add gdsys ControlCenter Digital board
Changes in v4:
- consider CONFIG_CMD_BOOTM for all architectures
Changes in v3:
- fix email addresses
Changes in v2:
- configuration for SPI builds was missing
- replace some numeric constants with named constants
- style fixes (as shown by checkpatch.pl) in common/cmd_tpm.c and lib/tpm.c
- whitespace fixes
Dirk Eibach (5):
Update gdsys email account
mpc85xx: Add CONFIG_RELEASE_CORE0_ONLY
Add Atmel I2C tpm
Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM
mpc85xx: Add gdsys ControlCenter Digital board
Reinhard Pfau (2):
tpm: add AUTH1 cmds for LoadKey2 and GetPubKey
i2c: fsl_i2c: i2c_read(): dont try to write address w/ alen=0
MAINTAINERS | 2 +- README | 20 + arch/arm/lib/Makefile | 2 +- arch/avr32/lib/Makefile | 2 +- arch/m68k/lib/Makefile | 2 +- arch/microblaze/lib/Makefile | 2 +- arch/mips/lib/Makefile | 4 +- arch/nds32/lib/Makefile | 3 +- arch/nios2/lib/Makefile | 2 +- arch/openrisc/lib/Makefile | 2 +- arch/powerpc/cpu/mpc85xx/mp.c | 8 +- arch/powerpc/cpu/ppc4xx/cmd_chip_config.c | 2 +- arch/powerpc/include/asm/ppc4xx_config.h | 2 +- arch/powerpc/lib/Makefile | 2 +- arch/sh/lib/Makefile | 2 +- arch/sparc/lib/Makefile | 3 +- arch/x86/lib/Makefile | 2 +- board/gdsys/405ep/405ep.c | 2 +- board/gdsys/405ep/dlvision-10g.c | 2 +- board/gdsys/405ep/io.c | 2 +- board/gdsys/405ep/iocon.c | 2 +- board/gdsys/405ep/neo.c | 2 +- board/gdsys/405ex/io64.c | 2 +- board/gdsys/common/Makefile | 1 + board/gdsys/common/dp501.c | 107 +++ board/gdsys/common/dp501.h | 30 + board/gdsys/common/miiphybb.c | 2 +- board/gdsys/common/osd.c | 2 +- board/gdsys/common/osd.h | 2 +- board/gdsys/dlvision/dlvision.c | 2 +- board/gdsys/gdppc440etx/gdppc440etx.c | 2 +- board/gdsys/gdppc440etx/init.S | 2 +- board/gdsys/intip/init.S | 2 +- board/gdsys/intip/intip.c | 2 +- board/gdsys/p1022/Makefile | 37 + board/gdsys/p1022/controlcenterd-id.c | 1205 +++++++++++++++++++++++++++++ board/gdsys/p1022/controlcenterd-id.h | 29 + board/gdsys/p1022/controlcenterd.c | 447 +++++++++++ board/gdsys/p1022/ddr.c | 71 ++ board/gdsys/p1022/diu.c | 87 +++ board/gdsys/p1022/law.c | 20 + board/gdsys/p1022/sdhc_boot.c | 63 ++ board/gdsys/p1022/tlb.c | 77 ++ boards.cfg | 7 + common/cmd_tpm.c | 100 +++ drivers/gpio/pca9698.c | 2 +- drivers/hwmon/lm63.c | 2 +- drivers/i2c/fsl_i2c.c | 9 +- drivers/tpm/Makefile | 1 + drivers/tpm/atmel_twi_tpm.c | 119 +++ include/configs/controlcenterd.h | 525 +++++++++++++ include/configs/dlvision-10g.h | 2 +- include/configs/dlvision.h | 2 +- include/configs/gdppc440etx.h | 2 +- include/configs/intip.h | 2 +- include/configs/io.h | 2 +- include/configs/io64.h | 2 +- include/configs/iocon.h | 2 +- include/configs/neo.h | 2 +- include/gdsys_fpga.h | 2 +- include/pca9698.h | 2 +- include/tpm.h | 174 +++++ lib/tpm.c | 351 +++++++++- 63 files changed, 3526 insertions(+), 48 deletions(-) create mode 100644 board/gdsys/common/dp501.c create mode 100644 board/gdsys/common/dp501.h create mode 100644 board/gdsys/p1022/Makefile create mode 100644 board/gdsys/p1022/controlcenterd-id.c create mode 100644 board/gdsys/p1022/controlcenterd-id.h create mode 100644 board/gdsys/p1022/controlcenterd.c create mode 100644 board/gdsys/p1022/ddr.c create mode 100644 board/gdsys/p1022/diu.c create mode 100644 board/gdsys/p1022/law.c create mode 100644 board/gdsys/p1022/sdhc_boot.c create mode 100644 board/gdsys/p1022/tlb.c create mode 100644 drivers/tpm/atmel_twi_tpm.c create mode 100644 include/configs/controlcenterd.h
Signature · 1 line
1.7.2.5
PATCH v4 1/7 Update gdsys email account
---
Changes in v4: None
Changes in v3:
- fix email addresses
Changes in v2: None
MAINTAINERS | 2 +- arch/powerpc/cpu/ppc4xx/cmd_chip_config.c | 2 +- arch/powerpc/include/asm/ppc4xx_config.h | 2 +- board/gdsys/405ep/405ep.c | 2 +- board/gdsys/405ep/dlvision-10g.c | 2 +- board/gdsys/405ep/io.c | 2 +- board/gdsys/405ep/iocon.c | 2 +- board/gdsys/405ep/neo.c | 2 +- board/gdsys/405ex/io64.c | 2 +- board/gdsys/common/miiphybb.c | 2 +- board/gdsys/common/osd.c | 2 +- board/gdsys/common/osd.h | 2 +- board/gdsys/dlvision/dlvision.c | 2 +- board/gdsys/gdppc440etx/gdppc440etx.c | 2 +- board/gdsys/gdppc440etx/init.S | 2 +- board/gdsys/intip/init.S | 2 +- board/gdsys/intip/intip.c | 2 +- drivers/gpio/pca9698.c | 2 +- drivers/hwmon/lm63.c | 2 +- include/configs/dlvision-10g.h | 2 +- include/configs/dlvision.h | 2 +- include/configs/gdppc440etx.h | 2 +- include/configs/intip.h | 2 +- include/configs/io.h | 2 +- include/configs/io64.h | 2 +- include/configs/iocon.h | 2 +- include/configs/neo.h | 2 +- include/gdsys_fpga.h | 2 +- include/pca9698.h | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-)
MAINTAINERS +1 -1
@@ -158,7 +158,7 @@ egnite GmbH <[email protected]> ethernut5 ARM926EJS (AT91SAM9XE SoC) -Dirk Eibach <[email protected]> +Dirk Eibach <[email protected]> devconcenter PPC460EX dlvision PPC405EP
arch/powerpc/cpu/ppc4xx/cmd_chip_config.c +1 -1
@@ -3,7 +3,7 @@* Stefan Roese, DENX Software Engineering, sr at denx.de. * * (C) Copyright 2009 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
arch/powerpc/include/asm/ppc4xx_config.h +1 -1
@@ -3,7 +3,7 @@* Stefan Roese, DENX Software Engineering, sr at denx.de. * * (C) Copyright 2009 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/405ep/405ep.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/405ep/dlvision-10g.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/405ep/io.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/405ep/iocon.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/405ep/neo.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2011 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/405ex/io64.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * based on kilauea.c * by Stefan Roese, DENX Software Engineering, sr at denx.de.
board/gdsys/common/miiphybb.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/common/osd.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/common/osd.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/dlvision/dlvision.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2009 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
board/gdsys/gdppc440etx/gdppc440etx.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2008 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * Based on board/amcc/yosemite/yosemite.c * (C) Copyright 2006-2007
board/gdsys/gdppc440etx/init.S +1 -1
@@ -1,6 +1,6 @@ /* * (C) Copyright 2008 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * based on board/amcc/yosemite/init.S * original Copyright not specified there
board/gdsys/intip/init.S +1 -1
@@ -1,6 +1,6 @@ /* * (C) Copyright 2009 - * Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de + * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * Based on board/amcc/canyonlands/init.S * (C) Copyright 2008
board/gdsys/intip/intip.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2009 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * Based on board/amcc/canyonlands/canyonlands.c * (C) Copyright 2008
drivers/gpio/pca9698.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2011 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
drivers/hwmon/lm63.c +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2007-2008 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * based on lm75.c by Bill Hunter * * See file CREDITS for list of people who contributed to this
include/configs/dlvision-10g.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
include/configs/dlvision.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2009 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
include/configs/gdppc440etx.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2008 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * Based on include/configs/yosemite.h * (C) Copyright 2005-2007
include/configs/intip.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2009 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * Based on include/configs/canyonlands.h * (C) Copyright 2008
include/configs/io.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
include/configs/io64.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2011 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * based on kilauea.h * by Stefan Roese, DENX Software Engineering, sr at denx.de.
include/configs/iocon.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
include/configs/neo.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2007-2008 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
include/gdsys_fpga.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2010 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
include/pca9698.h +1 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2011 -* Dirk Eibach, Guntermann & Drunck GmbH, eibach at gdsys.de +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc * * See file CREDITS for list of people who contributed to this * project.
Signature · 1 line
1.7.2.5
PATCH v4 2/7 tpm: add AUTH1 cmds for LoadKey2 and GetPubKey
In reply to Dirk EibachFrom: Reinhard Pfau <[email protected]>
Extend the tpm library with support for single authorized (AUTH1) commands as specified in the TCG Main Specification 1.2. (The internally used helper functions are implemented in a way that they could also be used for double authorized commands if someone needs it.)
Provide enums with the return codes from the TCG Main specification.
For now only a single OIAP session is supported.
OIAP authorized version of the commands TPM_LoadKey2 and TPM_GetPubKey are provided. Both features are available using the 'tpm' command, too.
Authorized commands are enabled with CONFIG_TPM_AUTH_SESSIONS. (Note that this also requires CONFIG_SHA1 to be enabled.)
---
Changes in v4: None
Changes in v3:
- fix email addresses
Changes in v2:
- replace some numeric constants with named constants
- style fixes (as shown by checkpatch.pl) in common/cmd_tpm.c and lib/tpm.c
README | 14 ++ common/cmd_tpm.c | 100 +++++++++++++++ include/tpm.h | 174 +++++++++++++++++++++++++++ lib/tpm.c | 351 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 638 insertions(+), 1 deletions(-)
README +14 -0
@@ -1210,6 +1210,20 @@ The following options need to be configured: to. Contemporary x86 systems usually map it at 0xfed40000. + CONFIG_CMD_TPM + Add tpm monitor functions. + Requires CONFIG_TPM. If CONFIG_TPM_AUTH_SESSIONS is set, also + provides monitor access to authorized functions. + + CONFIG_TPM + Define this to enable the TPM support library which provides + functional interfaces to some TPM commands. + Requires support for a TPM device. + + CONFIG_TPM_AUTH_SESSIONS + Define this to enable authorized functions in the TPM library. + Requires CONFIG_TPM and CONFIG_SHA1. + - USB Support: At the moment only the UHCI host controller is supported (PIP405, MIP405, MPC5200); define
common/cmd_tpm.c +100 -0
130 lines not on this page · raw message
include/tpm.h +174 -0
189 lines not on this page · raw message
lib/tpm.c +350 -1
379 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH v4 3/7 mpc85xx: Add CONFIG_RELEASE_CORE0_ONLY
In reply to Dirk EibachFrom: Dirk Eibach <[email protected]>
If CONFIG_RELEASE_CORE0_ONLY is set, all cores except core0 are kept in holdoff mode.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/powerpc/cpu/mpc85xx/mp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
arch/powerpc/cpu/mpc85xx/mp.c +6 -2
@@ -350,7 +350,11 @@ static void plat_mp_up(unsigned long bootpg, unsigned int pagesize)volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR);u32 devdisr;int timeout =10 ; +int numcores =1 ; +#ifndef CONFIG_RELEASE_CORE0_ONLY + numcores =cpu_numcores (); +#endif whoami =in_be32 (&pic->whoami);out_be32 (&ecm->bptr,0x80000000 | (bootpg >>12 ));
@@ -363,7 +367,7 @@ static void plat_mp_up(unsigned long bootpg, unsigned int pagesize)out_be32 (&gur->devdisr, devdisr);/* release the hounds */ - up = ((1 <<cpu_numcores ()) -1 ); + up = ((1 << numcores) -1 ); bpcr =in_be32 (&ecm->eebpcr); bpcr |= (up <<24 );out_be32 (&ecm->eebpcr, bpcr);
@@ -373,7 +377,7 @@ static void plat_mp_up(unsigned long bootpg, unsigned int pagesize)/* wait for everyone */ while (timeout) {int i; -for (i =0 ; i <cpu_numcores (); i++) { +for (i =0 ; i < numcores; i++) {if (table[i *NUM_BOOT_ENTRY +BOOT_ENTRY_ADDR_LOWER ]) cpu_up_mask |= (1 << i); };
Signature · 1 line
1.7.2.5
PATCH v4 3/7 mpc85xx: Add CONFIG_RELEASE_CORE0_ONLY
Quoted 6 lines · Dirk Eibach
From: Dirk Eibach <[email protected]>
If
CONFIG_RELEASE_CORE0_ONLYis set, all cores except core0 are kept in
holdoff mode.
Quoted 8 lines
Signed-off-by Dirk Eibach <[email protected]>---
Changes in v4: None
Changes in v3: None
Changes in v2: Nonearch/powerpc/cpu/mpc85xx/mp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
We already have an mp_holdoff hwconfig.
-Scott
PATCH v4 4/7 i2c: fsl_i2c: i2c_read(): dont try to write address w/ alen=0
In reply to Dirk EibachFrom: Reinhard Pfau <[email protected]>
if alen is 0: no longer start a write cycle before reading data.
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- whitespace fixes
drivers/i2c/fsl_i2c.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/i2c/fsl_i2c.c +6 -3
@@ -383,13 +383,16 @@ i2c_read(u8 dev, uint addr, int alen, u8 *data, int length)int i =-1 ;/* signal error */ u8 *a = (u8 *)&addr; -if (i2c_wait4bus () >=0 +if (i2c_wait4bus () <0 ) +return -1 ; + +if (alen >0 &&i2c_write_addr (dev,I2C_WRITE_BIT ,0 ) !=0 &&__i2c_write (&a[4 - alen], alen) == alen) i =0 ;/* No error so far */ -if (length - &&i2c_write_addr (dev,I2C_READ_BIT ,1 ) !=0 ) +if (length && +i2c_write_addr (dev,I2C_READ_BIT , alen ?1 :0 ) !=0 ) i =__i2c_read (data, length);writeb (I2C_CR_MEN , &i2c_dev[i2c_bus_num]->cr);
Signature · 1 line
1.7.2.5
PATCH v4 4/7 i2c: fsl_i2c:i2c_read(): dont try to write address w/ alen=0
Quoted 8 lines · Dirk Eibach <dirk.eibach <at> gdsys.cc> writes:
From: Reinhard Pfau <pfau <at> gdsys.de>
if alen is 0: no longer start a write cycle before reading data.
Signed-off-by Dirk Eibach <dirk.eibach <at> gdsys.cc>Signed-off-by Reinhard Pfau <reinhard.pfau <at> gdsys.cc>
Since I saw no response to my previous email,
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/159456, I looked a little more closely.
Quoted 13 lines
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- whitespace fixesdrivers/i2c/fsl_i2c.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)drivers/i2c/fsl_i2c.c +0
-0
drivers/i2c/fsl_i2c.c
Quoted 1 line
drivers/i2c/fsl_i2c.c +0
-0<at> <at> -383,13 +383,16 <at> <at> i2c_read(u8 dev, uint addr, int
alen, u8 *data, int length)
drivers/i2c/fsl_i2c.c i2c_read(u8 dev, uint addr, int alen, u8 *data, int length) · line 389
Quoted 9 lines
drivers/i2c/fsl_i2c.c +4
-1int i =-1 ;/* signal error */ u8 *a = (u8 *)&addr; - if (i2c_wait4bus() >= 0 +if (i2c_wait4bus () <0 ) +return -1 ; + + if (alen > 0
On visual inspection of $(UBOOT)/drivers/i2c/fsl_i2c.c, these proposed changes will cause i2c_probe(), in the same source file, to fail.
i2c_probe() calls i2c_read() with alen=0.
Unless I'm missing something.
Jim
PATCH v4 5/7 Add Atmel I2C tpm
In reply to Dirk EibachFrom: Dirk Eibach <[email protected]>
Add support for Atmel TPM devices with two wire interface.
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
README | 6 ++ drivers/tpm/Makefile | 1 + drivers/tpm/atmel_twi_tpm.c | 119 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 0 deletions(-) create mode 100644 drivers/tpm/atmel_twi_tpm.c
README +6 -0
@@ -1201,6 +1201,12 @@ The following options need to be configured: If this option is set, the driver enables cache flush. - TPM Support: + Only one TPM device per system is supported at this time. + So enable only one of the supported devices. + + CONFIG_ATMEL_TWI_TPM + Support for Atmel TWI TPM device. Requires I2C support. + CONFIG_GENERIC_LPC_TPM Support for generic parallel port TPM devices. Only one device per system is supported at this time.
drivers/tpm/Makefile +1 -0
@@ -28,6 +28,7 @@ $(shell mkdir -p $(obj)slb9635_i2c) COBJS-$(CONFIG_GENERIC_LPC_TPM) = generic_lpc_tpm.o COBJS-$(CONFIG_INFINEON_TPM_I2C) += tis_i2c.o slb9635_i2c/tpm.o COBJS-$(CONFIG_INFINEON_TPM_I2C) += slb9635_i2c/tpm_tis_i2c.o +COBJS-$(CONFIG_ATMEL_TWI_TPM) = atmel_twi_tpm.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/tpm/atmel_twi_tpm.c new file +119 -0
119 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH v4 6/7 Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM
In reply to Dirk EibachFrom: Dirk Eibach <[email protected]>
---
Changes in v4:
- consider CONFIG_CMD_BOOTM for all architectures
Changes in v3: None
Changes in v2: None
arch/arm/lib/Makefile | 2 +- arch/avr32/lib/Makefile | 2 +- arch/m68k/lib/Makefile | 2 +- arch/microblaze/lib/Makefile | 2 +- arch/mips/lib/Makefile | 4 ++-- arch/nds32/lib/Makefile | 3 ++- arch/nios2/lib/Makefile | 2 +- arch/openrisc/lib/Makefile | 2 +- arch/powerpc/lib/Makefile | 2 +- arch/sh/lib/Makefile | 2 +- arch/sparc/lib/Makefile | 3 ++- arch/x86/lib/Makefile | 2 +- 12 files changed, 15 insertions(+), 13 deletions(-)
arch/arm/lib/Makefile +1 -1
@@ -44,7 +44,7 @@ COBJS-y += board.o endif COBJS-y += bss.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
arch/avr32/lib/Makefile +1 -1
@@ -30,7 +30,7 @@ LIB = $(obj)lib$(ARCH).o SOBJS-y += memset.o COBJS-y += board.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += interrupts.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/m68k/lib/Makefile +1 -1
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o SOBJS-y += COBJS-y += board.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += cache.o COBJS-y += interrupts.o COBJS-y += time.o
arch/microblaze/lib/Makefile +1 -1
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o SOBJS-y += COBJS-y += board.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += muldi3.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/mips/lib/Makefile +2 -2
@@ -36,9 +36,9 @@ SOBJS-y += COBJS-y += board.o ifeq ($(CONFIG_QEMU_MIPS),y) -COBJS-y += bootm_qemu_mips.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm_qemu_mips.o else -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o endif SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/nds32/lib/Makefile +2 -1
@@ -29,7 +29,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(ARCH).o -OBJS := board.o bootm.o cache.o interrupts.o +OBJS := board.o cache.o interrupts.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o all: $(LIB)
arch/nios2/lib/Makefile +1 -1
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o SOBJS-y += cache.o COBJS-y += board.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += libgcc.o COBJS-y += time.o
arch/openrisc/lib/Makefile +1 -1
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(ARCH).o SOBJS-y += COBJS-y += board.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += timer.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/powerpc/lib/Makefile +1 -1
@@ -63,7 +63,7 @@ ifndef CONFIG_SYS_GENERIC_BOARD COBJS-y += board.o endif endif -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += cache.o COBJS-y += extable.o COBJS-y += interrupts.o
arch/sh/lib/Makefile +1 -1
@@ -33,7 +33,7 @@ GLSOBJS += lshrdi3.o GLSOBJS += movmem.o COBJS-y += board.o -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o ifeq ($(CONFIG_SH2),y) COBJS-y += time_sh2.o else
arch/sparc/lib/Makefile +2 -1
@@ -27,7 +27,8 @@ LIB = $(obj)lib$(ARCH).o SOBJS = -COBJS = board.o cache.o interrupts.o time.o bootm.o +COBJS = board.o cache.o interrupts.o time.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
arch/x86/lib/Makefile +1 -1
@@ -29,7 +29,7 @@ ifeq ($(CONFIG_SYS_GENERIC_BOARD),) COBJS-y += board.o endif -COBJS-y += bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += bootm.o COBJS-y += cmd_boot.o COBJS-y += gcc.o COBJS-y += init_helpers.o
Signature · 1 line
1.7.2.5
PATCH v4 6/7 Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM
Dear Dirk Eibach,
Quoted 8 lines · In message <[email protected]> you wrote:
From: Dirk Eibach <[email protected]>
Signed-off-by Dirk Eibach <[email protected]>---
Changes in v4:
- considerCONFIG_CMD_BOOTMfor all architectures
On which boards has this been tested?
Which of these boards actually do not define CONFIG_CMD_BOOTM?
Best regards,
Wolfgang Denk
Signature · 5 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
Perl already has an IDE. It's called Unix.
-- Tom Christiansen in 375bd509 at cs.colorado.eduPATCH v4 6/7 Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM
Hello Wolfgang,
Quoted 4 lines
In message <[email protected]> you
Quoted 2 lines · wrote:
From: Dirk Eibach <[email protected]>
Quoted 8 lines
Quoted 6 lines
Signed-off-by Dirk Eibach <[email protected]>---
Changes in v4:
- considerCONFIG_CMD_BOOTMfor all architecturesOn which boards has this been tested?
MAKEALL was done for ppc4xx and mpc85xx. For anything else I don't have toolchains.
Run checks were done on our controlcenterd hardware.
Quoted 1 line
Which of these boards actually do not define
CONFIG_CMD_BOOTM?
controlcenterd has configruations with and without CONFIG_CMD_BOOTM.
Cheers
Dirk
PATCH v4 7/7 mpc85xx: Add gdsys ControlCenter Digital board
In reply to Dirk EibachFrom: Dirk Eibach <[email protected]>
The gdsys ControlCenter Digital board is based on a Freescale P1022 QorIQ SOC. It boots from SPI-Flash but can be configured to boot from SD-card for factory programming and testing.
On board peripherals include:
- 2x GbE
- Lattice ECP3 FPGA connected via PCIe
- mSATA RAID1
- USB host
- DisplayPort video output
- Atmel TPM
---
Changes in v4: None
Changes in v3:
- fix email addresses
Changes in v2:
- configuration for SPI builds was missing
- whitespace fixes
board/gdsys/common/Makefile | 1 + board/gdsys/common/dp501.c | 107 +++ board/gdsys/common/dp501.h | 30 + board/gdsys/p1022/Makefile | 37 + board/gdsys/p1022/controlcenterd-id.c | 1205 +++++++++++++++++++++++++++++++++ board/gdsys/p1022/controlcenterd-id.h | 29 + board/gdsys/p1022/controlcenterd.c | 447 ++++++++++++ board/gdsys/p1022/ddr.c | 71 ++ board/gdsys/p1022/diu.c | 87 +++ board/gdsys/p1022/law.c | 20 + board/gdsys/p1022/sdhc_boot.c | 63 ++ board/gdsys/p1022/tlb.c | 77 +++ boards.cfg | 7 + include/configs/controlcenterd.h | 525 ++++++++++++++ 14 files changed, 2706 insertions(+), 0 deletions(-) create mode 100644 board/gdsys/common/dp501.c create mode 100644 board/gdsys/common/dp501.h create mode 100644 board/gdsys/p1022/Makefile create mode 100644 board/gdsys/p1022/controlcenterd-id.c create mode 100644 board/gdsys/p1022/controlcenterd-id.h create mode 100644 board/gdsys/p1022/controlcenterd.c create mode 100644 board/gdsys/p1022/ddr.c create mode 100644 board/gdsys/p1022/diu.c create mode 100644 board/gdsys/p1022/law.c create mode 100644 board/gdsys/p1022/sdhc_boot.c create mode 100644 board/gdsys/p1022/tlb.c create mode 100644 include/configs/controlcenterd.h
board/gdsys/common/Makefile +1 -0
@@ -33,6 +33,7 @@ COBJS-$(CONFIG_IO) += miiphybb.o COBJS-$(CONFIG_IO64) += miiphybb.o COBJS-$(CONFIG_IOCON) += osd.o COBJS-$(CONFIG_DLVISION_10G) += osd.o +COBJS-$(CONFIG_CONTROLCENTERD) += dp501.o COBJS := $(COBJS-y) SOBJS =
board/gdsys/common/dp501.c new file +107 -0
107 lines not on this page · raw message
board/gdsys/common/dp501.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* (C) Copyright 2012 +* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc +* +* 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 +*/ + +#ifndef _DP501_H_ +#define _DP501_H_ + +void dp501_powerup (u8 addr); +void dp501_powerdown (u8 addr); + +#endif
board/gdsys/p1022/Makefile new file +37 -0
@@ -0,0 +1,37 @@ +# +# Copyright 2010 Freescale Semiconductor, Inc. +# +# 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. +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +# COBJS-y += $(BOARD).o +COBJS-y += law.o +COBJS-y += ddr.o +COBJS-y += tlb.o +COBJS-y += sdhc_boot.o +COBJS-$(CONFIG_CONTROLCENTERD) += controlcenterd.o controlcenterd-id.o + +COBJS-$(CONFIG_FSL_DIU_FB) += diu.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################
board/gdsys/p1022/controlcenterd-id.c new file +1205 -0
1,205 lines not on this page · raw message
board/gdsys/p1022/controlcenterd-id.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* (C) Copyright 2013 +* Reinhard Pfau, Guntermann & Drunck GmbH, reinhard.pfau at gdsys.cc +* +* 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., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#ifndef __CONTROLCENTER_ID_H +#define __CONTROLCENTER_ID_H + +int ccdm_compute_self_hash (void ); +int startup_ccdm_id_module (void ); + +int show_self_hash (void ); + +#endif /* __CONTROLCENTER_ID_H */
board/gdsys/p1022/controlcenterd.c new file +447 -0
447 lines not on this page · raw message
board/gdsys/p1022/ddr.c new file +71 -0
71 lines not on this page · raw message
board/gdsys/p1022/diu.c new file +87 -0
87 lines not on this page · raw message
board/gdsys/p1022/law.c new file +20 -0
@@ -0,0 +1,20 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. +* Authors: Srikanth Srinivasan <[email protected]> +* Timur Tabi <[email protected]> +* +* 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. +*/ + +#include <common.h> +#include <asm/fsl_law.h> +#include <asm/mmu.h> + +struct law_entry law_table[] = { +SET_LAW (CONFIG_SYS_ELBC_BASE_PHYS ,LAW_SIZE_1M ,LAW_TRGT_IF_LBC ), +}; + +int num_law_entries =ARRAY_SIZE (law_table);
board/gdsys/p1022/sdhc_boot.c new file +63 -0
63 lines not on this page · raw message
board/gdsys/p1022/tlb.c new file +77 -0
77 lines not on this page · raw message
boards.cfg +7 -0
@@ -888,6 +888,13 @@ BSC9132QDS_SDCARD_DDRCLK100 powerpc mpc85xx bsc9132qds freesca BSC9132QDS_SDCARD_DDRCLK133 powerpc mpc85xx bsc9132qds freescale - BSC9132QDS:BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133 BSC9132QDS_SPIFLASH_DDRCLK100 powerpc mpc85xx bsc9132qds freescale - BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100 BSC9132QDS_SPIFLASH_DDRCLK133 powerpc mpc85xx bsc9132qds freescale - BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133 +controlcenterd_36BIT_SDCARD powerpc mpc85xx p1022 gdsys - controlcenterd:36BIT,SDCARD +controlcenterd_36BIT_SDCARD_DEVELOP powerpc mpc85xx p1022 gdsys - controlcenterd:36BIT,SDCARD,DEVELOP +controlcenterd_36BIT_SPIFLASH powerpc mpc85xx p1022 gdsys - controlcenterd:36BIT,SPIFLASH +controlcenterd_SDCARD powerpc mpc85xx p1022 gdsys - controlcenterd:SDCARD +controlcenterd_SPIFLASH powerpc mpc85xx p1022 gdsys - controlcenterd:SPIFLASH +controlcenterd_TRAILBLAZER powerpc mpc85xx p1022 gdsys - controlcenterd:TRAILBLAZER,SPIFLASH +controlcenterd_TRAILBLAZER_DEVELOP powerpc mpc85xx p1022 gdsys - controlcenterd:TRAILBLAZER,SPIFLASH,DEVELOP stxgp3 powerpc mpc85xx stxgp3 stx stxssa powerpc mpc85xx stxssa stx - stxssa stxssa_4M powerpc mpc85xx stxssa stx - stxssa:STXSSA_4M
include/configs/controlcenterd.h new file +525 -0
525 lines not on this page · raw message
Signature · 1 line
1.7.2.5