Skip to contentSkip to conversation

Please pull u-boot-samsung/master

U-Boot Applied Minkyu Kang 3 participants 5 messages Mar 5, 2010 – Mar 13, 2010

lore
Share & tools
lore
#0 lore raw

Dear Tom,

The following changes since commit f687ebf82dbe44dcde5901232ade4f19ecedbf58:
Minkyu Kang (1):
Merge branch 'master' of git://git.denx.de/u-boot-arm

are available in the git repository at:

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

Joonyoung Shim (1):
s3c64xx: Add ifdef at the S3C64XX only codes

Minkyu Kang (2):
s5pc1xx: support the GPIO interface
Merge branch 'master' of git://git.denx.de/u-boot-samsung

Naveen Krishna CH (4):
S5PC100: Moves the Macros to a common header file
S5PC100: Memory SubSystem Header file, register description(SROMC).
S5PC100: Function to configure the SROMC registers.
SAMSUNG: SMDKC100: Adds ethernet support.

 board/samsung/smdkc100/smdkc100.c   |   39 ++++++++++
 cpu/arm1176/cpu.c                   |    2 +
 cpu/arm1176/start.S                 |    4 +
 cpu/arm_cortexa8/s5pc1xx/Makefile   |    2 +
 cpu/arm_cortexa8/s5pc1xx/clock.c    |    7 +--
 cpu/arm_cortexa8/s5pc1xx/gpio.c     |  143 +++++++++++++++++++++++++++++++++++
 cpu/arm_cortexa8/s5pc1xx/sromc.c    |   53 +++++++++++++
 doc/README.s5pc1xx                  |   18 ++++-
 include/asm-arm/arch-s5pc1xx/clk.h  |    6 ++
 include/asm-arm/arch-s5pc1xx/gpio.h |   29 +++++++
 include/asm-arm/arch-s5pc1xx/smc.h  |   53 +++++++++++++
 include/configs/smdkc100.h          |   12 +++-
 12 files changed, 360 insertions(+), 8 deletions(-)
 create mode 100644 cpu/arm_cortexa8/s5pc1xx/gpio.c
 create mode 100644 cpu/arm_cortexa8/s5pc1xx/sromc.c
 create mode 100644 include/asm-arm/arch-s5pc1xx/smc.h
#1 lore raw
Quoted 8 lines · Minkyu Kang

Dear Tom,

The following changes since commit f687ebf82dbe44dcde5901232ade4f19ecedbf58:
Minkyu Kang (1):
Merge branch 'master' of git://git.denx.de/u-boot-arm

are available in the git repository at:

Quoted 8 lines

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

Joonyoung Shim (1):
s3c64xx: Add ifdef at the S3C64XX only codes

Minkyu Kang (2):
s5pc1xx: support the GPIO interface
Merge branch 'master' of git://git.denx.de/u-boot-samsung

It would be best if merges were not part of a pull request. It makes reviewing the patches difficult.

For this pull request, I believe these are the commits that you intend to go in

2167f2715e127591ed2abcea075ce89bbbf68864
3e5d177133a7063cdd000b55b26c696861d44235
8f5407c90d3738c3a3c4caca442bc8441cc76f6d

Quoted 3 lines
Quoted 3 lines

3806459949c80432557d74e0c7731030de838e49
5a5aaad81edf5d522e38000d00708dd0a1470151
95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b

04a3e2e8e554007d2774b6ad0ab302a491ba41bf
aac90e231157a34358134a1fb7b1221032db9e1a
a8d25fc26f681a9c4dfb062ebb4b00b9509a7966

Of these, I believe

Quoted 3 lines
Quoted 3 lines

3806459949c80432557d74e0c7731030de838e49
5a5aaad81edf5d522e38000d00708dd0a1470151
95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b

Are the merge.

Are these 9 commits correct?

Best Regards,
Tom

Quoted 23 lines

Naveen Krishna CH (4):
S5PC100: Moves the Macros to a common header file
S5PC100: Memory SubSystem Header file, register description(SROMC).
S5PC100: Function to configure the SROMC registers.
SAMSUNG: SMDKC100: Adds ethernet support.

 board/samsung/smdkc100/smdkc100.c   |   39 ++++++++++
 cpu/arm1176/cpu.c                   |    2 +
 cpu/arm1176/start.S                 |    4 +
 cpu/arm_cortexa8/s5pc1xx/Makefile   |    2 +
 cpu/arm_cortexa8/s5pc1xx/clock.c    |    7 +--
 cpu/arm_cortexa8/s5pc1xx/gpio.c     |  143 +++++++++++++++++++++++++++++++++++
 cpu/arm_cortexa8/s5pc1xx/sromc.c    |   53 +++++++++++++
 doc/README.s5pc1xx                  |   18 ++++-
 include/asm-arm/arch-s5pc1xx/clk.h  |    6 ++
 include/asm-arm/arch-s5pc1xx/gpio.h |   29 +++++++
 include/asm-arm/arch-s5pc1xx/smc.h  |   53 +++++++++++++
 include/configs/smdkc100.h          |   12 +++-
 12 files changed, 360 insertions(+), 8 deletions(-)
 create mode 100644 cpu/arm_cortexa8/s5pc1xx/gpio.c
 create mode 100644 cpu/arm_cortexa8/s5pc1xx/sromc.c
 create mode 100644 include/asm-arm/arch-s5pc1xx/smc.h
#2 lore raw

Dear Tom,

Quoted 38 lines · Tom
Quoted 8 lines · Minkyu Kang

Dear Tom,

The following changes since commit f687ebf82dbe44dcde5901232ade4f19ecedbf58:
? Minkyu Kang (1):
? ? ? ? Merge branch 'master' of git://git.denx.de/u-boot-arm

are available in the git repository at:

Quoted 8 lines

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

Joonyoung Shim (1):
? ? ? s3c64xx: Add ifdef at the S3C64XX only codes

Minkyu Kang (2):
? ? ? s5pc1xx: support the GPIO interface
? ? ? Merge branch 'master' of git://git.denx.de/u-boot-samsung

It would be best if merges were not part of a pull request. It makes reviewing the patches difficult.

For this pull request, I believe these are the commits that you intend to go in

2167f2715e127591ed2abcea075ce89bbbf68864
3e5d177133a7063cdd000b55b26c696861d44235
8f5407c90d3738c3a3c4caca442bc8441cc76f6d

Quoted 3 lines
Quoted 3 lines

3806459949c80432557d74e0c7731030de838e49
5a5aaad81edf5d522e38000d00708dd0a1470151
95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b

04a3e2e8e554007d2774b6ad0ab302a491ba41bf
aac90e231157a34358134a1fb7b1221032db9e1a
a8d25fc26f681a9c4dfb062ebb4b00b9509a7966

Of these, I believe

Quoted 8 lines
Quoted 3 lines
Quoted 3 lines

3806459949c80432557d74e0c7731030de838e49
5a5aaad81edf5d522e38000d00708dd0a1470151
95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b

Are the merge.

Are these 9 commits correct?

9 commits are correct.
8f5407c90d3738c3a3c4caca442bc8441cc76f6d and
3806459949c80432557d74e0c7731030de838e49 are
squashed to
5a5aaad81edf5d522e38000d00708dd0a1470151

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net
#3 lore raw
Quoted 44 lines · Minkyu Kang

Dear Tom,

Quoted 41 lines · Tom
Quoted 8 lines · Minkyu Kang

Dear Tom,

The following changes since commit f687ebf82dbe44dcde5901232ade4f19ecedbf58:
Minkyu Kang (1):
Merge branch 'master' of git://git.denx.de/u-boot-arm

are available in the git repository at:

Quoted 8 lines

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

Joonyoung Shim (1):
s3c64xx: Add ifdef at the S3C64XX only codes

Minkyu Kang (2):
s5pc1xx: support the GPIO interface
Merge branch 'master' of git://git.denx.de/u-boot-samsung

It would be best if merges were not part of a pull request. It makes reviewing the patches difficult.

For this pull request, I believe these are the commits that you intend to go in

2167f2715e127591ed2abcea075ce89bbbf68864
3e5d177133a7063cdd000b55b26c696861d44235
8f5407c90d3738c3a3c4caca442bc8441cc76f6d

Quoted 3 lines
Quoted 3 lines

3806459949c80432557d74e0c7731030de838e49
5a5aaad81edf5d522e38000d00708dd0a1470151
95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b

04a3e2e8e554007d2774b6ad0ab302a491ba41bf
aac90e231157a34358134a1fb7b1221032db9e1a
a8d25fc26f681a9c4dfb062ebb4b00b9509a7966

Of these, I believe

Quoted 3 lines
Quoted 3 lines

3806459949c80432557d74e0c7731030de838e49
5a5aaad81edf5d522e38000d00708dd0a1470151
95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b

Are the merge.

Quoted 9 lines
Quoted 2 lines

Are these 9 commits correct?

9 commits are correct.
8f5407c90d3738c3a3c4caca442bc8441cc76f6d and
3806459949c80432557d74e0c7731030de838e49 are
squashed to
5a5aaad81edf5d522e38000d00708dd0a1470151

Ok that would explain why I could not find (I believe) this commit on the mailing list.

In the future, please do not do this.

I will continue with this pull request.
Tom

Quoted 2 lines

Thanks
Minkyu Kang

Applied
#4 lore raw
In reply to Minkyu Kang
Quoted 14 lines · Minkyu Kang

Dear Tom,

Quoted 11 lines · Tom
Quoted 10 lines · Minkyu Kang

Dear Tom,

The following changes since commit f687ebf82dbe44dcde5901232ade4f19ecedbf58:
Minkyu Kang (1):
Merge branch 'master' of git://git.denx.de/u-boot-arm

are available in the git repository at:

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

Applied.
Thanks
Tom