Skip to contentSkip to conversation

ARM pull request

U-Boot Applied Tom 3 participants 6 messages Jan 23, 2010 – Jan 28, 2010

lore
Share & tools
lore

Tom

author
#0 lore raw

Wolfgang,

Please pull from ARM master-sync

Thanks,
Tom

The following changes since commit 57ae8a5cced612088104303777e71a3dc89c00ef:
Detlev Zundel (1):
mpc512x: Use in/out accessors for all registers

are available in the git repository at:

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

Daniel Gorsulowski (1):
at91: Enable slow master clock on meesc board

Minkyu Kang (1):
s5pc1xx: update cache routines

Prafulla Wadaskar (2):
Kirkwood: Upgated licencing for files imported from linux source to GPLv2
or later
Kirkwood: Makefile cleanup- fixed ordering (cosmetic change)

Seunghyeon Rhee (1):
samsung: fix DMC1_MEM_CFG for s3c64xx

Tom Rix (1):
ARM Update mach-types

Vipin KUMAR (12):
SPEAr : Adding README.spear in doc
SPEAr : Adding basic SPEAr architecture support. SPEAr : i2c driver support added for SPEAr SoCs SPEAr : smi driver support for SPEAr SoCs
SPEAr : nand driver support for SPEAr SoCs
SPEAr : usbd driver support for SPEAr SoCs
SPEAr : Support added for SPEAr600 board
SPEAr : Support for HW mac id read/write from i2c mem SPEAr : Support added for SPEAr300 board
SPEAr : emi controller initialization for CFI driver support SPEAr : Support added for SPEAr310 board
SPEAr : Support added for SPEAr320 board

  MAKEALL                                            |    4 +
  Makefile                                           |    8 +
  board/esd/meesc/meesc.c                            |   26 +
  board/spear/common/Makefile                        |   54 ++
  board/spear/common/spr_lowlevel_init.S             |  195 ++++
  board/spear/common/spr_misc.c                      |  296 ++++++
  board/spear/spear300/Makefile                      |   51 +
  board/spear/spear300/config.mk                     |   39 +
  .../cache.c => board/spear/spear300/spear300.c     |   43 +-
  board/spear/spear310/Makefile                      |   51 +
  board/spear/spear310/config.mk                     |   44 +
  board/spear/spear310/spear310.c                    |   59 ++
  board/spear/spear320/Makefile                      |   51 +
  board/spear/spear320/config.mk                     |   44 +
  board/spear/spear320/spear320.c                    |   59 ++
  board/spear/spear600/Makefile                      |   51 +
  board/spear/spear600/config.mk                     |   39 +
  .../cache.c => board/spear/spear600/spear600.c     |   38 +-
  cpu/arm926ejs/kirkwood/Makefile                    |    4 +-
  cpu/arm926ejs/spear/Makefile                       |   52 +
  .../s5pc1xx/cache.c => arm926ejs/spear/reset.c}    |   41 +-
  cpu/arm926ejs/spear/timer.c                        |  153 +++
  cpu/arm_cortexa8/s5pc1xx/Makefile                  |    4 +-
  cpu/arm_cortexa8/s5pc1xx/cache.S                   |  120 +++
  doc/README.spear                                   |   48 +
  drivers/gpio/kw_gpio.c                             |   20 +-
  drivers/i2c/Makefile                               |    1 +
  drivers/i2c/kirkwood_i2c.c                         |   23 +-
  drivers/i2c/spr_i2c.c                              |  331 +++++++
  drivers/mtd/Makefile                               |    1 +
  drivers/mtd/nand/Makefile                          |    1 +
  drivers/mtd/nand/spr_nand.c                        |  124 +++
  drivers/mtd/spr_smi.c                              |  523 ++++++++++
  drivers/serial/usbtty.h                            |    2 +
  drivers/usb/gadget/Makefile                        |    1 +
  drivers/usb/gadget/spr_udc.c                       |  998 ++++++++++++++++++++
  include/asm-arm/arch-kirkwood/gpio.h               |   20 +-
  include/asm-arm/arch-kirkwood/mpp.h                |   20 +-
  include/asm-arm/arch-s3c64xx/s3c6400.h             |    4 +-
  .../asm-arm/arch-s5pc1xx/sys_proto.h               |   27 +-
  include/asm-arm/arch-spear/hardware.h              |   66 ++
  .../asm-arm/arch-spear/spr_defs.h                  |   39 +-
  .../asm-arm/arch-spear/spr_emi.h                   |   47 +-
  include/asm-arm/arch-spear/spr_gpt.h               |   85 ++
  include/asm-arm/arch-spear/spr_i2c.h               |  146 +++
  include/asm-arm/arch-spear/spr_misc.h              |  130 +++
  include/asm-arm/arch-spear/spr_nand.h              |   57 ++
  include/asm-arm/arch-spear/spr_smi.h               |  115 +++
  .../asm-arm/arch-spear/spr_syscntl.h               |   39 +-
  include/asm-arm/arch-spear/spr_xloader_table.h     |   67 ++
  include/asm-arm/mach-types.h                       |  351 +++++++
  include/configs/meesc.h                            |    1 +
  include/configs/smdkc100.h                         |    2 -
  include/configs/spear-common.h                     |  213 +++++
  include/configs/spear3xx.h                         |  131 +++
  .../s5pc1xx/cache.c => include/configs/spear6xx.h  |   38 +-
  include/usb/spr_udc.h                              |  230 +++++
  57 files changed, 5266 insertions(+), 161 deletions(-)

create mode 100644 board/spear/common/Makefile
create mode 100755 board/spear/common/spr_lowlevel_init.S
create mode 100755 board/spear/common/spr_misc.c
create mode 100755 board/spear/spear300/Makefile
create mode 100755 board/spear/spear300/config.mk
copy cpu/arm_cortexa8/s5pc1xx/cache.c => board/spear/spear300/spear300.c (50%) mode change 100644 => 100755
create mode 100755 board/spear/spear310/Makefile
create mode 100755 board/spear/spear310/config.mk
create mode 100755 board/spear/spear310/spear310.c
create mode 100755 board/spear/spear320/Makefile
create mode 100755 board/spear/spear320/config.mk
create mode 100755 board/spear/spear320/spear320.c
create mode 100755 board/spear/spear600/Makefile
create mode 100755 board/spear/spear600/config.mk
copy cpu/arm_cortexa8/s5pc1xx/cache.c => board/spear/spear600/spear600.c (53%) mode change 100644 => 100755
create mode 100755 cpu/arm926ejs/spear/Makefile
copy cpu/{arm_cortexa8/s5pc1xx/cache.c => arm926ejs/spear/reset.c} (54%) mode change 100644 => 100755
create mode 100755 cpu/arm926ejs/spear/timer.c
create mode 100644 cpu/arm_cortexa8/s5pc1xx/cache.S
create mode 100644 doc/README.spear
mode change 100644 => 100755 drivers/i2c/Makefile
create mode 100755 drivers/i2c/spr_i2c.c
mode change 100644 => 100755 drivers/mtd/Makefile
create mode 100755 drivers/mtd/nand/spr_nand.c
create mode 100755 drivers/mtd/spr_smi.c
mode change 100644 => 100755 drivers/serial/usbtty.h
mode change 100644 => 100755 drivers/usb/gadget/Makefile
create mode 100755 drivers/usb/gadget/spr_udc.c
copy cpu/arm_cortexa8/s5pc1xx/cache.c =>
include/asm-arm/arch-s5pc1xx/sys_proto.h (61%)
create mode 100644 include/asm-arm/arch-spear/hardware.h
copy cpu/arm_cortexa8/s5pc1xx/cache.c => include/asm-arm/arch-spear/spr_defs.h
(58%)
copy cpu/arm_cortexa8/s5pc1xx/cache.c => include/asm-arm/arch-spear/spr_emi.h
(58%)
create mode 100755 include/asm-arm/arch-spear/spr_gpt.h
create mode 100755 include/asm-arm/arch-spear/spr_i2c.h
create mode 100644 include/asm-arm/arch-spear/spr_misc.h
create mode 100644 include/asm-arm/arch-spear/spr_nand.h
create mode 100755 include/asm-arm/arch-spear/spr_smi.h
copy cpu/arm_cortexa8/s5pc1xx/cache.c =>
include/asm-arm/arch-spear/spr_syscntl.h (58%)
create mode 100755 include/asm-arm/arch-spear/spr_xloader_table.h create mode 100644 include/configs/spear-common.h
create mode 100755 include/configs/spear3xx.h
rename cpu/arm_cortexa8/s5pc1xx/cache.c => include/configs/spear6xx.h (54%) mode change 100644 => 100755
create mode 100755 include/usb/spr_udc.h

Applied
#1 lore raw

Dear Tom,

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

Please pull from ARM master-sync

Can you please try and use the "master" branch for such pull requests? Thanks.

Quoted 9 lines

Daniel Gorsulowski (1):
at91: Enable slow master clock on meesc board

Minkyu Kang (1):
s5pc1xx: update cache routines

Prafulla Wadaskar (2):
Kirkwood: Upgated licencing for files imported from linux source to GPLv2
or later

I cannot find any patch with this subject anywhere. Can you please try and avoid to change the patch subjects?

BTW: what's "Upgated"? ;-)

Quoted 8 lines

Kirkwood: Makefile cleanup- fixed ordering (cosmetic change)

Seunghyeon Rhee (1):
samsung: fix DMC1_MEM_CFG for s3c64xx

Tom Rix (1):
ARM Update mach-types

Quoted 13 lines

Vipin KUMAR (12):
SPEAr : Adding README.spear in doc
SPEAr : Adding basic SPEAr architecture support. SPEAr : i2c driver support added for SPEAr SoCs SPEAr : smi driver support for SPEAr SoCs
SPEAr : nand driver support for SPEAr SoCs
SPEAr : usbd driver support for SPEAr SoCs
SPEAr : Support added for SPEAr600 board
SPEAr : Support for HW mac id read/write from i2c mem SPEAr : Support added for SPEAr300 board
SPEAr : emi controller initialization for CFI driver support SPEAr : Support added for SPEAr310 board
SPEAr : Support added for SPEAr320 board

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 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
Q:  Why do mountain climbers rope themselves together?
A:  To prevent the sensible ones from going home.
author
#2 lore raw
Quoted 6 lines · Wolfgang Denk

Dear Tom,

Quoted 1 line · In message <[email protected]> you wrote:

Please pull from ARM master-sync

Can you please try and use the "master" branch for such pull requests?

Ok.
At the current time arm/master is merged with u-boot/master arm/master-sync is rebased with u-boot/master
You would not want to pull from arm/master at this time.

In the future I will use arm/master

Quoted 8 lines

Thanks.

Quoted 6 lines

Daniel Gorsulowski (1):
at91: Enable slow master clock on meesc board

Minkyu Kang (1):
s5pc1xx: update cache routines

Quoted 6 lines
Quoted 3 lines

Prafulla Wadaskar (2):
Kirkwood: Upgated licencing for files imported from linux source to GPLv2
or later

I cannot find any patch with this subject anywhere. Can you please try and avoid to change the patch subjects?

This came from the latest marvell pull request. I discussed the copyright change with you off-line.

Tom

#3 lore raw

Dear Tom,

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

In the future I will use arm/master

Thanks.

Quoted 9 lines
Quoted 6 lines
Quoted 3 lines

Prafulla Wadaskar (2):
Kirkwood: Upgated licencing for files imported from linux source to GPLv2
or later

I cannot find any patch with this subject anywhere. Can you please try and avoid to change the patch subjects?

This came from the latest marvell pull request. I discussed the copyright change with you off-line.

I've seen a patch with a pretty similar subject on the list, and I assumed this was the one, but with changed / edited subject. Was this not the case? Was this another patch?

Please make sure that only patches go into your repo that have been posted to the ML before.

Best regards,

Wolfgang Denk

Signature · 5 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
Things that try to look like things often do look  more  like  things
than things. Well-known fact.       - Terry Pratchett, _Wyrd Sisters_
#4 lore raw
In reply to Wolfgang Denk
Quoted 25 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Wolfgang Denk
Sent: Saturday, January 23, 2010 10:18 PM
To: Tom
Cc: u-boot at lists.denx.de
Subject: Re: [U-Boot] ARM pull request

Dear Tom,

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

Please pull from ARM master-sync

Can you please try and use the "master" branch for such pull requests? Thanks.

Quoted 6 lines

Daniel Gorsulowski (1):
at91: Enable slow master clock on meesc board

Minkyu Kang (1):
s5pc1xx: update cache routines

Quoted 7 lines
Quoted 2 lines

Prafulla Wadaskar (2):
Kirkwood: Upgated licencing for files imported from

linux source to GPLv2

Quoted 1 line

or later

I cannot find any patch with this subject anywhere. Can you please try and avoid to change the patch subjects?

Hi Wolfgang
Yes, the subject is changed, this is my mistake while sending pull request. Can you pls pull in http://lists.denx.de/pipermail/u-boot/2009-December/065799.html instead?

Or
Shall I generate new pull request for the same?

Quoted 2 lines

BTW: what's "Upgated"? ;-)

Oh, this is spelling mistake :-(
I am very sorry for this

Regards..
Prafulla . .

#5 lore raw

Dear Prafulla,

Quoted 4 lines · In message <[email protected]>…
Quoted 4 lines
Quoted 3 lines

Prafulla Wadaskar (2):
Kirkwood: Upgated licencing for files imported from linux source to GPLv2 or later

Quoted 8 lines
Quoted 2 lines

I cannot find any patch with this subject anywhere. Can you please try and avoid to change the patch subjects?

Yes, the subject is changed, this is my mistake while sending pull request. Can you pls pull in http://lists.denx.de/pipermail/u-boot/2009-December/065799.html instead?

Or
Shall I generate new pull request for the same?

Sorry, but it is too late now. The code is already in mainline.

Best regards,

Wolfgang Denk

Signature · 4 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
"One planet is all you get."