Skip to contentSkip to conversation

Pull request: u-boot-arm/master

U-Boot Applied Albert ARIBAUD 3 participants 4 messages May 31, 2011 – Jun 1, 2011

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,

The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:

.gitignore: update list of u-boot.* files and add *.bin (2011-05-22
23:46:26 +0200)

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

Chander Kashyap (4):
S5P: GPIO Macro Values Corrected. S5P:SROM config code moved to s5p-common directory
ARMV7: Add support for Samsung SMDKV310 Board
ARMV7: MMC SPL Boot support for SMDKV310 board

David M?ller (ELSOFT AG) (5):
VCMA9: use ARM relocation feature to fix build error
SMDK2410: activate ARM relocation feature
SMDK2410: remove unneeded config.mk
SMDK2410: use the CFI driver (and remove the old one)
SMDK2410: various cleanup/code style fixes

Dirk Behme (2):
MMC S5P: Fix typo
ARMV7: Vexpress: Add missing MMC header

Fabio Estevam (6):
mx31pdk: Clean up mx31pdk.h file
MX53: Add initial support for MX53SMD board.
MX51: vision: Let video mode struct be independant of watchdog.
MX51: vision2: Fix build for vision2 board.
MX53: Handle silicon revision 2.1 case
MX53: Remove CONFIG_SYS_BOOTMAPSZ from mx53 config files.

Holger Brunck (2):
arm/km: add second serial interface for kirkwood arm/km: update mgcoge3un board support

Jaehoon Chung (1):
S5P: add set_mmc_clk for external clock control

Jason Kridner (1):
BeagleBoard: fixed typo in typecast

Jason Liu (2):
MX53: support for freescale MX53LOCO board
mx5: board: code clean up for checkboard code

Michael Walle (1):
mvsata: issue hard reset on initialization

Minkyu Kang (2):
S5PC2XX: Support the cpu revision
S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)

Shawn Guo (2):
mx5: Remove unnecessary CONFIG_SYS_BOOTMAPSZ definition
mx5: Fix CONFIG_OF_LIBFDT redefined warning

Stefano Babic (3):
MX31: Make get_reset_cause() static and drop unreachable code
MX5: drop config.mk from efikamx board
MX31: drop warnings due to missing prototype for mxc_watchdog_reset()

Valentin Longchamp (6):
arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file arm/km: introduce bootcount env variable and clean km_arm arm/km: disable ls (through jffs2 support)
arm/km: rename mgcoge2un to mgcoge3un
mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE

seedshope (1):
Add _end for the end of u-boot image for SMDK6400

  MAINTAINERS                                        |   12 +-
  Makefile                                           |   11 +
  arch/arm/cpu/arm1136/mx31/generic.c                |    6 +-
  arch/arm/cpu/armv7/mx5/soc.c                       |   10 +-
  arch/arm/cpu/armv7/s5p-common/Makefile             |    3 +-
  arch/arm/cpu/armv7/s5p-common/cpu_info.c           |    2 +
  arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/sromc.c |   22 +-
  arch/arm/cpu/armv7/s5pc1xx/Makefile                |    1 -
  arch/arm/cpu/armv7/s5pc1xx/clock.c                 |    5 +
  arch/arm/cpu/armv7/s5pc2xx/clock.c                 |   76 +++-
  arch/arm/include/asm/arch-mx31/clock.h             |    1 +
  arch/arm/include/asm/arch-s5pc1xx/clk.h            |    1 +
  arch/arm/include/asm/arch-s5pc1xx/gpio.h           |    4 +-
  arch/arm/include/asm/arch-s5pc1xx/mmc.h            |    1 +
  .../include/asm/arch-s5pc1xx/{smc.h => sromc.h}    |    8 +-
  arch/arm/include/asm/arch-s5pc2xx/clk.h            |    1 +
  arch/arm/include/asm/arch-s5pc2xx/cpu.h            |   12 +-
  arch/arm/include/asm/arch-s5pc2xx/gpio.h           |    7 +-
  arch/arm/include/asm/arch-s5pc2xx/mmc.h            |    1 +
  arch/arm/include/asm/arch-s5pc2xx/sromc.h          |   51 +++
  board/armltd/vexpress/ca9x4_ct_vxp.c               |    1 +
  board/efikamx/efikamx.c                            |   42 +--
  board/freescale/mx51evk/mx51evk.c                  |   36 +--
  board/freescale/mx53evk/mx53evk.c                  |   21 +-
  .../config.mk => freescale/mx53loco/Makefile}      |   36 ++-
  board/freescale/mx53loco/imximage.cfg              |   96 ++++
  board/freescale/mx53loco/mx53loco.c                |  302 +++++++++++++
  .../config.mk => freescale/mx53smd/Makefile}       |   35 ++-
  board/freescale/mx53smd/imximage.cfg               |   96 ++++
  board/freescale/mx53smd/mx53smd.c                  |  229 ++++++++++
  board/keymile/km_arm/km_arm.c                      |  108 ++++--
  board/keymile/km_arm/kwbimage-memphis.cfg          |  197 ++++++++
  board/samsung/smdk2410/Makefile                    |    2 +-
  board/samsung/smdk2410/config.mk                   |   25 -
  board/samsung/smdk2410/flash.c                     |  433 
------------------
  board/samsung/smdk2410/smdk2410.c                  |   73 ++--
  board/samsung/smdkc100/smdkc100.c                  |    4 +-
  .../config.mk => samsung/smdkv310/Makefile}        |   29 +-
  board/samsung/smdkv310/lowlevel_init.S             |  470 
++++++++++++++++++++
  board/samsung/smdkv310/mem_setup.S                 |  365 +++++++++++++++
  board/samsung/smdkv310/smdkv310.c                  |  136 ++++++
  board/ti/beagle/beagle.c                           |    2 +-
  board/ttcontrol/vision2/vision2.c                  |   47 +--
  boards.cfg                                         |    9 +-
  drivers/block/mvsata_ide.c                         |   10 +-
  drivers/mmc/s5p_mmc.c                              |    6 +-
  drivers/net/mvgbe.h                                |    2 +
  include/configs/VCMA9.h                            |    5 +
  include/configs/km/keymile-common.h                |    9 -
  include/configs/km/km_arm.h                        |   25 +
  include/configs/{mgcoge2un.h => mgcoge3un.h}       |   49 ++-
  include/configs/mx31pdk.h                          |   32 +-
  include/configs/mx51evk.h                          |    3 -
  include/configs/mx53evk.h                          |    3 -
  include/configs/mx53loco.h                         |  185 ++++++++
  include/configs/mx53smd.h                          |  191 ++++++++
  include/configs/smdk2410.h                         |  181 +++++---
  include/configs/smdkv310.h                         |  169 +++++++
  include/configs/suen3.h                            |   15 -
  include/configs/suen8.h                            |   15 -
  include/configs/vision2.h                          |    1 +
  mmc_spl/board/samsung/smdkv310/Makefile            |  105 +++++
  mmc_spl/board/samsung/smdkv310/mmc_boot.c          |   85 ++++
  .../board/samsung/smdkv310/tools/mkv310_image.c    |  116 +++++
  mmc_spl/board/samsung/smdkv310/u-boot.lds          |   86 ++++
  nand_spl/board/samsung/smdk6400/u-boot.lds         |    2 +
  66 files changed, 3447 insertions(+), 877 deletions(-)

rename arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/sromc.c (68%) rename arch/arm/include/asm/arch-s5pc1xx/{smc.h => sromc.h} (92%) create mode 100644 arch/arm/include/asm/arch-s5pc2xx/sromc.h copy board/{efikamx/config.mk => freescale/mx53loco/Makefile} (51%) create mode 100644 board/freescale/mx53loco/imximage.cfg create mode 100644 board/freescale/mx53loco/mx53loco.c rename board/{efikamx/config.mk => freescale/mx53smd/Makefile} (50%) create mode 100644 board/freescale/mx53smd/imximage.cfg create mode 100644 board/freescale/mx53smd/mx53smd.c create mode 100644 board/keymile/km_arm/kwbimage-memphis.cfg delete mode 100644 board/samsung/smdk2410/config.mk
delete mode 100644 board/samsung/smdk2410/flash.c
rename board/{ttcontrol/vision2/config.mk =>
samsung/smdkv310/Makefile} (58%)
create mode 100644 board/samsung/smdkv310/lowlevel_init.S create mode 100644 board/samsung/smdkv310/mem_setup.S create mode 100644 board/samsung/smdkv310/smdkv310.c rename include/configs/{mgcoge2un.h => mgcoge3un.h} (56%) create mode 100644 include/configs/mx53loco.h
create mode 100644 include/configs/mx53smd.h
create mode 100644 include/configs/smdkv310.h
create mode 100644 mmc_spl/board/samsung/smdkv310/Makefile create mode 100644 mmc_spl/board/samsung/smdkv310/mmc_boot.c create mode 100644 mmc_spl/board/samsung/smdkv310/tools/mkv310_image.c create mode 100644 mmc_spl/board/samsung/smdkv310/u-boot.lds

Amicalement,

Signature · 1 line
Albert.
#1 lore raw
Quoted 10 lines · Albert ARIBAUD

Hi Wolfgang,

The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:

? .gitignore: update list of u-boot.* files and add *.bin (2011-05-22 23:46:26 +0200)

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

Albert,

I see my U8500 patches have not been merged yet. Is there a chance they will be sometime merged?

ttp://patchwork.ozlabs.org/patch/92053/
http://patchwork.ozlabs.org/patch/92052/
http://patchwork.ozlabs.org/patch/92054/

Thanks,
John

#2 lore raw

Hi John,

Le 01/06/2011 00:29, John Rigby a ?crit :

Quoted 12 lines
Quoted 10 lines · Albert ARIBAUD

Hi Wolfgang,

The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:

.gitignore: update list of u-boot.* files and add *.bin (2011-05-22
23:46:26 +0200)

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

Quoted 8 lines

Albert,

I see my U8500 patches have not been merged yet. Is there a chance they will be sometime merged?

ttp://patchwork.ozlabs.org/patch/92053/
http://patchwork.ozlabs.org/patch/92052/
http://patchwork.ozlabs.org/patch/92054/

Pulling them in right now.

Quoted 2 lines

Thanks,
John

Amicalement,

Signature · 1 line
Albert.
#3 lore raw
In reply to Albert ARIBAUD

Dear Albert ARIBAUD,

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

Hi Wolfgang,

The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:

.gitignore: update list of u-boot.* files and add *.bin (2011-05-22
23:46:26 +0200)

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

Chander Kashyap (4):
S5P: GPIO Macro Values Corrected. S5P:SROM config code moved to s5p-common directory
ARMV7: Add support for Samsung SMDKV310 Board
ARMV7: MMC SPL Boot support for SMDKV310 board

David M?ller (ELSOFT AG) (5):
VCMA9: use ARM relocation feature to fix build error
SMDK2410: activate ARM relocation feature
SMDK2410: remove unneeded config.mk
SMDK2410: use the CFI driver (and remove the old one)
SMDK2410: various cleanup/code style fixes

Dirk Behme (2):
MMC S5P: Fix typo
ARMV7: Vexpress: Add missing MMC header

Fabio Estevam (6):
mx31pdk: Clean up mx31pdk.h file
MX53: Add initial support for MX53SMD board.
MX51: vision: Let video mode struct be independant of watchdog.
MX51: vision2: Fix build for vision2 board.
MX53: Handle silicon revision 2.1 case
MX53: Remove CONFIG_SYS_BOOTMAPSZ from mx53 config files.

Holger Brunck (2):
arm/km: add second serial interface for kirkwood arm/km: update mgcoge3un board support

Jaehoon Chung (1):
S5P: add set_mmc_clk for external clock control

Jason Kridner (1):
BeagleBoard: fixed typo in typecast

Jason Liu (2):
MX53: support for freescale MX53LOCO board
mx5: board: code clean up for checkboard code

Michael Walle (1):
mvsata: issue hard reset on initialization

Minkyu Kang (2):
S5PC2XX: Support the cpu revision
S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)

Shawn Guo (2):
mx5: Remove unnecessary CONFIG_SYS_BOOTMAPSZ definition
mx5: Fix CONFIG_OF_LIBFDT redefined warning

Stefano Babic (3):
MX31: Make get_reset_cause() static and drop unreachable code
MX5: drop config.mk from efikamx board
MX31: drop warnings due to missing prototype for mxc_watchdog_reset()

Valentin Longchamp (6):
arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file arm/km: introduce bootcount env variable and clean km_arm arm/km: disable ls (through jffs2 support)
arm/km: rename mgcoge2un to mgcoge3un
mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE

seedshope (1):
Add _end for the end of u-boot image for SMDK6400

  MAINTAINERS                                        |   12 +-
  Makefile                                           |   11 +
  arch/arm/cpu/arm1136/mx31/generic.c                |    6 +-
  arch/arm/cpu/armv7/mx5/soc.c                       |   10 +-
  arch/arm/cpu/armv7/s5p-common/Makefile             |    3 +-
  arch/arm/cpu/armv7/s5p-common/cpu_info.c           |    2 +
  arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/sromc.c |   22 +-
  arch/arm/cpu/armv7/s5pc1xx/Makefile                |    1 -
  arch/arm/cpu/armv7/s5pc1xx/clock.c                 |    5 +
  arch/arm/cpu/armv7/s5pc2xx/clock.c                 |   76 +++-
  arch/arm/include/asm/arch-mx31/clock.h             |    1 +
  arch/arm/include/asm/arch-s5pc1xx/clk.h            |    1 +
  arch/arm/include/asm/arch-s5pc1xx/gpio.h           |    4 +-
  arch/arm/include/asm/arch-s5pc1xx/mmc.h            |    1 +
  .../include/asm/arch-s5pc1xx/{smc.h => sromc.h}    |    8 +-
  arch/arm/include/asm/arch-s5pc2xx/clk.h            |    1 +
  arch/arm/include/asm/arch-s5pc2xx/cpu.h            |   12 +-
  arch/arm/include/asm/arch-s5pc2xx/gpio.h           |    7 +-
  arch/arm/include/asm/arch-s5pc2xx/mmc.h            |    1 +
  arch/arm/include/asm/arch-s5pc2xx/sromc.h          |   51 +++
  board/armltd/vexpress/ca9x4_ct_vxp.c               |    1 +
  board/efikamx/efikamx.c                            |   42 +--
  board/freescale/mx51evk/mx51evk.c                  |   36 +--
  board/freescale/mx53evk/mx53evk.c                  |   21 +-
  .../config.mk => freescale/mx53loco/Makefile}      |   36 ++-
  board/freescale/mx53loco/imximage.cfg              |   96 ++++
  board/freescale/mx53loco/mx53loco.c                |  302 +++++++++++++
  .../config.mk => freescale/mx53smd/Makefile}       |   35 ++-
  board/freescale/mx53smd/imximage.cfg               |   96 ++++
  board/freescale/mx53smd/mx53smd.c                  |  229 ++++++++++
  board/keymile/km_arm/km_arm.c                      |  108 ++++--
  board/keymile/km_arm/kwbimage-memphis.cfg          |  197 ++++++++
  board/samsung/smdk2410/Makefile                    |    2 +-
  board/samsung/smdk2410/config.mk                   |   25 -
  board/samsung/smdk2410/flash.c                     |  433 
------------------
  board/samsung/smdk2410/smdk2410.c                  |   73 ++--
  board/samsung/smdkc100/smdkc100.c                  |    4 +-
  .../config.mk => samsung/smdkv310/Makefile}        |   29 +-
  board/samsung/smdkv310/lowlevel_init.S             |  470 
++++++++++++++++++++
  board/samsung/smdkv310/mem_setup.S                 |  365 +++++++++++++++
  board/samsung/smdkv310/smdkv310.c                  |  136 ++++++
  board/ti/beagle/beagle.c                           |    2 +-
  board/ttcontrol/vision2/vision2.c                  |   47 +--
  boards.cfg                                         |    9 +-
  drivers/block/mvsata_ide.c                         |   10 +-
  drivers/mmc/s5p_mmc.c                              |    6 +-
  drivers/net/mvgbe.h                                |    2 +
  include/configs/VCMA9.h                            |    5 +
  include/configs/km/keymile-common.h                |    9 -
  include/configs/km/km_arm.h                        |   25 +
  include/configs/{mgcoge2un.h => mgcoge3un.h}       |   49 ++-
  include/configs/mx31pdk.h                          |   32 +-
  include/configs/mx51evk.h                          |    3 -
  include/configs/mx53evk.h                          |    3 -
  include/configs/mx53loco.h                         |  185 ++++++++
  include/configs/mx53smd.h                          |  191 ++++++++
  include/configs/smdk2410.h                         |  181 +++++---
  include/configs/smdkv310.h                         |  169 +++++++
  include/configs/suen3.h                            |   15 -
  include/configs/suen8.h                            |   15 -
  include/configs/vision2.h                          |    1 +
  mmc_spl/board/samsung/smdkv310/Makefile            |  105 +++++
  mmc_spl/board/samsung/smdkv310/mmc_boot.c          |   85 ++++
  .../board/samsung/smdkv310/tools/mkv310_image.c    |  116 +++++
  mmc_spl/board/samsung/smdkv310/u-boot.lds          |   86 ++++
  nand_spl/board/samsung/smdk6400/u-boot.lds         |    2 +
  66 files changed, 3447 insertions(+), 877 deletions(-)

rename arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/sromc.c (68%) rename arch/arm/include/asm/arch-s5pc1xx/{smc.h => sromc.h} (92%) create mode 100644 arch/arm/include/asm/arch-s5pc2xx/sromc.h copy board/{efikamx/config.mk => freescale/mx53loco/Makefile} (51%) create mode 100644 board/freescale/mx53loco/imximage.cfg create mode 100644 board/freescale/mx53loco/mx53loco.c rename board/{efikamx/config.mk => freescale/mx53smd/Makefile} (50%) create mode 100644 board/freescale/mx53smd/imximage.cfg create mode 100644 board/freescale/mx53smd/mx53smd.c create mode 100644 board/keymile/km_arm/kwbimage-memphis.cfg delete mode 100644 board/samsung/smdk2410/config.mk delete mode 100644 board/samsung/smdk2410/flash.c
rename board/{ttcontrol/vision2/config.mk =>
samsung/smdkv310/Makefile} (58%)
create mode 100644 board/samsung/smdkv310/lowlevel_init.S create mode 100644 board/samsung/smdkv310/mem_setup.S create mode 100644 board/samsung/smdkv310/smdkv310.c

Quoted 8 lines

rename include/configs/{mgcoge2un.h => mgcoge3un.h} (56%) create mode 100644 include/configs/mx53loco.h
create mode 100644 include/configs/mx53smd.h
create mode 100644 include/configs/smdkv310.h
create mode 100644 mmc_spl/board/samsung/smdkv310/Makefile create mode 100644 mmc_spl/board/samsung/smdkv310/mmc_boot.c create mode 100644 mmc_spl/board/samsung/smdkv310/tools/mkv310_image.c create mode 100644 mmc_spl/board/samsung/smdkv310/u-boot.lds

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
Wenn Du ein' weise Antwort verlangst, Mu?t Du vern?nftig fragen.
                                                -- Goethe, Invektiven