Skip to contentSkip to conversation

Pull request: u-boot-arm (master + next)

U-Boot Wolfgang Denk 3 participants 7 messages Nov 30, 2010 – Dec 1, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit d0d2271f8c62e830ec65fb069b6d12dd708e3e2f:

Prepare v2010.12-rc2 (2010-11-28 19:48:11 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Dirk Behme (4):
OMAP4: SDP4430: Disable CMD_NFS
OMAP3: SDP3430: Fix ARM relocation support
OMAP3: Zoom1: Fix ARM relocation support
OMAP3: Zoom2: Fix ARM relocation support

Enric Balletbo i Serra (1):
ARMV7: OMAP3: Fix build failure for igep0030 machine

Minkyu Kang (6):
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
S5P: smdkc100: fix for relocation
S5P: goni: fix for relocation
ARMV7: S5P: timer: get the count_value from register when call udelay

Sanjeev Premi (1):
omap3evm: Use GENERATED_GBL_DATA_SIZE

Vaibhav Hiremath (3):
AM3517:Fix for ARM Relocation support AM3517:Build FIX: undef CONFIG_CMD_NFS support AM3517:EMIF4: fix SDRAM size to 256Mb

Wolfgang Denk (1):
Merge branch 'master' of git://git.denx.de/u-boot-samsung

 arch/arm/cpu/armv7/omap3/emif4.c      |    5 +++--
 arch/arm/cpu/armv7/s5p-common/timer.c |   18 +++++++++---------
 board/logicpd/am3517evm/config.mk     |    2 +-
 board/logicpd/zoom1/config.mk         |    2 +-
 board/logicpd/zoom2/config.mk         |    2 +-
 board/samsung/goni/goni.c             |   10 ++++++++--
 board/samsung/smdkc100/smdkc100.c     |   10 +++++++---
 board/ti/sdp3430/config.mk            |    2 +-
 include/configs/am3517_evm.h          |    7 +++++++
 include/configs/igep0030.h            |    1 +
 include/configs/omap3_evm.h           |    6 +++++-
 include/configs/omap3_sdp3430.h       |    6 ++++++
 include/configs/omap3_zoom1.h         |    6 ++++++
 include/configs/omap3_zoom2.h         |    6 ++++++
 include/configs/omap4_sdp4430.h       |    1 +
 include/configs/s5p_goni.h            |    2 ++
 include/configs/smdkc100.h            |    2 ++
 17 files changed, 67 insertions(+), 21 deletions(-)

The following changes since commit c87f6457bb9cb465e9630b00b4c824847a62c6c5:

ext2: constify file/dir names (2010-11-28 21:58:51 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git next

Stefano Babic (3):
da850: Enable SPI Flash
Davinci 8xx: Move common functions to share code
Davinci: add support for the ea20 board

Sudhakar Rajashekhara (2):
da8xx: Add cpu_is_da8xx macros
da850: Add RMII support for EMAC

Sughosh Ganu (3):
Move and rename common headers from under Remove board_init_f function from nand_boot.c Add board support for hawkboard

 MAINTAINERS                                        |    6 +
 .../arm/include/asm/arch-davinci/davinci_misc.h    |   15 ++
 arch/arm/include/asm/arch-davinci/hardware.h       |   37 ++++-
 board/davinci/common/Makefile                      |    2 +-
 board/davinci/common/davinci_pinmux.c              |  105 ++++++++++
 board/davinci/common/misc.c                        |   99 ++++------
 board/davinci/da8xxevm/Makefile                    |    2 +-
 board/davinci/da8xxevm/common.c                    |   55 ------
 board/davinci/da8xxevm/common.h                    |   30 ---
 board/davinci/da8xxevm/da830evm.c                  |    3 +-
 board/davinci/da8xxevm/da850evm.c                  |  115 +++++++++++-
 board/davinci/da8xxevm/hawkboard.c                 |   68 +++++++
 board/davinci/da8xxevm/hawkboard_nand_spl.c        |  157 +++++++++++++++
 board/davinci/dm355evm/dm355evm.c                  |    2 +-
 board/davinci/dm355leopard/dm355leopard.c          |    2 +-
 board/davinci/dm365evm/dm365evm.c                  |    2 +-
 board/davinci/dvevm/dvevm.c                        |    2 +-
 board/davinci/ea20/Makefile                        |   53 +++++
 board/davinci/ea20/ea20.c                          |  196 +++++++++++++++++++
 board/davinci/schmoogie/schmoogie.c                |    2 +-
 board/davinci/sffsdr/sffsdr.c                      |    2 +-
 board/davinci/sonata/sonata.c                      |    2 +-
 board/samsung/smdk6400/smdk6400_nand_spl.c         |   37 ++++
 boards.cfg                                         |    4 +
 doc/README.hawkboard                               |   93 +++++++++
 drivers/net/davinci_emac.c                         |   41 ++++-
 include/configs/da850evm.h                         |   29 +++
 include/configs/ea20.h                             |  192 ++++++++++++++++++
 include/configs/hawkboard.h                        |  206 ++++++++++++++++++++
 nand_spl/board/davinci/da8xxevm/Makefile           |  141 +++++++++++++
 nand_spl/board/davinci/da8xxevm/u-boot.lds         |   75 +++++++
 nand_spl/board/samsung/smdk6400/Makefile           |    6 +-
 nand_spl/nand_boot.c                               |    9 +-
 33 files changed, 1615 insertions(+), 175 deletions(-)
 rename board/davinci/common/misc.h => arch/arm/include/asm/arch-davinci/davinci_misc.h (80%)
 create mode 100644 board/davinci/common/davinci_pinmux.c
 delete mode 100644 board/davinci/da8xxevm/common.c
 delete mode 100644 board/davinci/da8xxevm/common.h
 create mode 100644 board/davinci/da8xxevm/hawkboard.c
 create mode 100644 board/davinci/da8xxevm/hawkboard_nand_spl.c
 create mode 100644 board/davinci/ea20/Makefile
 create mode 100644 board/davinci/ea20/ea20.c
 create mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c
 create mode 100644 doc/README.hawkboard
 create mode 100644 include/configs/ea20.h
 create mode 100644 include/configs/hawkboard.h
 create mode 100644 nand_spl/board/davinci/da8xxevm/Makefile
 create mode 100644 nand_spl/board/davinci/da8xxevm/u-boot.lds

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
Of all the things I've lost, I miss my mind the most.
#1 lore raw

Dear Wolfgang Denk,

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

The following changes since commit d0d2271f8c62e830ec65fb069b6d12dd708e3e2f:

Prepare v2010.12-rc2 (2010-11-28 19:48:11 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Dirk Behme (4):
OMAP4: SDP4430: Disable CMD_NFS
OMAP3: SDP3430: Fix ARM relocation support
OMAP3: Zoom1: Fix ARM relocation support
OMAP3: Zoom2: Fix ARM relocation support

Enric Balletbo i Serra (1):
ARMV7: OMAP3: Fix build failure for igep0030 machine

Minkyu Kang (6):
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
S5P: smdkc100: fix for relocation
S5P: goni: fix for relocation
ARMV7: S5P: timer: get the count_value from register when call udelay

Sanjeev Premi (1):
omap3evm: Use GENERATED_GBL_DATA_SIZE

Vaibhav Hiremath (3):
AM3517:Fix for ARM Relocation support AM3517:Build FIX: undef CONFIG_CMD_NFS support AM3517:EMIF4: fix SDRAM size to 256Mb

Wolfgang Denk (1):
Merge branch 'master' of git://git.denx.de/u-boot-samsung

 arch/arm/cpu/armv7/omap3/emif4.c      |    5 +++--
 arch/arm/cpu/armv7/s5p-common/timer.c |   18 +++++++++---------
 board/logicpd/am3517evm/config.mk     |    2 +-
 board/logicpd/zoom1/config.mk         |    2 +-
 board/logicpd/zoom2/config.mk         |    2 +-
 board/samsung/goni/goni.c             |   10 ++++++++--
 board/samsung/smdkc100/smdkc100.c     |   10 +++++++---
 board/ti/sdp3430/config.mk            |    2 +-
 include/configs/am3517_evm.h          |    7 +++++++
 include/configs/igep0030.h            |    1 +
 include/configs/omap3_evm.h           |    6 +++++-
 include/configs/omap3_sdp3430.h       |    6 ++++++
 include/configs/omap3_zoom1.h         |    6 ++++++
 include/configs/omap3_zoom2.h         |    6 ++++++
 include/configs/omap4_sdp4430.h       |    1 +
 include/configs/s5p_goni.h            |    2 ++
 include/configs/smdkc100.h            |    2 ++
 17 files changed, 67 insertions(+), 21 deletions(-)

The following changes since commit c87f6457bb9cb465e9630b00b4c824847a62c6c5:

ext2: constify file/dir names (2010-11-28 21:58:51 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git next

Stefano Babic (3):
da850: Enable SPI Flash
Davinci 8xx: Move common functions to share code
Davinci: add support for the ea20 board

Sudhakar Rajashekhara (2):
da8xx: Add cpu_is_da8xx macros
da850: Add RMII support for EMAC

Sughosh Ganu (3):
Move and rename common headers from under Remove board_init_f function from nand_boot.c Add board support for hawkboard

 MAINTAINERS                                        |    6 +
 .../arm/include/asm/arch-davinci/davinci_misc.h    |   15 ++
 arch/arm/include/asm/arch-davinci/hardware.h       |   37 ++++-
 board/davinci/common/Makefile                      |    2 +-
 board/davinci/common/davinci_pinmux.c              |  105 ++++++++++
 board/davinci/common/misc.c                        |   99 ++++------
 board/davinci/da8xxevm/Makefile                    |    2 +-
 board/davinci/da8xxevm/common.c                    |   55 ------
 board/davinci/da8xxevm/common.h                    |   30 ---
 board/davinci/da8xxevm/da830evm.c                  |    3 +-
 board/davinci/da8xxevm/da850evm.c                  |  115 +++++++++++-
 board/davinci/da8xxevm/hawkboard.c                 |   68 +++++++
 board/davinci/da8xxevm/hawkboard_nand_spl.c        |  157 +++++++++++++++
 board/davinci/dm355evm/dm355evm.c                  |    2 +-
 board/davinci/dm355leopard/dm355leopard.c          |    2 +-
 board/davinci/dm365evm/dm365evm.c                  |    2 +-
 board/davinci/dvevm/dvevm.c                        |    2 +-
 board/davinci/ea20/Makefile                        |   53 +++++
 board/davinci/ea20/ea20.c                          |  196 +++++++++++++++++++
 board/davinci/schmoogie/schmoogie.c                |    2 +-
 board/davinci/sffsdr/sffsdr.c                      |    2 +-
 board/davinci/sonata/sonata.c                      |    2 +-
 board/samsung/smdk6400/smdk6400_nand_spl.c         |   37 ++++
 boards.cfg                                         |    4 +
 doc/README.hawkboard                               |   93 +++++++++
 drivers/net/davinci_emac.c                         |   41 ++++-
 include/configs/da850evm.h                         |   29 +++
 include/configs/ea20.h                             |  192 ++++++++++++++++++
 include/configs/hawkboard.h                        |  206 ++++++++++++++++++++
 nand_spl/board/davinci/da8xxevm/Makefile           |  141 +++++++++++++
 nand_spl/board/davinci/da8xxevm/u-boot.lds         |   75 +++++++
 nand_spl/board/samsung/smdk6400/Makefile           |    6 +-
 nand_spl/nand_boot.c                               |    9 +-
 33 files changed, 1615 insertions(+), 175 deletions(-)
 rename board/davinci/common/misc.h => arch/arm/include/asm/arch-davinci/davinci_misc.h (80%)
 create mode 100644 board/davinci/common/davinci_pinmux.c
 delete mode 100644 board/davinci/da8xxevm/common.c
 delete mode 100644 board/davinci/da8xxevm/common.h
 create mode 100644 board/davinci/da8xxevm/hawkboard.c
 create mode 100644 board/davinci/da8xxevm/hawkboard_nand_spl.c
Quoted 8 lines
 create mode 100644 board/davinci/ea20/Makefile
 create mode 100644 board/davinci/ea20/ea20.c
 create mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c
 create mode 100644 doc/README.hawkboard
 create mode 100644 include/configs/ea20.h
 create mode 100644 include/configs/hawkboard.h
 create mode 100644 nand_spl/board/davinci/da8xxevm/Makefile
 create mode 100644 nand_spl/board/davinci/da8xxevm/u-boot.lds

Both applied.

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
I usually tell my classes "if you are using @ and [] together in this
class, you will almost certainly NOT get what you want. That's  going
down  the wrong tunnel. There's no cheese at the end of that tunnel."
         -- Randal L. Schwartz in <[email protected]>
#2 lore raw
In reply to Wolfgang Denk
Quoted 32 lines

The following changes since commit
d0d2271f8c62e830ec65fb069b6d12dd708e3e2f:

Prepare v2010.12-rc2 (2010-11-28 19:48:11 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Dirk Behme (4):
OMAP4: SDP4430: Disable CMD_NFS
OMAP3: SDP3430: Fix ARM relocation support
OMAP3: Zoom1: Fix ARM relocation support
OMAP3: Zoom2: Fix ARM relocation support

Enric Balletbo i Serra (1):
ARMV7: OMAP3: Fix build failure for igep0030 machine

Minkyu Kang (6):
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
S5P: smdkc100: fix for relocation
S5P: goni: fix for relocation
ARMV7: S5P: timer: get the count_value from register when call
udelay

Sanjeev Premi (1):
omap3evm: Use GENERATED_GBL_DATA_SIZE

Quoted 8 lines

Vaibhav Hiremath (3):
AM3517:Fix for ARM Relocation support AM3517:Build FIX: undef CONFIG_CMD_NFS support AM3517:EMIF4: fix SDRAM size to 256Mb

Wolfgang Denk (1):
Merge branch 'master' of git://git.denx.de/u-boot-samsung

Wolfgang,

I've had a long day but I see that you have updated the next tree but it appears that the master has not been updated.

Am I missing something?

Regards,
Sandeep

#3 lore raw

Dear "Paulraj, Sandeep",

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

...

Quoted 2 lines

I've had a long day but I see that you have updated the next tree but it ap= pears that the master has not been updated.

Sorry, fixed.

Quoted 1 line

Am I missing something?

No, this was my fault. Sorry.

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
If you fail to plan, plan to fail.
#4 lore raw
Quoted 11 lines

Sorry, fixed.

Quoted 1 line

Am I missing something?

No, this was my fault. Sorry.

Best regards,

Wolfgang Denk

Thanks,

I'll re base and send some more patches to unbreak some of the ARM boards.

--Sandeep

#6 lore raw

Dear Dirk Behme,

Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 4 lines · Wolfgang Denk

The following changes since commit d0d2271f8c62e830ec65fb069b6d12dd708e3e2f:

   Prepare v2010.12-rc2 (2010-11-28 19:48:11 +0100)

...

Quoted 7 lines

Anybody likes to apply

http://lists.denx.de/pipermail/u-boot/2010-November/081033.html
http://lists.denx.de/pipermail/u-boot/2010-November/081034.html
http://lists.denx.de/pipermail/u-boot/2010-November/082654.html

too? This will fix the build of ca9x4_ct_vxp.

I will take these.

Note that for me a link to the respective patchwork entries would be more useful.

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
No problem is insoluble.
	-- Dr. Janet Wallace, "The Deadly Years", stardate 3479.4