From: Wolfgang Denk Date: Fri, 05 Jun 2009 14:26:33 +0200 Subject: [U-Boot] PULL into "next": u-boot-mpc5xxx.git#next Message-ID: <20090605122633.10FC28246B12@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The following changes since commit 4867b82efe3e6c04b44a13daef0abb7891533d2a: Wolfgang Denk (1): General help message cleanup are available in the git repository at: git://git.denx.de/u-boot-mpc5xxx.git next Stefan Roese (2): mpc512x: Fix PSC divisor calculation for baudrate setting mpc512x: Use serial_setbrg() in serial_init() to not duplicate the code Wolfgang Denk (10): mpc512x: change cpu/mpc512x/Makefile to use Kconfig style mpc512x: Move common files to share them by several boards cpu/mpc512x/pci.c: minor coding style cleanup cpu/mpc512x/diu.c: fix warning: assignment from incompatible pointer type Rename ads5121 board into mpc5121ads MPC512x: add more hardware description to immap_512x.h MPC512x: use I/O accessors instead of pointer accesses MPC512x FEC: get rid of duplicated struct ethernet_regs MPC512x: remove include/mpc512x.h MPC512x: add support for ARIA board MAINTAINERS | 2 + MAKEALL | 3 +- Makefile | 10 +- board/ads5121/ads5121.c | 432 ------------- board/{ads5121 => davedenx/aria}/Makefile | 9 +- board/davedenx/aria/aria.c | 316 +++++++++ board/{ads5121 => davedenx/aria}/config.mk | 2 +- board/{ads5121 => freescale/mpc5121ads}/Makefile | 4 - board/{ads5121 => freescale/mpc5121ads}/README | 0 board/{ads5121 => freescale/mpc5121ads}/config.mk | 0 board/freescale/mpc5121ads/mpc5121ads.c | 339 ++++++++++ common/cmd_ide.c | 4 - cpu/mpc512x/Makefile | 18 +- cpu/mpc512x/asm-offsets.h | 15 + cpu/mpc512x/config.mk | 6 +- cpu/mpc512x/cpu.c | 1 - cpu/mpc512x/cpu_init.c | 27 +- board/ads5121/ads5121_diu.c => cpu/mpc512x/diu.c | 22 +- cpu/mpc512x/i2c.c | 57 +- cpu/mpc512x/ide.c | 128 ++++ cpu/mpc512x/iopin.c | 10 +- {board/ads5121 => cpu/mpc512x}/pci.c | 80 ++- cpu/mpc512x/serial.c | 92 ++-- cpu/mpc512x/speed.c | 24 +- cpu/mpc512x/start.S | 6 +- {board/ads5121 => cpu/mpc512x}/u-boot.lds | 0 drivers/net/mpc512x_fec.c | 170 +++--- drivers/net/mpc512x_fec.h | 155 +----- include/asm-ppc/immap_512x.h | 577 +++++++++++++++++- include/common.h | 3 +- include/configs/{ads5121.h => aria.h} | 292 +++++----- include/configs/{ads5121.h => mpc5121ads.h} | 30 +- include/mpc512x.h | 702 --------------------- 33 files changed, 1840 insertions(+), 1696 deletions(-) delete mode 100644 board/ads5121/ads5121.c copy board/{ads5121 => davedenx/aria}/Makefile (80%) create mode 100644 board/davedenx/aria/aria.c copy board/{ads5121 => davedenx/aria}/config.mk (94%) rename board/{ads5121 => freescale/mpc5121ads}/Makefile (88%) rename board/{ads5121 => freescale/mpc5121ads}/README (100%) rename board/{ads5121 => freescale/mpc5121ads}/config.mk (100%) create mode 100644 board/freescale/mpc5121ads/mpc5121ads.c create mode 100644 cpu/mpc512x/asm-offsets.h rename board/ads5121/ads5121_diu.c => cpu/mpc512x/diu.c (91%) create mode 100644 cpu/mpc512x/ide.c rename {board/ads5121 => cpu/mpc512x}/pci.c (72%) rename {board/ads5121 => cpu/mpc512x}/u-boot.lds (100%) copy include/configs/{ads5121.h => aria.h} (63%) rename include/configs/{ads5121.h => mpc5121ads.h} (96%) delete mode 100644 include/mpc512x.h This is based on and intended for the "next" branch. Best regards, Wolfgang Denk -- 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 Gew?hnlich glaubt der Mensch, wenn er nur Worte h?rt, es m?sse sich dabei doch auch was denken lassen. -- Goethe, Faust I