| Message ID | 4DDDE3AF.2000906@samsung.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi Minkyu, Le 26/05/2011 07:22, Minkyu Kang a écrit : > Dear Albert Aribaud, Please make sure the 'at free dot fr' address of mine is not used any more -- there are good chances I won't see U-Boot mail on it anyway. > The following changes since commit 0cecc52c233e5f607f826a4e5c97f92c7a7d6dc4: > > Merge branch 'master' of git://git.denx.de/u-boot-arm into next (2011-05-23 17:47:29 +0900) > > are available in the git repository at: > > git://git.denx.de/u-boot-samsung master Rather than a merge, could you please do a rebase (onto f14a522a (Beagleboard: fixed typo in typecast) as indicated in http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#BEFORE_Requesting_a_Pull)? In addition with making the commit tree simpler, it will ensure that the "since" commit mentioned in your request is actually one that exists in the pulling repo. Amicalement,
Dear Albert ARIBAUD, On 26 May 2011 14:49, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote: > Hi Minkyu, > > Le 26/05/2011 07:22, Minkyu Kang a écrit : >> Dear Albert Aribaud, > > Please make sure the 'at free dot fr' address of mine is not used any > more -- there are good chances I won't see U-Boot mail on it anyway. OK. > >> The following changes since commit 0cecc52c233e5f607f826a4e5c97f92c7a7d6dc4: >> >> Merge branch 'master' of git://git.denx.de/u-boot-arm into next (2011-05-23 17:47:29 +0900) >> >> are available in the git repository at: >> >> git://git.denx.de/u-boot-samsung master > > Rather than a merge, could you please do a rebase (onto f14a522a > (Beagleboard: fixed typo in typecast) as indicated in > http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#BEFORE_Requesting_a_Pull)? I already did a rebase. Any problem? Please see the summary. (http://git.denx.de/?p=u-boot/u-boot-samsung.git;a=summary) > > In addition with making the commit tree simpler, it will ensure that the > "since" commit mentioned in your request is actually one that exists in > the pulling repo. > > Amicalement, > -- > Albert. > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > Thanks Minkyu Kang
Hi Minkyu, Le 26/05/2011 08:24, Minkyu Kang a écrit : >> Rather than a merge, could you please do a rebase (onto f14a522a >> (Beagleboard: fixed typo in typecast) as indicated in >> http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#BEFORE_Requesting_a_Pull)? > > I already did a rebase. > Any problem? The problem is, it is not a rebase. What you did apparently is merge the u-boot-arm master branch to yours, yielding the commit that your pull request is based upon. What the Wiki suggests is that you rebase your branch onto the target one before doing the pull request, so that it is based upon the tip of the target branch. Amicalement,
Dear Albert ARIBAUD, On 26 May 2011 17:13, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote: > Hi Minkyu, > > Le 26/05/2011 08:24, Minkyu Kang a écrit : > >>> Rather than a merge, could you please do a rebase (onto f14a522a >>> (Beagleboard: fixed typo in typecast) as indicated in >>> >>> http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#BEFORE_Requesting_a_Pull)? >> >> I already did a rebase. >> Any problem? > > The problem is, it is not a rebase. What you did apparently is merge the > u-boot-arm master branch to yours, yielding the commit that your pull > request is based upon. What the Wiki suggests is that you rebase your branch > onto the target one before doing the pull request, so that it is based upon > the tip of the target branch. > OK. I see. I'll send pull request again. Thanks Minkyu Kang
Dear Albert Aribaud, The following changes since commit 0cecc52c233e5f607f826a4e5c97f92c7a7d6dc4: Merge branch 'master' of git://git.denx.de/u-boot-arm into next (2011-05-23 17:47:29 +0900) are available in the git repository at: git://git.denx.de/u-boot-samsung 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) (4): 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 (1): MMC S5P: Fix typo Jaehoon Chung (1): S5P: add set_mmc_clk for external clock control Minkyu Kang (2): S5PC2XX: Support the cpu revision S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1) seedshope (1): Add _end for the end of u-boot image for SMDK6400 MAINTAINERS | 4 + Makefile | 11 + 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-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/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 +- board/samsung/smdkv310/Makefile | 46 ++ board/samsung/smdkv310/lowlevel_init.S | 470 ++++++++++++++++++++ board/samsung/smdkv310/mem_setup.S | 365 +++++++++++++++ board/samsung/smdkv310/smdkv310.c | 136 ++++++ boards.cfg | 1 + drivers/mmc/s5p_mmc.c | 6 +- include/configs/smdk2410.h | 181 +++++--- include/configs/smdkv310.h | 169 +++++++ 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 + 35 files changed, 1921 insertions(+), 594 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 delete mode 100644 board/samsung/smdk2410/config.mk delete mode 100644 board/samsung/smdk2410/flash.c create mode 100644 board/samsung/smdkv310/Makefile 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 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