[U-Boot] Pull request u-boot-blackfin.git

Mike Frysinger vapier at gentoo.org
Mon Oct 4 19:33:53 CEST 2010


The following changes since commit 2e6e1772c0e34871769be4aef79748fe3e47d953:

  Merge branch 'next' of /home/wd/git/u-boot/next (2010-09-28 23:30:47 +0200)

are available in the git repository at:

  git://www.denx.de/git/u-boot-blackfin.git master

Mike Frysinger (34):
      Blackfin: add support for BF538/BF539 processors
      Blackfin: add support for BF51x parts
      Blackfin: bfin_spi: add optional DMA support
      Blackfin: bfin_sdh: clean up send_cmd
      Blackfin: unify gpio cfi implementations
      Blackfin: punt headers for non-existent BF541
      Blackfin: bfin_mac: convert from old style MMR macros
      Blackfin: bf537-stamp: post: update old MMR style macros
      Blackfin: bf527-ezkit: video: convert from old style MMR macros
      Blackfin: bf548-ezkit: video: convert from old style MMR macros
      Blackfin: cm-bf548: video: convert from old style MMR macros
      Blackfin: bf527-ad7160-eval: convert from old style MMR macros
      Blackfin: punt old *p style volatile MMR defines
      Blackfin: bf537: unify arch header duplication
      Blackfin: bf52x: unify arch header duplication
      Blackfin: unify core MMRs
      Blackfin: bf533: merge headers
      Blackfin: bf561: merge headers
      Blackfin: move CONFIG_BFIN_CPU to board config.mk
      Blackfin: cmd_gpio: document/extend input sub-option
      Blackfin: adi config: add an "all spi flashes" option to unify board lists
      Blackfin: adi config: add a hook for boards to append the env
      Blackfin: bf527-sdp: new board port
      Blackfin: cmd_gpio: return gpio value to caller
      Blackfin: adi config: allow boards to tweak a little more
      Blackfin: adi config: enable nand lock/unlock support
      Blackfin: bf526-ezbrd: enable BootROM-OOB layout when booting from NAND
      Blackfin: cmd_gpio: accept upper case pin names
      Blackfin: propagate target cpu defines when building embedded env
      Blackfin: fix MMC init output alignment
      Blackfin: bf548-ezkit: bump SPI flash size up
      Blackfin: bf527-ad7160-eval: fix GPIO CS define
      Blackfin: bf537-pnav: increase monitor len
      Blackfin: otp: fix build after constification of args[]

Peter Meerwald (2):
      Blackfin: support a 3rd gpio cfi pin
      Blackfin: bct-brettl2: new board port

Wojtek Skulski (1):
      Blackfin: blackvme: new board port

 MAINTAINERS                                        |   10 +-
 arch/blackfin/config.mk                            |    7 +-
 arch/blackfin/cpu/cmd_gpio.c                       |   34 +-
 arch/blackfin/include/asm/blackfin_cdef.h          |   19 +-
 arch/blackfin/include/asm/blackfin_def.h           |   33 +-
 arch/blackfin/include/asm/config.h                 |    5 -
 arch/blackfin/include/asm/dma.h                    |   75 +
 arch/blackfin/include/asm/mach-bf518/BF512_cdef.h  | 1000 ++++++++++
 arch/blackfin/include/asm/mach-bf518/BF512_def.h   |  523 +++++
 arch/blackfin/include/asm/mach-bf518/BF514_cdef.h  |   68 +
 arch/blackfin/include/asm/mach-bf518/BF514_def.h   |   40 +
 arch/blackfin/include/asm/mach-bf518/BF516_cdef.h  |  170 ++
 arch/blackfin/include/asm/mach-bf518/BF516_def.h   |   91 +
 arch/blackfin/include/asm/mach-bf518/BF518_cdef.h  |   58 +
 arch/blackfin/include/asm/mach-bf518/BF518_def.h   |   35 +
 arch/blackfin/include/asm/mach-bf518/anomaly.h     |  158 ++
 arch/blackfin/include/asm/mach-bf518/def_local.h   |    5 +
 arch/blackfin/include/asm/mach-bf518/gpio.h        |   58 +
 arch/blackfin/include/asm/mach-bf518/portmux.h     |  201 ++
 arch/blackfin/include/asm/mach-bf518/ports.h       |   59 +
 .../asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h  |  511 -----
 .../asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h   |    6 -
 arch/blackfin/include/asm/mach-bf527/BF522_cdef.h  |  311 ---
 arch/blackfin/include/asm/mach-bf527/BF522_def.h   |  101 -
 arch/blackfin/include/asm/mach-bf527/BF523_cdef.h  |  342 +----
 arch/blackfin/include/asm/mach-bf527/BF523_def.h   |  124 +--
 arch/blackfin/include/asm/mach-bf527/BF524_cdef.h  |  480 -----
 arch/blackfin/include/asm/mach-bf527/BF524_def.h   |  101 -
 arch/blackfin/include/asm/mach-bf527/BF525_cdef.h  |  849 +--------
 arch/blackfin/include/asm/mach-bf527/BF525_def.h   |  293 +---
 arch/blackfin/include/asm/mach-bf527/BF526_cdef.h  |  559 ------
 arch/blackfin/include/asm/mach-bf527/BF526_def.h   |  101 -
 arch/blackfin/include/asm/mach-bf527/BF527_cdef.h  | 1086 +-----------
 arch/blackfin/include/asm/mach-bf527/BF527_def.h   |  372 +----
 arch/blackfin/include/asm/mach-bf533/BF531_cdef.h  |  862 ++++++++-
 arch/blackfin/include/asm/mach-bf533/BF531_def.h   |  428 ++++-
 arch/blackfin/include/asm/mach-bf533/BF532_cdef.h  |   15 +-
 arch/blackfin/include/asm/mach-bf533/BF532_def.h   |    6 +-
 arch/blackfin/include/asm/mach-bf533/BF533_cdef.h  |   15 +-
 arch/blackfin/include/asm/mach-bf533/BF533_def.h   |    4 +-
 .../asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h  | 1130 +-----------
 .../asm/mach-bf537/ADSP-EDN-BF534-extended_def.h   |  109 +-
 arch/blackfin/include/asm/mach-bf537/BF534_def.h   |    2 +
 arch/blackfin/include/asm/mach-bf537/BF536_cdef.h  |   83 +-
 arch/blackfin/include/asm/mach-bf537/BF536_def.h   |   13 +-
 arch/blackfin/include/asm/mach-bf537/BF537_cdef.h  |  252 +---
 arch/blackfin/include/asm/mach-bf537/BF537_def.h   |  109 +-
 arch/blackfin/include/asm/mach-bf538/BF538_cdef.h  | 2014 +++++++++++++++++++
 arch/blackfin/include/asm/mach-bf538/BF538_def.h   | 1031 ++++++++++
 arch/blackfin/include/asm/mach-bf538/BF539_cdef.h  |    1 +
 arch/blackfin/include/asm/mach-bf538/BF539_def.h   |    1 +
 arch/blackfin/include/asm/mach-bf538/anomaly.h     |  196 ++
 arch/blackfin/include/asm/mach-bf538/def_local.h   |    5 +
 arch/blackfin/include/asm/mach-bf538/gpio.h        |   73 +
 arch/blackfin/include/asm/mach-bf538/portmux.h     |  114 ++
 arch/blackfin/include/asm/mach-bf538/ports.h       |   13 +
 .../asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h  | 1465 --------------
 .../asm/mach-bf548/ADSP-EDN-BF542-extended_def.h   |    4 -
 .../asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h  | 1663 ----------------
 .../asm/mach-bf548/ADSP-EDN-BF544-extended_def.h   |    4 -
 .../asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h  | 1211 ------------
 .../asm/mach-bf548/ADSP-EDN-BF547-extended_def.h   |    4 -
 .../asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h  | 1935 ------------------
 .../asm/mach-bf548/ADSP-EDN-BF548-extended_def.h   |    4 -
 .../asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h  | 2051 --------------------
 .../asm/mach-bf548/ADSP-EDN-BF549-extended_def.h   |    4 -
 arch/blackfin/include/asm/mach-bf548/BF541_cdef.h  |  323 ---
 arch/blackfin/include/asm/mach-bf548/BF541_def.h   |  117 --
 arch/blackfin/include/asm/mach-bf548/BF542_cdef.h  |  303 ---
 arch/blackfin/include/asm/mach-bf548/BF542_def.h   |  100 -
 arch/blackfin/include/asm/mach-bf548/BF544_cdef.h  |  303 ---
 arch/blackfin/include/asm/mach-bf548/BF544_def.h   |  100 -
 arch/blackfin/include/asm/mach-bf548/BF547_cdef.h  |  303 ---
 arch/blackfin/include/asm/mach-bf548/BF547_def.h   |  100 -
 arch/blackfin/include/asm/mach-bf548/BF548_cdef.h  |  303 ---
 arch/blackfin/include/asm/mach-bf548/BF548_def.h   |  100 -
 arch/blackfin/include/asm/mach-bf548/BF549_cdef.h  |  303 ---
 arch/blackfin/include/asm/mach-bf548/BF549_def.h   |  100 -
 arch/blackfin/include/asm/mach-bf561/BF561_cdef.h  | 1594 ++++++++++++---
 arch/blackfin/include/asm/mach-bf561/BF561_def.h   |  724 ++++++-
 .../mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h | 1988 -------------------
 .../mach-common/ADSP-EDN-DUAL-CORE-extended_def.h  |  670 -------
 .../include/asm/mach-common/ADSP-EDN-core_cdef.h   |  253 +++-
 .../include/asm/mach-common/ADSP-EDN-core_def.h    |  120 ++-
 .../asm/mach-common/ADSP-EDN-extended_cdef.h       | 1607 ---------------
 .../asm/mach-common/ADSP-EDN-extended_def.h        |  543 ------
 arch/blackfin/lib/board.c                          |    4 +-
 board/bct-brettl2/Makefile                         |   51 +
 board/bct-brettl2/bct-brettl2.c                    |  123 ++
 board/bct-brettl2/cled.c                           |   32 +
 board/bct-brettl2/config.mk                        |   35 +
 board/bct-brettl2/gpio_cfi_flash.c                 |    4 +
 board/bct-brettl2/smsc9303.c                       |  176 ++
 board/bct-brettl2/smsc9303.h                       |    9 +
 board/bf518f-ezbrd/config.mk                       |    2 +
 board/bf526-ezbrd/config.mk                        |    2 +
 board/bf527-ad7160-eval/bf527-ad7160-eval.c        |    2 +-
 board/bf527-ad7160-eval/config.mk                  |    2 +
 board/bf527-ezkit/config.mk                        |    2 +
 board/bf527-ezkit/video.c                          |   76 +-
 board/bf527-sdp/Makefile                           |   54 +
 board/bf527-sdp/bf527-sdp.c                        |   32 +
 board/bf527-sdp/config.mk                          |   36 +
 board/bf533-ezkit/config.mk                        |    2 +
 board/bf533-stamp/config.mk                        |    2 +
 board/bf537-minotaur/config.mk                     |    2 +
 board/bf537-pnav/config.mk                         |    2 +
 board/bf537-srv1/config.mk                         |    2 +
 board/bf537-stamp/config.mk                        |    2 +
 board/bf537-stamp/post-memory.c                    |   54 +-
 board/bf537-stamp/post.c                           |  152 +-
 board/bf538f-ezkit/config.mk                       |    2 +
 board/bf548-ezkit/config.mk                        |    2 +
 board/bf548-ezkit/video.c                          |   21 +-
 board/bf561-acvilon/config.mk                      |    2 +
 board/bf561-ezkit/config.mk                        |    2 +
 board/blackstamp/config.mk                         |    2 +
 board/blackvme/Makefile                            |   54 +
 board/blackvme/blackvme.c                          |   31 +
 board/blackvme/config.mk                           |   32 +
 board/cm-bf527/cm-bf527.c                          |    2 +-
 board/cm-bf527/config.mk                           |    2 +
 board/cm-bf527/gpio_cfi_flash.c                    |   63 +-
 board/cm-bf527/gpio_cfi_flash.h                    |   10 -
 board/cm-bf533/config.mk                           |    2 +
 board/cm-bf537e/config.mk                          |    2 +
 board/cm-bf537e/gpio_cfi_flash.c                   |   33 +-
 board/cm-bf537u/cm-bf537u.c                        |    2 +-
 board/cm-bf537u/config.mk                          |    2 +
 board/cm-bf537u/gpio_cfi_flash.c                   |   60 +-
 board/cm-bf537u/gpio_cfi_flash.h                   |   10 -
 board/cm-bf548/config.mk                           |    2 +
 board/cm-bf548/video.c                             |   23 +-
 board/cm-bf561/config.mk                           |    2 +
 board/ibf-dsp561/config.mk                         |    2 +
 board/ip04/config.mk                               |    2 +
 board/tcm-bf518/config.mk                          |    2 +
 board/tcm-bf537/config.mk                          |    2 +
 board/tcm-bf537/gpio_cfi_flash.c                   |   63 +-
 board/tcm-bf537/gpio_cfi_flash.h                   |   10 -
 board/tcm-bf537/tcm-bf537.c                        |    2 +-
 boards.cfg                                         |    3 +
 common/cmd_otp.c                                   |   13 +-
 drivers/mmc/bfin_sdh.c                             |   25 +-
 drivers/net/bfin_mac.c                             |   68 +-
 drivers/spi/bfin_spi.c                             |  155 ++-
 include/configs/bct-brettl2.h                      |  155 ++
 include/configs/bf518f-ezbrd.h                     |    1 -
 include/configs/bf526-ezbrd.h                      |    6 +-
 include/configs/bf527-ad7160-eval.h                |    3 +-
 include/configs/bf527-ezkit.h                      |    1 -
 include/configs/bf527-sdp.h                        |  121 ++
 include/configs/bf533-ezkit.h                      |    1 -
 include/configs/bf533-stamp.h                      |    6 +-
 include/configs/bf537-minotaur.h                   |    1 -
 include/configs/bf537-pnav.h                       |    3 +-
 include/configs/bf537-srv1.h                       |    1 -
 include/configs/bf537-stamp.h                      |    6 +-
 include/configs/bf538f-ezkit.h                     |    6 +-
 include/configs/bf548-ezkit.h                      |    2 +-
 include/configs/bf561-acvilon.h                    |    1 -
 include/configs/bf561-ezkit.h                      |    1 -
 include/configs/bfin_adi_common.h                  |   46 +-
 include/configs/blackstamp.h                       |    1 -
 include/configs/blackvme.h                         |  246 +++
 include/configs/cm-bf527.h                         |    1 -
 include/configs/cm-bf533.h                         |    1 -
 include/configs/cm-bf537e.h                        |    1 -
 include/configs/cm-bf537u.h                        |    1 -
 include/configs/cm-bf548.h                         |    1 -
 include/configs/cm-bf561.h                         |    1 -
 include/configs/ibf-dsp561.h                       |    1 -
 include/configs/ip04.h                             |    1 -
 include/configs/tcm-bf518.h                        |    1 -
 include/configs/tcm-bf537.h                        |    1 -
 175 files changed, 11281 insertions(+), 23567 deletions(-)
 create mode 100644 arch/blackfin/include/asm/dma.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF512_cdef.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF512_def.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF514_cdef.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF514_def.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF516_cdef.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF516_def.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF518_cdef.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/BF518_def.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/anomaly.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/def_local.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/gpio.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/portmux.h
 create mode 100644 arch/blackfin/include/asm/mach-bf518/ports.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/BF538_cdef.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/BF538_def.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/BF539_cdef.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/BF539_def.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/anomaly.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/def_local.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/gpio.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/portmux.h
 create mode 100644 arch/blackfin/include/asm/mach-bf538/ports.h
 delete mode 100644 arch/blackfin/include/asm/mach-bf548/BF541_cdef.h
 delete mode 100644 arch/blackfin/include/asm/mach-bf548/BF541_def.h
 delete mode 100644 arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h
 delete mode 100644 arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h
 delete mode 100644 arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h
 delete mode 100644 arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h
 create mode 100644 board/bct-brettl2/Makefile
 create mode 100644 board/bct-brettl2/bct-brettl2.c
 create mode 100644 board/bct-brettl2/cled.c
 create mode 100644 board/bct-brettl2/config.mk
 create mode 100644 board/bct-brettl2/gpio_cfi_flash.c
 create mode 100644 board/bct-brettl2/smsc9303.c
 create mode 100644 board/bct-brettl2/smsc9303.h
 create mode 100644 board/bf527-sdp/Makefile
 create mode 100644 board/bf527-sdp/bf527-sdp.c
 create mode 100644 board/bf527-sdp/config.mk
 create mode 100644 board/blackvme/Makefile
 create mode 100644 board/blackvme/blackvme.c
 create mode 100644 board/blackvme/config.mk
 delete mode 100644 board/cm-bf527/gpio_cfi_flash.h
 delete mode 100644 board/cm-bf537u/gpio_cfi_flash.h
 delete mode 100644 board/tcm-bf537/gpio_cfi_flash.h
 create mode 100644 include/configs/bct-brettl2.h
 create mode 100644 include/configs/bf527-sdp.h
 create mode 100644 include/configs/blackvme.h


More information about the U-Boot mailing list