Skip to contentSkip to conversation

AT91 Pull Request

U-Boot Applied Jean-Christophe PLAGNIOL-VILLARD 2 participants 2 messages Mar 25, 2009 – Mar 26, 2009

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,

Please pull The following changes since commit ee1702d75a30d076139d1841383a1fa7220a0e11:
Wolfgang Denk (1):
Merge branch 'next' of ../next

are available in the git repository at:

git://git.denx.de/u-boot-at91.git master

Jean-Christophe PLAGNIOL-VILLARD (10):
at91sam9/at91cap: move common serial initialisation to cpu at91sam9/at91cap: move common spi initialisation to cpu at91sam9/at91cap: move common led management to cpu at91sam9/at91cap: move common usb host initialisation to cpu at91sam9/at91cap: move common macb initialisation to cpu atmel/at91/boards: compile dataflash partition only when dataflash is at91sam9/at91cap: move nand drivers to drivers/mtd/nand
at91sam9xeek: fix soc name
cmc_pu2: fix misc_init_r prototype
cmc_pu2: fix implicit declaration of function 'eth_setenv_enetaddr'

Nicolas Ferre (1):

      at91: Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.
 MAKEALL                                            |    1 +
 Makefile                                           |   16 +++-
 board/afeb9260/Makefile                            |    1 -
 board/afeb9260/afeb9260.c                          |   72 ++---------------
 board/atmel/at91cap9adk/Makefile                   |    3 +-
 board/atmel/at91cap9adk/at91cap9adk.c              |   71 ++--------------
 board/atmel/at91cap9adk/led.c                      |   46 ++---------
 board/atmel/at91cap9adk/nand.c                     |   72 ----------------
 board/atmel/at91sam9260ek/Makefile                 |    3 +-
 board/atmel/at91sam9260ek/at91sam9260ek.c          |   88 +++-----------------
 board/atmel/at91sam9260ek/led.c                    |   31 +------
 board/atmel/at91sam9260ek/nand.c                   |   78 -----------------
 board/atmel/at91sam9261ek/Makefile                 |    3 +-
 board/atmel/at91sam9261ek/at91sam9261ek.c          |   50 +----------
 board/atmel/at91sam9261ek/led.c                    |   47 ++---------
 board/atmel/at91sam9261ek/nand.c                   |   78 -----------------
 board/atmel/at91sam9263ek/Makefile                 |    3 +-
 board/atmel/at91sam9263ek/at91sam9263ek.c          |   85 ++-----------------
 board/atmel/at91sam9263ek/led.c                    |   46 ++---------
 board/atmel/at91sam9263ek/nand.c                   |   78 -----------------
 board/atmel/at91sam9rlek/Makefile                  |    3 +-
 board/atmel/at91sam9rlek/at91sam9rlek.c            |   50 +----------
 board/atmel/at91sam9rlek/led.c                     |   46 ++---------
 board/atmel/at91sam9rlek/nand.c                    |   78 -----------------
 board/cmc_pu2/load_sernum_ethaddr.c                |    9 ++-
 cpu/arm926ejs/at91/Makefile                        |   32 +++++++-
 cpu/arm926ejs/at91/at91cap9_macb.c                 |   54 ++++++++++++
 cpu/arm926ejs/at91/at91cap9_serial.c               |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91cap9_spi.c                  |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9260_macb.c              |   63 ++++++++++++++
 cpu/arm926ejs/at91/at91sam9260_serial.c            |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9260_spi.c               |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9261_serial.c            |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9261_spi.c               |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9263_macb.c              |   54 ++++++++++++
 cpu/arm926ejs/at91/at91sam9263_serial.c            |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9263_spi.c               |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9263_usb.c               |   35 ++++++++
 cpu/arm926ejs/at91/at91sam9rl_serial.c             |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9rl_spi.c                |   52 ++++++++++++
 cpu/arm926ejs/at91/led.c                           |   64 ++++++++++++++
 cpu/arm926ejs/at91/usb.c                           |    4 +-
 doc/README.at91                                    |    2 +-
 drivers/mtd/nand/Makefile                          |    1 +
 .../nand.c => drivers/mtd/nand/atmel_nand.c        |   32 ++++----
 drivers/net/macb.c                                 |    4 +-
 include/asm-arm/arch-at91/at91_common.h            |   38 +++++++++
 include/asm-arm/arch-at91/hardware.h               |    2 +-
 include/configs/afeb9260.h                         |    9 ++
 include/configs/at91cap9adk.h                      |   14 +++
 include/configs/at91sam9260ek.h                    |   37 +++++++-
 include/configs/at91sam9261ek.h                    |   15 ++++
 include/configs/at91sam9263ek.h                    |   15 ++++
 include/configs/at91sam9rlek.h                     |   15 ++++
 54 files changed, 1288 insertions(+), 992 deletions(-)
 delete mode 100644 board/atmel/at91cap9adk/nand.c
 delete mode 100644 board/atmel/at91sam9260ek/nand.c
 delete mode 100644 board/atmel/at91sam9261ek/nand.c
 delete mode 100644 board/atmel/at91sam9263ek/nand.c
 delete mode 100644 board/atmel/at91sam9rlek/nand.c
 create mode 100644 cpu/arm926ejs/at91/at91cap9_macb.c
 create mode 100644 cpu/arm926ejs/at91/at91cap9_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91cap9_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9260_macb.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9260_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9260_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9261_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9261_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_macb.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_usb.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9rl_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9rl_spi.c
 create mode 100644 cpu/arm926ejs/at91/led.c
 rename board/afeb9260/nand.c => drivers/mtd/nand/atmel_nand.c (72%)
 create mode 100644 include/asm-arm/arch-at91/at91_common.h

Best Regards,
J.

#1 lore raw

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 94 lines · In message <[email protected]> you wrote:

Hi Wolfgang,

Please pull The following changes since commit ee1702d75a30d076139d1841383a1fa7220a0e11:
Wolfgang Denk (1):
Merge branch 'next' of ../next

are available in the git repository at:

git://git.denx.de/u-boot-at91.git master

Jean-Christophe PLAGNIOL-VILLARD (10):
at91sam9/at91cap: move common serial initialisation to cpu at91sam9/at91cap: move common spi initialisation to cpu at91sam9/at91cap: move common led management to cpu at91sam9/at91cap: move common usb host initialisation to cpu at91sam9/at91cap: move common macb initialisation to cpu atmel/at91/boards: compile dataflash partition only when dataflash is at91sam9/at91cap: move nand drivers to drivers/mtd/nand
at91sam9xeek: fix soc name
cmc_pu2: fix misc_init_r prototype
cmc_pu2: fix implicit declaration of function 'eth_setenv_enetaddr'

Nicolas Ferre (1):

      at91: Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.
 MAKEALL                                            |    1 +
 Makefile                                           |   16 +++-
 board/afeb9260/Makefile                            |    1 -
 board/afeb9260/afeb9260.c                          |   72 ++---------------
 board/atmel/at91cap9adk/Makefile                   |    3 +-
 board/atmel/at91cap9adk/at91cap9adk.c              |   71 ++--------------
 board/atmel/at91cap9adk/led.c                      |   46 ++---------
 board/atmel/at91cap9adk/nand.c                     |   72 ----------------
 board/atmel/at91sam9260ek/Makefile                 |    3 +-
 board/atmel/at91sam9260ek/at91sam9260ek.c          |   88 +++-----------------
 board/atmel/at91sam9260ek/led.c                    |   31 +------
 board/atmel/at91sam9260ek/nand.c                   |   78 -----------------
 board/atmel/at91sam9261ek/Makefile                 |    3 +-
 board/atmel/at91sam9261ek/at91sam9261ek.c          |   50 +----------
 board/atmel/at91sam9261ek/led.c                    |   47 ++---------
 board/atmel/at91sam9261ek/nand.c                   |   78 -----------------
 board/atmel/at91sam9263ek/Makefile                 |    3 +-
 board/atmel/at91sam9263ek/at91sam9263ek.c          |   85 ++-----------------
 board/atmel/at91sam9263ek/led.c                    |   46 ++---------
 board/atmel/at91sam9263ek/nand.c                   |   78 -----------------
 board/atmel/at91sam9rlek/Makefile                  |    3 +-
 board/atmel/at91sam9rlek/at91sam9rlek.c            |   50 +----------
 board/atmel/at91sam9rlek/led.c                     |   46 ++---------
 board/atmel/at91sam9rlek/nand.c                    |   78 -----------------
 board/cmc_pu2/load_sernum_ethaddr.c                |    9 ++-
 cpu/arm926ejs/at91/Makefile                        |   32 +++++++-
 cpu/arm926ejs/at91/at91cap9_macb.c                 |   54 ++++++++++++
 cpu/arm926ejs/at91/at91cap9_serial.c               |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91cap9_spi.c                  |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9260_macb.c              |   63 ++++++++++++++
 cpu/arm926ejs/at91/at91sam9260_serial.c            |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9260_spi.c               |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9261_serial.c            |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9261_spi.c               |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9263_macb.c              |   54 ++++++++++++
 cpu/arm926ejs/at91/at91sam9263_serial.c            |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9263_spi.c               |   75 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9263_usb.c               |   35 ++++++++
 cpu/arm926ejs/at91/at91sam9rl_serial.c             |   76 +++++++++++++++++
 cpu/arm926ejs/at91/at91sam9rl_spi.c                |   52 ++++++++++++
 cpu/arm926ejs/at91/led.c                           |   64 ++++++++++++++
 cpu/arm926ejs/at91/usb.c                           |    4 +-
 doc/README.at91                                    |    2 +-
 drivers/mtd/nand/Makefile                          |    1 +
 .../nand.c => drivers/mtd/nand/atmel_nand.c        |   32 ++++----
 drivers/net/macb.c                                 |    4 +-
 include/asm-arm/arch-at91/at91_common.h            |   38 +++++++++
 include/asm-arm/arch-at91/hardware.h               |    2 +-
 include/configs/afeb9260.h                         |    9 ++
 include/configs/at91cap9adk.h                      |   14 +++
 include/configs/at91sam9260ek.h                    |   37 +++++++-
 include/configs/at91sam9261ek.h                    |   15 ++++
 include/configs/at91sam9263ek.h                    |   15 ++++
 include/configs/at91sam9rlek.h                     |   15 ++++
 54 files changed, 1288 insertions(+), 992 deletions(-)
 delete mode 100644 board/atmel/at91cap9adk/nand.c
 delete mode 100644 board/atmel/at91sam9260ek/nand.c
 delete mode 100644 board/atmel/at91sam9261ek/nand.c
 delete mode 100644 board/atmel/at91sam9263ek/nand.c
 delete mode 100644 board/atmel/at91sam9rlek/nand.c
 create mode 100644 cpu/arm926ejs/at91/at91cap9_macb.c
 create mode 100644 cpu/arm926ejs/at91/at91cap9_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91cap9_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9260_macb.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9260_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9260_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9261_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9261_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_macb.c
Quoted 8 lines
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_spi.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9263_usb.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9rl_serial.c
 create mode 100644 cpu/arm926ejs/at91/at91sam9rl_spi.c
 create mode 100644 cpu/arm926ejs/at91/led.c
 rename board/afeb9260/nand.c => drivers/mtd/nand/atmel_nand.c (72%)
 create mode 100644 include/asm-arm/arch-at91/at91_common.h

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 7 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
The further the spiritual evolution of  mankind  advances,  the  more
certain  it seems to me that the path to genuine religiosity does not
lie through the fear of life, and the fear of death, and blind faith,
but through striving after rational knowledge.      - Albert Einstein