Skip to contentSkip to conversation

u-boot-arm pull request

U-Boot Applied Jean-Christophe PLAGNIOL-VILLARD 3 participants 3 messages Aug 31, 2008 – Sep 1, 2008

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,
please pull
The following changes since commit 33aa4eac66b71c797bbc13b3afe432a2132947d4:
Wolfgang Denk (1):
Merge branch 'master' of /home/wd/git/u-boot/custodians

are available in the git repository at:

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

Guennadi Liakhovetski (7):
ARM: Add arm1176 core with S3C6400 SoC
USB: Add support for OHCI controller on S3C6400
serial: add S3C64XX serial driver
S3C64XX: remove broken HWFLOW support from the serial driver
NAND: add NAND driver for S3C64XX
ARM: Add support for S3C6400 based SMDK6400 board
smdk6400: remove redundant bootargs definition

Gururaja Hebbar K R (1):
Integrator[AP/CP] - Remove unused file memsetup.S

Hugo Villeneuve (2):
ARM DaVinci: Move common functions to board/davinci/common ARM DaVinci: Standardize names of directories/files

Jean-Christophe PLAGNIOL-VILLARD (3):
smdk6400: Use CONFIG_FLASH_CFI_DRIVER
smdk6400: add gitignore
davinci: fix remaining dm644x_eth

Sandeep Paulraj (1):
ARM DaVinci: Changing function names for EMAC driver

 MAINTAINERS                                        |    1 +
 MAKEALL                                            |    1 +
 Makefile                                           |   19 +-
 board/davinci/{dv-evm => common}/Makefile          |   13 +-
 board/davinci/common/misc.c                        |  126 +++
 board/davinci/common/misc.h                        |   32 +
 board/davinci/common/psc.c                         |  117 +++
 .../memsetup.S => davinci/common/psc.h}            |   27 +-
 board/davinci/dv-evm/dv_board.c                    |  202 -----
 board/davinci/{dv-evm => dvevm}/Makefile           |    2 +-
 board/davinci/{dv-evm => dvevm}/board_init.S       |    0 
 board/davinci/{dv-evm => dvevm}/config.mk          |    0 
 board/davinci/dvevm/dvevm.c                        |  103 +++
 board/davinci/{dv-evm => dvevm}/u-boot.lds         |    0 
 board/davinci/schmoogie/Makefile                   |    2 +-
 .../davinci/schmoogie/{dv_board.c => schmoogie.c}  |  103 +---
 board/davinci/sffsdr/sffsdr.c                      |  158 +----
 board/davinci/sonata/Makefile                      |    2 +-
 board/davinci/sonata/dv_board.c                    |  199 -----
 board/davinci/sonata/sonata.c                      |   97 +++
 board/integratorap/Makefile                        |    2 +-
 board/integratorcp/Makefile                        |    2 +-
 board/samsung/smdk6400/.gitignore                  |    5 +
 .../{davinci/dv-evm => samsung/smdk6400}/Makefile  |   18 +-
 board/samsung/smdk6400/config.mk                   |   30 +
 board/samsung/smdk6400/lowlevel_init.S             |  316 +++++++
 board/samsung/smdk6400/smdk6400.c                  |  130 +++
 .../smdk6400/u-boot-nand.lds}                      |   18 +-
 {board/davinci/dv-evm => cpu/arm1176}/Makefile     |   30 +-
 .../dv-evm/Makefile => cpu/arm1176/config.mk       |   45 +-
 cpu/arm1176/cpu.c                                  |  188 ++++
 .../dv-evm => cpu/arm1176/s3c64xx}/Makefile        |   29 +-
 .../Makefile => cpu/arm1176/s3c64xx/config.mk      |   44 +-
 cpu/arm1176/s3c64xx/cpu_init.S                     |  142 ++++
 cpu/arm1176/s3c64xx/interrupts.c                   |  174 ++++
 cpu/arm1176/s3c64xx/speed.c                        |  145 ++++
 .../memsetup.S => cpu/arm1176/s3c64xx/usb.c        |   32 +-
 cpu/arm1176/start.S                                |  469 ++++++++++
 cpu/arm926ejs/davinci/dp83848.c                    |   24 +-
 cpu/arm926ejs/davinci/ether.c                      |  114 ++--
 cpu/arm926ejs/davinci/lxt972.c                     |   20 +-
 drivers/mtd/nand/Makefile                          |    1 +
 drivers/mtd/nand/s3c64xx.c                         |  319 +++++++
 drivers/serial/Makefile                            |    1 +
 drivers/serial/s3c64xx.c                           |  172 ++++
 drivers/usb/usb_ohci.c                             |    1 +
 include/asm-arm/arch-davinci/emac_defs.h           |    4 +-
 include/asm-arm/arch-s3c64xx/hardware.h            |   63 ++
 include/common.h                                   |    3 +-
 include/configs/smdk6400.h                         |  307 +++++++
 include/s3c6400.h                                  |  894 ++++++++++++++++++++
 include/s3c64x0.h                                  |   90 ++
 lib_arm/board.c                                    |    4 +-
 nand_spl/board/samsung/smdk6400/Makefile           |  106 +++
 .../board/samsung/smdk6400/config.mk               |   44 +-
 .../board/samsung/smdk6400}/u-boot.lds             |   17 +-
 net/eth.c                                          |    4 +-
 57 files changed, 4314 insertions(+), 897 deletions(-)
 copy board/davinci/{dv-evm => common}/Makefile (89%)
 create mode 100644 board/davinci/common/misc.c
 create mode 100644 board/davinci/common/misc.h
 create mode 100644 board/davinci/common/psc.c
 rename board/{integratorap/memsetup.S => davinci/common/psc.h} (56%)
 delete mode 100644 board/davinci/dv-evm/dv_board.c
 copy board/davinci/{dv-evm => dvevm}/Makefile (98%)
 rename board/davinci/{dv-evm => dvevm}/board_init.S (100%)
 rename board/davinci/{dv-evm => dvevm}/config.mk (100%)
 create mode 100644 board/davinci/dvevm/dvevm.c
 copy board/davinci/{dv-evm => dvevm}/u-boot.lds (100%)
 rename board/davinci/schmoogie/{dv_board.c => schmoogie.c} (67%)
 delete mode 100644 board/davinci/sonata/dv_board.c
 create mode 100644 board/davinci/sonata/sonata.c
 create mode 100644 board/samsung/smdk6400/.gitignore
 copy board/{davinci/dv-evm => samsung/smdk6400}/Makefile (79%)
 create mode 100644 board/samsung/smdk6400/config.mk
 create mode 100644 board/samsung/smdk6400/lowlevel_init.S
 create mode 100644 board/samsung/smdk6400/smdk6400.c
 copy board/{davinci/dv-evm/u-boot.lds => samsung/smdk6400/u-boot-nand.lds} (84%)
 copy {board/davinci/dv-evm => cpu/arm1176}/Makefile (69%)
 copy board/davinci/dv-evm/Makefile => cpu/arm1176/config.mk (50%)
 create mode 100644 cpu/arm1176/cpu.c
 copy {board/davinci/dv-evm => cpu/arm1176/s3c64xx}/Makefile (69%)
 copy board/davinci/dv-evm/Makefile => cpu/arm1176/s3c64xx/config.mk (50%)
 create mode 100644 cpu/arm1176/s3c64xx/cpu_init.S
 create mode 100644 cpu/arm1176/s3c64xx/interrupts.c
 create mode 100644 cpu/arm1176/s3c64xx/speed.c
 rename board/integratorcp/memsetup.S => cpu/arm1176/s3c64xx/usb.c (66%)
 create mode 100644 cpu/arm1176/start.S
 create mode 100644 drivers/mtd/nand/s3c64xx.c
 create mode 100644 drivers/serial/s3c64xx.c
 create mode 100644 include/asm-arm/arch-s3c64xx/hardware.h
 create mode 100644 include/configs/smdk6400.h
 create mode 100644 include/s3c6400.h
 create mode 100644 include/s3c64x0.h
 create mode 100644 nand_spl/board/samsung/smdk6400/Makefile
 rename board/davinci/dv-evm/Makefile => nand_spl/board/samsung/smdk6400/config.mk (52%)
 rename {board/davinci/dv-evm => nand_spl/board/samsung/smdk6400}/u-boot.lds (86%)

Best Regards,
J.

#1 lore raw

Dear Jean-Christophe PLAGNIOL-VILLARD,

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

Hi Wolfgang,
please pull
The following changes since commit 33aa4eac66b71c797bbc13b3afe432a2132947d4:
Wolfgang Denk (1):
Merge branch 'master' of /home/wd/git/u-boot/custodians

are available in the git repository at:

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

Guennadi Liakhovetski (7):
ARM: Add arm1176 core with S3C6400 SoC
USB: Add support for OHCI controller on S3C6400
serial: add S3C64XX serial driver
S3C64XX: remove broken HWFLOW support from the serial driver
NAND: add NAND driver for S3C64XX
ARM: Add support for S3C6400 based SMDK6400 board
smdk6400: remove redundant bootargs definition

Gururaja Hebbar K R (1):
Integrator[AP/CP] - Remove unused file memsetup.S

Hugo Villeneuve (2):
ARM DaVinci: Move common functions to board/davinci/common ARM DaVinci: Standardize names of directories/files

Jean-Christophe PLAGNIOL-VILLARD (3):
smdk6400: Use CONFIG_FLASH_CFI_DRIVER
smdk6400: add gitignore
davinci: fix remaining dm644x_eth

Sandeep Paulraj (1):
ARM DaVinci: Changing function names for EMAC driver

 MAINTAINERS                                        |    1 +
 MAKEALL                                            |    1 +
 Makefile                                           |   19 +-
 board/davinci/{dv-evm => common}/Makefile          |   13 +-
 board/davinci/common/misc.c                        |  126 +++
 board/davinci/common/misc.h                        |   32 +
 board/davinci/common/psc.c                         |  117 +++
 .../memsetup.S => davinci/common/psc.h}            |   27 +-
 board/davinci/dv-evm/dv_board.c                    |  202 -----
 board/davinci/{dv-evm => dvevm}/Makefile           |    2 +-
 board/davinci/{dv-evm => dvevm}/board_init.S       |    0 
 board/davinci/{dv-evm => dvevm}/config.mk          |    0 
 board/davinci/dvevm/dvevm.c                        |  103 +++
 board/davinci/{dv-evm => dvevm}/u-boot.lds         |    0 
 board/davinci/schmoogie/Makefile                   |    2 +-
 .../davinci/schmoogie/{dv_board.c => schmoogie.c}  |  103 +---
 board/davinci/sffsdr/sffsdr.c                      |  158 +----
 board/davinci/sonata/Makefile                      |    2 +-
 board/davinci/sonata/dv_board.c                    |  199 -----
 board/davinci/sonata/sonata.c                      |   97 +++
 board/integratorap/Makefile                        |    2 +-
 board/integratorcp/Makefile                        |    2 +-
 board/samsung/smdk6400/.gitignore                  |    5 +
 .../{davinci/dv-evm => samsung/smdk6400}/Makefile  |   18 +-
 board/samsung/smdk6400/config.mk                   |   30 +
 board/samsung/smdk6400/lowlevel_init.S             |  316 +++++++
 board/samsung/smdk6400/smdk6400.c                  |  130 +++
 .../smdk6400/u-boot-nand.lds}                      |   18 +-
 {board/davinci/dv-evm => cpu/arm1176}/Makefile     |   30 +-
 .../dv-evm/Makefile => cpu/arm1176/config.mk       |   45 +-
 cpu/arm1176/cpu.c                                  |  188 ++++
 .../dv-evm => cpu/arm1176/s3c64xx}/Makefile        |   29 +-
 .../Makefile => cpu/arm1176/s3c64xx/config.mk      |   44 +-
 cpu/arm1176/s3c64xx/cpu_init.S                     |  142 ++++
 cpu/arm1176/s3c64xx/interrupts.c                   |  174 ++++
 cpu/arm1176/s3c64xx/speed.c                        |  145 ++++
 .../memsetup.S => cpu/arm1176/s3c64xx/usb.c        |   32 +-
 cpu/arm1176/start.S                                |  469 ++++++++++
 cpu/arm926ejs/davinci/dp83848.c                    |   24 +-
 cpu/arm926ejs/davinci/ether.c                      |  114 ++--
 cpu/arm926ejs/davinci/lxt972.c                     |   20 +-
 drivers/mtd/nand/Makefile                          |    1 +
 drivers/mtd/nand/s3c64xx.c                         |  319 +++++++
 drivers/serial/Makefile                            |    1 +
 drivers/serial/s3c64xx.c                           |  172 ++++
 drivers/usb/usb_ohci.c                             |    1 +
 include/asm-arm/arch-davinci/emac_defs.h           |    4 +-
 include/asm-arm/arch-s3c64xx/hardware.h            |   63 ++
 include/common.h                                   |    3 +-
 include/configs/smdk6400.h                         |  307 +++++++
 include/s3c6400.h                                  |  894 ++++++++++++++++++++
 include/s3c64x0.h                                  |   90 ++
 lib_arm/board.c                                    |    4 +-
 nand_spl/board/samsung/smdk6400/Makefile           |  106 +++
 .../board/samsung/smdk6400/config.mk               |   44 +-
 .../board/samsung/smdk6400}/u-boot.lds             |   17 +-
 net/eth.c                                          |    4 +-
 57 files changed, 4314 insertions(+), 897 deletions(-)
 copy board/davinci/{dv-evm => common}/Makefile (89%)
 create mode 100644 board/davinci/common/misc.c
 create mode 100644 board/davinci/common/misc.h
 create mode 100644 board/davinci/common/psc.c
 rename board/{integratorap/memsetup.S => davinci/common/psc.h} (56%)
 delete mode 100644 board/davinci/dv-evm/dv_board.c
 copy board/davinci/{dv-evm => dvevm}/Makefile (98%)
 rename board/davinci/{dv-evm => dvevm}/board_init.S (100%)
 rename board/davinci/{dv-evm => dvevm}/config.mk (100%)
 create mode 100644 board/davinci/dvevm/dvevm.c
 copy board/davinci/{dv-evm => dvevm}/u-boot.lds (100%)
 rename board/davinci/schmoogie/{dv_board.c => schmoogie.c} (67%)
 delete mode 100644 board/davinci/sonata/dv_board.c
 create mode 100644 board/davinci/sonata/sonata.c
 create mode 100644 board/samsung/smdk6400/.gitignore
 copy board/{davinci/dv-evm => samsung/smdk6400}/Makefile (79%)
 create mode 100644 board/samsung/smdk6400/config.mk
 create mode 100644 board/samsung/smdk6400/lowlevel_init.S
 create mode 100644 board/samsung/smdk6400/smdk6400.c
 copy board/{davinci/dv-evm/u-boot.lds => samsung/smdk6400/u-boot-nand.lds} (84%)
 copy {board/davinci/dv-evm => cpu/arm1176}/Makefile (69%)
 copy board/davinci/dv-evm/Makefile => cpu/arm1176/config.mk (50%)
 create mode 100644 cpu/arm1176/cpu.c
 copy {board/davinci/dv-evm => cpu/arm1176/s3c64xx}/Makefile (69%)
 copy board/davinci/dv-evm/Makefile => cpu/arm1176/s3c64xx/config.mk (50%)
 create mode 100644 cpu/arm1176/s3c64xx/cpu_init.S
 create mode 100644 cpu/arm1176/s3c64xx/interrupts.c
 create mode 100644 cpu/arm1176/s3c64xx/speed.c
 rename board/integratorcp/memsetup.S => cpu/arm1176/s3c64xx/usb.c (66%)
 create mode 100644 cpu/arm1176/start.S
 create mode 100644 drivers/mtd/nand/s3c64xx.c
Quoted 8 lines
 create mode 100644 drivers/serial/s3c64xx.c
 create mode 100644 include/asm-arm/arch-s3c64xx/hardware.h
 create mode 100644 include/configs/smdk6400.h
 create mode 100644 include/s3c6400.h
 create mode 100644 include/s3c64x0.h
 create mode 100644 nand_spl/board/samsung/smdk6400/Makefile
 rename board/davinci/dv-evm/Makefile => nand_spl/board/samsung/smdk6400/config.mk (52%)
 rename {board/davinci/dv-evm => nand_spl/board/samsung/smdk6400}/u-boot.lds (86%)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 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
Is truth not truth for all?
	-- Natira, "For the World is Hollow and I have Touched
		   the Sky", stardate 5476.4.
#2 lore raw
In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 10 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi Wolfgang,
please pull
The following changes since commit 33aa4eac66b71c797bbc13b3afe432a2132947d4:
Wolfgang Denk (1):
Merge branch 'master' of /home/wd/git/u-boot/custodians

are available in the git repository at:

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

Quoted 8 lines

Guennadi Liakhovetski (7):
ARM: Add arm1176 core with S3C6400 SoC
USB: Add support for OHCI controller on S3C6400
serial: add S3C64XX serial driver
S3C64XX: remove broken HWFLOW support from the serial driver
NAND: add NAND driver for S3C64XX
ARM: Add support for S3C6400 based SMDK6400 board
smdk6400: remove redundant bootargs definition

Just tested on smdk6400 with the current arm/master HEAD - not good, the board just reboots somewhere near / after NAND-probe.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.

DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de