From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Date: Fri, 05 Mar 2010 14:29:38 -0600 Subject: [U-Boot] Please pull u-boot-samsung/master In-Reply-To: <4B90D6FE.3020106@samsung.com> References: <4B90D6FE.3020106@samsung.com> Message-ID: <4B9169B2.3080308@windriver.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Minkyu Kang wrote: > 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 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 >> 3806459949c80432557d74e0c7731030de838e49 >> 5a5aaad81edf5d522e38000d00708dd0a1470151 >> 95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b 04a3e2e8e554007d2774b6ad0ab302a491ba41bf aac90e231157a34358134a1fb7b1221032db9e1a a8d25fc26f681a9c4dfb062ebb4b00b9509a7966 Of these, I believe >> 3806459949c80432557d74e0c7731030de838e49 >> 5a5aaad81edf5d522e38000d00708dd0a1470151 >> 95a3db1a0cfb1d8d683fd5ab48ffca9b0d3b0e6b Are the merge. Are these 9 commits correct? Best Regards, Tom > > 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