Skip to contentSkip to conversation

Pull request: u-boot-arm

U-Boot Applied Wolfgang Denk 2 participants 4 messages Nov 17, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0:

Merge branch 'master' of /home/wd/git/u-boot/master (2010-11-12 22:24:06 +0100)

are available in the git repository at:

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

Alagu Sankar (1):
mmc: Add multi-block read support to the generic mmc driver

Albert Aribaud (2):
ARM: fix linker file for newer ld support
tx25: fix linker file for newer ld support

Enric Balletbo i Serra (2):
ARMV7: OMAP3: Use generic mmc driver on IGEP v2
ARMV7: OMAP3: Use generic mmc driver on OMAP3 IGEP module

Heiko Schocher (1):
armv7, beagle: Second SDRAM bank don;t work

Koen Kooi (1):
ARMV7: OMAP3: Add expansion board detection for Beagle

Reinhard Meyer (2):
AT91: add 2nd SPI to 9260/9XE/9G20
AT91: add header file for the Shutdown Controller

Sanjeev Premi (3):
omap3evm: Support relocation
omap3evm: Wrap function under CONFIG_USB_OMAP3
omap3evm: Fix mechanism to identify board revision

Steve Sakoman (5):
ARMV7: OMAP3: IGEP: Rename TEXT_BASE
ARMV7: Fix build for non-OMAP3 boards
ARMV7: OMAP3: Add expansion board detection for Overo
ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE
mmc: Clean up generic mmc driver multi-block write functions

Wolfgang Denk (2):
Merge branch 'at91' of git://git.denx.de/u-boot-atmel
Merge branch 'master' of git://git.denx.de/u-boot-ti

 arch/arm/cpu/arm1136/start.S                 |   16 ---
 arch/arm/cpu/arm1136/u-boot.lds              |   38 ++++---
 arch/arm/cpu/arm1176/u-boot.lds              |   37 +++----
 arch/arm/cpu/arm926ejs/u-boot.lds            |   30 +++--
 arch/arm/cpu/armv7/omap3/sdrc.c              |    7 ++
 arch/arm/cpu/armv7/start.S                   |   24 ----
 arch/arm/cpu/armv7/u-boot.lds                |   46 +++++----
 arch/arm/cpu/pxa/u-boot.lds                  |   35 ++++--
 arch/arm/include/asm/arch-at91/at91_shdwn.h  |   38 +++++++
 arch/arm/include/asm/arch-at91/at91sam9260.h |    1 +
 arch/arm/include/asm/arch-at91/hardware.h    |    1 +
 arch/arm/include/asm/arch-at91/memory-map.h  |    1 +
 arch/arm/lib/cache.c                         |    2 +-
 board/isee/igep0020/config.mk                |    2 +-
 board/isee/igep0020/igep0020.c               |    9 ++
 board/isee/igep0030/config.mk                |    3 +-
 board/isee/igep0030/igep0030.c               |    9 ++
 board/overo/overo.c                          |  115 ++++++++++++++++++++
 board/overo/overo.h                          |    4 +
 board/ti/beagle/beagle.c                     |   95 ++++++++++++++++
 board/ti/beagle/beagle.h                     |   46 ++++++++-
 board/ti/evm/config.mk                       |    2 +-
 board/ti/evm/evm.c                           |   24 ++++-
 board/ti/evm/evm.h                           |    2 +
 drivers/mmc/mmc.c                            |  148 +++++++++----------------
 include/configs/igep0020.h                   |    9 ++-
 include/configs/igep0030.h                   |    9 ++-
 include/configs/omap3_beagle.h               |    8 +-
 include/configs/omap3_evm.h                  |   11 ++
 include/configs/omap3_overo.h                |    7 +-
 include/configs/omap4_panda.h                |    6 +-
 include/configs/omap4_sdp4430.h              |    6 +-
 nand_spl/board/karo/tx25/u-boot.lds          |   40 ++++----
 33 files changed, 576 insertions(+), 255 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-at91/at91_shdwn.h

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
######## This message was made from 100% recycled electrons. ########
author Applied
#1 lore raw

Dear Wolfgang Denk,

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

The following changes since commit d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0:

Merge branch 'master' of /home/wd/git/u-boot/master (2010-11-12 22:24:06 +0100)

are available in the git repository at:

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

Alagu Sankar (1):
mmc: Add multi-block read support to the generic mmc driver

Albert Aribaud (2):
ARM: fix linker file for newer ld support
tx25: fix linker file for newer ld support

Enric Balletbo i Serra (2):
ARMV7: OMAP3: Use generic mmc driver on IGEP v2
ARMV7: OMAP3: Use generic mmc driver on OMAP3 IGEP module

Heiko Schocher (1):
armv7, beagle: Second SDRAM bank don;t work

Koen Kooi (1):
ARMV7: OMAP3: Add expansion board detection for Beagle

Reinhard Meyer (2):
AT91: add 2nd SPI to 9260/9XE/9G20
AT91: add header file for the Shutdown Controller

Sanjeev Premi (3):
omap3evm: Support relocation
omap3evm: Wrap function under CONFIG_USB_OMAP3
omap3evm: Fix mechanism to identify board revision

Steve Sakoman (5):
ARMV7: OMAP3: IGEP: Rename TEXT_BASE
ARMV7: Fix build for non-OMAP3 boards
ARMV7: OMAP3: Add expansion board detection for Overo
ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE
mmc: Clean up generic mmc driver multi-block write functions

Wolfgang Denk (2):
Merge branch 'at91' of git://git.denx.de/u-boot-atmel
Merge branch 'master' of git://git.denx.de/u-boot-ti

 arch/arm/cpu/arm1136/start.S                 |   16 ---
 arch/arm/cpu/arm1136/u-boot.lds              |   38 ++++---
 arch/arm/cpu/arm1176/u-boot.lds              |   37 +++----
 arch/arm/cpu/arm926ejs/u-boot.lds            |   30 +++--
 arch/arm/cpu/armv7/omap3/sdrc.c              |    7 ++
 arch/arm/cpu/armv7/start.S                   |   24 ----
 arch/arm/cpu/armv7/u-boot.lds                |   46 +++++----
 arch/arm/cpu/pxa/u-boot.lds                  |   35 ++++--
 arch/arm/include/asm/arch-at91/at91_shdwn.h  |   38 +++++++
 arch/arm/include/asm/arch-at91/at91sam9260.h |    1 +
 arch/arm/include/asm/arch-at91/hardware.h    |    1 +
 arch/arm/include/asm/arch-at91/memory-map.h  |    1 +
 arch/arm/lib/cache.c                         |    2 +-
 board/isee/igep0020/config.mk                |    2 +-
 board/isee/igep0020/igep0020.c               |    9 ++
 board/isee/igep0030/config.mk                |    3 +-
 board/isee/igep0030/igep0030.c               |    9 ++
 board/overo/overo.c                          |  115 ++++++++++++++++++++
 board/overo/overo.h                          |    4 +
 board/ti/beagle/beagle.c                     |   95 ++++++++++++++++
 board/ti/beagle/beagle.h                     |   46 ++++++++-
 board/ti/evm/config.mk                       |    2 +-
 board/ti/evm/evm.c                           |   24 ++++-
 board/ti/evm/evm.h                           |    2 +
 drivers/mmc/mmc.c                            |  148 +++++++++----------------
 include/configs/igep0020.h                   |    9 ++-
 include/configs/igep0030.h                   |    9 ++-
Quoted 8 lines
 include/configs/omap3_beagle.h               |    8 +-
 include/configs/omap3_evm.h                  |   11 ++
 include/configs/omap3_overo.h                |    7 +-
 include/configs/omap4_panda.h                |    6 +-
 include/configs/omap4_sdp4430.h              |    6 +-
 nand_spl/board/karo/tx25/u-boot.lds          |   40 ++++----
 33 files changed, 576 insertions(+), 255 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-at91/at91_shdwn.h

Applied.

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
"The whole world is about three drinks behind."     - Humphrey Bogart
#2 lore raw
In reply to Wolfgang Denk

Hey

Quoted 4 lines · Wolfgang Denk

Sanjeev Premi (3):
omap3evm: Support relocation
omap3evm: Wrap function under CONFIG_USB_OMAP3
omap3evm: Fix mechanism to identify board revision

I was expecting this would fix the build of omap3_evm, but it still
fails for me:
http://hudson.dooz.org/job/u-boot_master/BOARD=omap3_evm/39/console
make[1]: Entering directory `/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/arch/arm/cpu/armv7'
arm-linux-gnueabi-gcc -D__ASSEMBLY__ -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/arm-linux-gnueabi/4.4.5/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 \
-o start.o start.S -c
start.S: Assembler messages:
start.S:144: Error: constant expression expected -- `ldr sp,=((0x4020FFFC-CONFIG_SYS_GBL_DATA_SIZE))' make[1]: *** [start.o] Error 1
make[1]: Leaving directory `/srv/hudson.dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/arch/arm/cpu/armv7'

Thanks,

Signature · 1 line
Lo?c Minier
#3 lore raw

Dear =?iso-8859-1?Q?Lo=EFc?= Minier,

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

Hey

Quoted 4 lines · Wolfgang Denk

Sanjeev Premi (3):
omap3evm: Support relocation
omap3evm: Wrap function under CONFIG_USB_OMAP3
omap3evm: Fix mechanism to identify board revision

I was expecting this would fix the build of omap3_evm, but it still fails for me:
http://hudson.dooz.org/job/u-boot_master/BOARD=3Domap3_evm/39/console
make[1]: Entering directory `/srv/hudson.dooz.org/home/jobs/u-boot_master/w= orkspace/BOARD/omap3_evm/arch/arm/cpu/armv7'
arm-linux-gnueabi-gcc -D__ASSEMBLY__ -g -Os -fno-common -ffixed-r8 -ms=
oft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=3D0x80008000 -I/srv/hudson.=
dooz.org/home/jobs/u-boot_master/workspace/BOARD/omap3_evm/include -fno-bui= ltin -ffreestanding -nostdinc -isystem /usr/lib/gcc/arm-linux-gnueabi/4.4.5= /include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=3Daapcs-linux -mno-thum=

Quoted 8 lines

b-interwork -march=3Darmv5 \
-o start.o start.S -c
start.S: Assembler messages:
start.S:144: Error: constant expression expected -- `ldr sp,=3D((0x4020FFFC= -CONFIG_SYS_GBL_DATA_SIZE))'
make[1]: *** [start.o] Error 1
make[1]: Leaving directory `/srv/hudson.dooz.org/home/jobs/u-boot_master/wo= rkspace/BOARD/omap3_evm/arch/arm/cpu/armv7'

CONFIG_SYS_GBL_DATA_SIZE does not exist any more; it now gets auto-generated. Seems there are a few boards out there that escaped the change:

	-> find * -type f | xargs egrep -l CONFIG_SYS_GBL_DATA_SIZE
	include/configs/io.h
	include/configs/devkit8000.h
	include/configs/omap3_evm.h
	include/configs/iocon.h

Patches welcome.

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
"To take a significant step forward, you must make a series of finite
improvements." - Donald J. Atwood, General Motors