Patchwork [U-Boot] Please pull u-boot-samsung/master

login
register
mail settings
Submitter Minkyu Kang
Date March 25, 2011, 9:59 a.m.
Message ID <4D8C676F.8060800@samsung.com>
Download mbox
Permalink /patch/88357/
State Accepted
Headers show

Pull-request

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

Comments

Minkyu Kang - March 25, 2011, 9:59 a.m.
Dear Albert ARIBAUD,

I rebased u-boot-samsung/master.
Please pull.

The following changes since commit be7e8b604c88a2f85fbc25e383ba8fa83a5fe71c:

  Merge branch 'master' of git://git.denx.de/u-boot-arm into arm (2011-03-25 17:32:46 +0900)

are available in the git repository at:

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

Chander Kashyap (2):
      ARMV7: S5P: Fixed register offset in mmc.h
      S5P: mmc: Resolved interrupt error during mmc_init

Donghwa Lee (1):
      ARM: S5P: pwm driver support

Minkyu Kang (5):
      S5P: timer: Use pwm functions
      S5P: smdkc100: Enable the pwm driver
      S5P: goni: Enable the pwm driver
      S5P: universal: Enable the pwm driver
      S5P: timer: replace bss variable by gd

seedshope (6):
      SMDK6400: Fix CONFIG_SYS_INIT_SP_ADDR undefined
      SMDK6400: Fix some label undefined in build error
      SMDK6400: Fix the mutiple link error
      SMDK6400: Add some labels to u-boot.lds to support nand_spl
      SMDK6400: Disable LED function in start.s on the nand booting
      SMDK6400: Fixup dram_init for relocation support

 arch/arm/cpu/arm1176/start.S               |    2 +
 arch/arm/cpu/armv7/s5p-common/Makefile     |    1 +
 arch/arm/cpu/armv7/s5p-common/pwm.c        |  189 ++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/s5p-common/timer.c      |   76 +++---------
 arch/arm/include/asm/arch-s5pc1xx/mmc.h    |    5 +-
 arch/arm/include/asm/arch-s5pc1xx/pwm.h    |   23 +++-
 arch/arm/include/asm/arch-s5pc2xx/mmc.h    |    5 +-
 arch/arm/include/asm/arch-s5pc2xx/pwm.h    |   23 +++-
 board/samsung/smdk6400/smdk6400.c          |    8 +-
 board/samsung/smdk6400/u-boot-nand.lds     |   28 ++++-
 drivers/mmc/s5p_mmc.c                      |    2 +-
 include/configs/s5p_goni.h                 |    3 +
 include/configs/s5pc210_universal.h        |    3 +
 include/configs/smdk6400.h                 |    5 +
 include/configs/smdkc100.h                 |    3 +
 include/pwm.h                              |   31 +++++
 nand_spl/board/samsung/smdk6400/u-boot.lds |   17 +++-
 17 files changed, 344 insertions(+), 80 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/s5p-common/pwm.c
 create mode 100644 include/pwm.h
Albert ARIBAUD - March 26, 2011, 2:59 p.m.
Hi Minkyu Kang,

Le 25/03/2011 10:59, Minkyu Kang a écrit :
> Dear Albert ARIBAUD,
>
> I rebased u-boot-samsung/master.
> Please pull.
>
> The following changes since commit be7e8b604c88a2f85fbc25e383ba8fa83a5fe71c:
>
>    Merge branch 'master' of git://git.denx.de/u-boot-arm into arm (2011-03-25 17:32:46 +0900)
>
> are available in the git repository at:
>
>    git://git.denx.de/u-boot-samsung master

Applied, thanks.

Amicalement,