public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot-Users] Please pull u-boot-83xx.git
@ 2006-11-04  2:11 Kim Phillips
  2006-11-16 23:55 ` Joakim Tjernlund
                   ` (2 more replies)
  0 siblings, 3 replies; 49+ messages in thread
From: Kim Phillips @ 2006-11-04  2:11 UTC (permalink / raw)
  To: u-boot

Please pull from 'master' branch of:

  http://opensource.freescale.com/pub/scm/u-boot-83xx.git

to receive the following updates (essentially MPC8349mITX and MPC8360EMDS support):

Ben Warren:
      Add support for multiple I2C buses
      Multi-bus I2C implementation of MPC834x
      Additional MPC8349 support for multibus i2c

Dave Liu:
      mpc83xx: Changed to unified mpx83xx names and added common 83xx changes
      mpc83xx: Add 8360 specifics to 83xx immap
      mpc83xx: add the QUICC Engine (QE) immap file
      mpc83xx: Add MPC8360EMDS basic board support
      mpc83xx: add QE ethernet support
      mpc83xx: add the README.mpc8360emds
      mpc83xx: Fix the incorrect dcbz operation

Kim Phillips:
      mpc83xx: change ft code to modify local-mac-address property
      mpc83xx: add OF_FLAT_TREE bits to 83xx boards
      mpc83xx: Lindent and clean up cpu/mpc83xx/speed.c

Nick Spence:
      Added RGMII support to the TSECs and Marvell 881111 Phy
      NAND Flash verify across block boundaries

Tanya Jiang:
      mpc83xx: Removed unused file resetvec.S for mpc83xx cpu
      mpc83xx: Fix missing build for mpc8349emds pci.c
      mpc83xx: Unified TQM834x variable names with 83xx and consolidated macros

Timur Tabi:
      mpc83xx: Add support for variable flash memory sizes on 83xx systems
      mpc83xx: fix TQM build by defining a CFG_FLASH_SIZE for it
      mpc83xx: Add support for Errata DDR6 on MPC 834x systems
      mpc83xx: Add support for the MPC8349E-mITX
      mpc83xx: Fix PCI, USB, bootargs for MPC8349E-mITX
      mpc83xx: Fix dual I2C support for the MPC8349ITX, MPC8349EMDS, TQM834x, and MPC8360EMDS
      mpc83xx: Replace CFG_IMMRBAR with CFG_IMMR
      mpc83xx: Update 83xx to use fsl_i2c.c

 CREDITS                         |    5
 MAINTAINERS                     |    4
 MAKEALL                         |    2
 Makefile                        |   36 +
 README                          |   61 +
 board/mpc8349emds/Makefile      |    2
 board/mpc8349emds/mpc8349emds.c |   40 +
 board/mpc8349emds/pci.c         |   53 +
 board/mpc8349itx/Makefile       |   48 +
 board/mpc8349itx/config.mk      |   33 +
 board/mpc8349itx/mpc8349itx.c   |  477 +++++++++
 board/mpc8349itx/pci.c          |  357 +++++++
 board/mpc8349itx/u-boot.lds     |  120 ++
 board/mpc8360emds/Makefile      |   50 +
 board/mpc8360emds/config.mk     |   28 +
 board/mpc8360emds/mpc8360emds.c |  657 ++++++++++++
 board/mpc8360emds/pci.c         |  313 ++++++
 board/mpc8360emds/u-boot.lds    |  123 ++
 board/tqm834x/pci.c             |   18
 board/tqm834x/tqm834x.c         |    4
 common/cmd_i2c.c                |  159 +++
 cpu/mpc83xx/Makefile            |    4
 cpu/mpc83xx/cpu.c               |  155 ++-
 cpu/mpc83xx/cpu_init.c          |   71 +
 cpu/mpc83xx/i2c.c               |  253 -----
 cpu/mpc83xx/interrupts.c        |    2
 cpu/mpc83xx/qe_io.c             |   85 ++
 cpu/mpc83xx/resetvec.S          |    6
 cpu/mpc83xx/spd_sdram.c         |  557 ++++++----
 cpu/mpc83xx/speed.c             |  312 +++---
 cpu/mpc83xx/start.S             |   57 +
 doc/README.mpc8360emds          |  126 ++
 drivers/fsl_i2c.c               |  113 +-
 drivers/nand/nand_base.c        |    1
 drivers/qe/Makefile             |   43 +
 drivers/qe/qe.c                 |  254 +++++
 drivers/qe/qe.h                 |  237 ++++
 drivers/qe/uccf.c               |  404 +++++++
 drivers/qe/uccf.h               |  130 ++
 drivers/qe/uec.c                | 1266 +++++++++++++++++++++++
 drivers/qe/uec.h                |  716 +++++++++++++
 drivers/qe/uec_phy.c            |  604 +++++++++++
 drivers/qe/uec_phy.h            |  256 +++++
 drivers/tsec.c                  |   12
 drivers/tsec.h                  |    2
 include/asm-ppc/e300.h          |    2
 include/asm-ppc/global_data.h   |   16
 include/asm-ppc/i2c.h           |  103 --
 include/asm-ppc/immap_83xx.h    | 2130 ++++++++++++++++++++++++++++-----------
 include/asm-ppc/immap_qe.h      |  550 ++++++++++
 include/common.h                |    5
 include/configs/MPC8349EMDS.h   |   70 +
 include/configs/MPC8349ITX.h    |  804 +++++++++++++++
 include/configs/MPC8360EMDS.h   |  635 ++++++++++++
 include/configs/TQM834x.h       |   28 -
 include/i2c.h                   |   45 +
 include/ioports.h               |   11
 include/mpc83xx.h               |  138 ++-
 lib_ppc/board.c                 |    2
 net/eth.c                       |    7
 60 files changed, 11286 insertions(+), 1516 deletions(-)
 create mode 100644 board/mpc8349itx/Makefile
 create mode 100644 board/mpc8349itx/config.mk
 create mode 100644 board/mpc8349itx/mpc8349itx.c
 create mode 100644 board/mpc8349itx/pci.c
 create mode 100644 board/mpc8349itx/u-boot.lds
 create mode 100644 board/mpc8360emds/Makefile
 create mode 100644 board/mpc8360emds/config.mk
 create mode 100644 board/mpc8360emds/mpc8360emds.c
 create mode 100644 board/mpc8360emds/pci.c
 create mode 100644 board/mpc8360emds/u-boot.lds
 delete mode 100644 cpu/mpc83xx/i2c.c
 create mode 100644 cpu/mpc83xx/qe_io.c
 delete mode 100644 cpu/mpc83xx/resetvec.S
 create mode 100644 doc/README.mpc8360emds
 create mode 100644 drivers/qe/Makefile
 create mode 100644 drivers/qe/qe.c
 create mode 100644 drivers/qe/qe.h
 create mode 100644 drivers/qe/uccf.c
 create mode 100644 drivers/qe/uccf.h
 create mode 100644 drivers/qe/uec.c
 create mode 100644 drivers/qe/uec.h
 create mode 100644 drivers/qe/uec_phy.c
 create mode 100644 drivers/qe/uec_phy.h
 delete mode 100644 include/asm-ppc/i2c.h
 create mode 100644 include/asm-ppc/immap_qe.h
 create mode 100644 include/configs/MPC8349ITX.h
 create mode 100644 include/configs/MPC8360EMDS.h

For the resulting (cumulative) diff, please reference:

http://opensource.freescale.com/pub/mpc83xx-origin-master.diff

Thanks,

Kim

^ permalink raw reply	[flat|nested] 49+ messages in thread
* [U-Boot-Users] Please pull u-boot-83xx.git (I2C rework)
@ 2006-11-28 13:54 Joakim Tjernlund
  2006-11-28 18:04 ` Timur Tabi
  0 siblings, 1 reply; 49+ messages in thread
From: Joakim Tjernlund @ 2006-11-28 13:54 UTC (permalink / raw)
  To: u-boot

> -----Original Message-----
> From: u-boot-users-bounces at lists.sourceforge.net 
> [mailto:u-boot-users-bounces at lists.sourceforge.net] On Behalf 
> Of Stefan Roese
> Sent: 27 November 2006 07:22
> To: u-boot-users at lists.sourceforge.net
> Cc: Kim Phillips; Ben Warren; Wolfgang Denk
> Subject: Re: [U-Boot-Users] Please pull u-boot-83xx.git (I2C rework)
> 
> Hi Ben,
> 
> On Monday 27 November 2006 03:45, Ben Warren wrote:
> > Sorry about the formatting.  I've been influenced by
> > many coding 'standards' over the years and haven't
> > quite adapted to the kernel way yet...  Old habits die
> > hard.
> 
> ;-)
> 
> > To keep things moving, I'll fix this up and forward to
> > Kim on Monday morning.  I'm sure he has better things
> > to do than fix my sloppy styling.
> 
> Good idea. If I remember correctly, Kim is not available 
> until mid of this 
> week.
> 
> > Speaking of keeping things moving - I submitted a SPI
> > driver for the MPC834x several months back.  I'm sure
> > it has the same formatting problems.  Will it be
> > faster for me to resubmit?
> 
> Yes. You would save us at least one round of code review & 
> resubmit. It's also 
> easier to have a patch based on the current git tree.
> 
> Best regards,
> Stefan

I think that the I2C_READ and I2C_WRITE #defines in fsl_i2c.h conflicts
with
soft I2C.

 Jocke

^ permalink raw reply	[flat|nested] 49+ messages in thread
* [U-Boot-Users] Please pull u-boot-83xx.git (I2C rework)
@ 2006-11-30 10:00 Joakim Tjernlund
  0 siblings, 0 replies; 49+ messages in thread
From: Joakim Tjernlund @ 2006-11-30 10:00 UTC (permalink / raw)
  To: u-boot

> -----Original Message-----
> From: u-boot-users-bounces at lists.sourceforge.net 
> [mailto:u-boot-users-bounces at lists.sourceforge.net] On Behalf 
> Of Jerry Van Baren
> Sent: 29 November 2006 14:21
> To: u-boot-users at lists.sourceforge.net
> Subject: Re: [U-Boot-Users] Please pull u-boot-83xx.git (I2C rework)
> 
> Joakim Tjernlund wrote:
> > On Tue, 2006-11-28 at 16:16 -0600, Timur Tabi wrote:
> >> Joakim Tjernlund wrote:
> >>
> >>> No, see attached patch(s)
> >> Ah, I see.
> >>
> >>> Not tested in your tree as I don't use that one (yet)
> >> Git didn't like your patches, for some reason, so I had to 
> apply them by hand, 
> >> but everything seems to be okay.  I will apply them to our 
> tree for Wolfgang's 
> >> convenience.
> >>
> > 
> > While I am at it, I would also like to see this in u-boot
> > We use I2C as HRCW since we wan't to haw our flash reset 
> connetced to
> > HRESET, otherwise you might be unable to boot if the flash is in non
> > read array mode when the board resets.
> > We also need to have the version info in the begining of 
> the flash so
> > we can identify what version of u-boot we have installed. 
> > 
> > 
> --------------------------------------------------------------
> ----------
> > 
> > From 89b60f21af0d04959d93ccb70fd781c8aba9e66c Mon Sep 17 
> 00:00:00 2001
> > From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> > Date: Tue, 28 Nov 2006 23:42:31 +0100
> > Subject: [PATCH] Make HRCW and version info in data segment 
> configurable.
> > 
> > 
> > Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> > ---
> >  cpu/mpc83xx/start.S |   28 +++++++++++++++++-----------
> >  1 files changed, 17 insertions(+), 11 deletions(-)
> > 
> > diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
> > index 0f27bb6..44bca26 100644
> > --- a/cpu/mpc83xx/start.S
> > +++ b/cpu/mpc83xx/start.S
> > @@ -77,20 +77,12 @@
> >  	END_GOT
> >  
> >  /*
> > - * Version string - must be in data segment because 
> MPC83xx uses the
> > - * first 256 bytes for the Hard Reset Configuration Word table (see
> > - * below).  Similarly, can't have the U-Boot Magic Number 
> as the first
> > - * thing in the image - don't know how this will affect 
> the image tools,
> > - * but I guess I'll find out soon.
> > + * MPC83xx can use the first 0x40 bytes for the Hard Reset 
> Configuration Word 
> > + * table (see below) if so configured.
> >   */
> > -	.data
> > -	.globl	version_string
> > -version_string:
> > -	.ascii U_BOOT_VERSION
> > -	.ascii " (", __DATE__, " - ", __TIME__, ")"
> > -	.ascii " ", CONFIG_IDENT_STRING, "\0"
> >  
> >  	.text
> > +#ifndef CFG_HRCW_IN_I2C_EEPROM
> >  #define _HRCW_TABLE_ENTRY(w)		\
> >  	.fill	8,1,(((w)>>24)&0xff);	\
> >  	.fill	8,1,(((w)>>16)&0xff);	\
> > @@ -99,7 +91,21 @@ version_string:
> >  
> >  	_HRCW_TABLE_ENTRY(CFG_HRCW_LOW)
> >  	_HRCW_TABLE_ENTRY(CFG_HRCW_HIGH)
> > +#endif
> >  
> > +/*
> > + * Version string - May be in data segment if one wants to 
> reserve the
> > + * space left to address 0x100 for future expansion of HRCW bytes.
> > + */
> > +#ifdef CFG_VERSION_STRING_IN_DATA
> > +	.data
> > +#endif
> > +        .long   0x27051956              /* U-Boot Magic Number */
> > +	.globl	version_string
> > +version_string:
> > +	.ascii U_BOOT_VERSION
> > +	.ascii " (", __DATE__, " - ", __TIME__, ")"
> > +	.ascii " ", CONFIG_IDENT_STRING, "\0"
> >  
> >  #ifndef CONFIG_DEFAULT_IMMR
> >  #error CONFIG_DEFAULT_IMMR must be defined
> 
> Hi Timur,
> 
> I don't believe you want to do this: you are removing the 
> HRCW entirely 
> from flash if you have it in I2C (CFG_HRCW_IN_I2C_EEPROM).  
> Unless I'm 
> missing something (possible), I don't see why you even need a 
> configuration option CFG_HRCW_IN_I2C_EEPROM.

[SNIP good arugments]

The only reason to possibly want this is if you want to keep the format
where the u-boot header is the first thing in the image. I can manage
to have HRCW first in flash, but not having the version string in data
segment.

Summary:
  Remove the CFG_HRCW_IN_I2C_EEPROM if you want, but keep
  CFG_VERSION_STRING_IN_DATA.

 Jocke

^ permalink raw reply	[flat|nested] 49+ messages in thread

end of thread, other threads:[~2006-12-02 12:02 UTC | newest]

Thread overview: 49+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-04  2:11 [U-Boot-Users] Please pull u-boot-83xx.git Kim Phillips
2006-11-16 23:55 ` Joakim Tjernlund
2006-11-26 13:46 ` Stefan Roese
2006-11-26 20:02   ` Wolfgang Denk
2006-11-27 16:41     ` Timur Tabi
2006-11-27 21:10       ` Wolfgang Denk
2006-11-27 21:26         ` Timur Tabi
2006-11-27 21:36           ` Wolfgang Denk
2006-11-27 21:48             ` Timur Tabi
2006-11-27 21:53               ` Wolfgang Denk
2006-11-27 21:55                 ` Timur Tabi
2006-11-27 22:56                   ` Wolfgang Denk
2006-11-28  0:25               ` Dan Malek
2006-11-28 15:18                 ` Timur Tabi
2006-11-27 16:55   ` Timur Tabi
2006-11-27 22:45   ` Timur Tabi
2006-11-27 22:59     ` Wolfgang Denk
2006-11-29  7:18   ` Kim Phillips
2006-11-30 17:07     ` Wolfgang Denk
2006-11-30 17:49       ` Kim Phillips
2006-11-30 18:13       ` Timur Tabi
2006-11-30 21:14         ` [U-Boot-Users] ERROR: Cannot determine a common read delay k b
2006-12-02 12:02           ` Stefan Roese
2006-11-30 23:09         ` [U-Boot-Users] Please pull u-boot-83xx.git Wolfgang Denk
2006-11-26 13:49 ` [U-Boot-Users] Please pull u-boot-83xx.git (I2C rework) Stefan Roese
2006-11-27  2:45   ` Ben Warren
2006-11-27  6:22     ` Stefan Roese
2006-11-27 17:28   ` Timur Tabi
  -- strict thread matches above, loose matches on Subject: below --
2006-11-28 13:54 Joakim Tjernlund
2006-11-28 18:04 ` Timur Tabi
2006-11-28 18:17   ` Ben Warren
2006-11-28 18:25     ` Jerry Van Baren
2006-11-28 18:31     ` Pantelis Antoniou
2006-11-28 19:56       ` Timur Tabi
2006-11-28 18:43     ` Joakim Tjernlund
2006-11-28 21:03     ` Wolfgang Denk
2006-11-28 21:09       ` Tolunay Orkun
2006-11-29 16:50         ` Wolfgang Denk
2006-11-28 21:03   ` Wolfgang Denk
2006-11-28 21:08     ` Timur Tabi
2006-11-28 21:39       ` Joakim Tjernlund
2006-11-28 22:16         ` Timur Tabi
2006-11-28 22:25           ` Joakim Tjernlund
2006-11-28 22:46             ` Timur Tabi
2006-11-28 22:49           ` Joakim Tjernlund
2006-11-29 13:20             ` Jerry Van Baren
2006-11-28 21:47       ` Ben Warren
2006-11-29 16:49       ` Wolfgang Denk
2006-11-30 10:00 Joakim Tjernlund

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox