[U-Boot] Pull request for u-boot-marvell.git
Hi Albert
Please kindly pull The following changes since commit 0e005ee09d3424e2780efc6895fcbfbdf7a492fa: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster
are available in the git repository at:
u-boot-marvell.git master branch.
Ajay Bhargav (4): SPI: Add SPI driver support for Marvell Armada100 Armada100: Add SPI support for Marvell gplugD Armada100: Add SPI flash support for Marvell gplugD Armada100: Add env storage support for Marvell gplugD
Jason Cooper (1): dreamplug: initial board support.
Lei Wen (5): ARM: pantheon: reduce dependence of including platform file ARM: armada100: reduce dependence of including platform file ARM: kirkwood: reduce dependence of including platform file serial: reduce include platform file for marvell chip gpio: mvmfp: reduce include platform file
Michael Walle (1): kirkwood_spi: add dummy spi_init()
Prafulla Wadaskar (1): gplug: fixed build error as a result of code cleanup patch
MAINTAINERS | 4 + arch/arm/cpu/arm926ejs/armada100/cpu.c | 2 +- arch/arm/cpu/arm926ejs/armada100/dram.c | 1 + arch/arm/cpu/arm926ejs/armada100/timer.c | 1 + arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/dram.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/timer.c | 1 + arch/arm/cpu/arm926ejs/pantheon/cpu.c | 2 +- arch/arm/cpu/arm926ejs/pantheon/dram.c | 1 + arch/arm/cpu/arm926ejs/pantheon/timer.c | 1 + arch/arm/include/asm/arch-armada100/armada100.h | 120 +------------ arch/arm/include/asm/arch-armada100/config.h | 1 + arch/arm/include/asm/arch-armada100/cpu.h | 125 +++++++++++++ arch/arm/include/asm/arch-armada100/mfp.h | 6 + arch/arm/include/asm/arch-armada100/spi.h | 95 ++++++++++ arch/arm/include/asm/arch-kirkwood/config.h | 1 + arch/arm/include/asm/arch-kirkwood/kirkwood.h | 6 - arch/arm/include/asm/arch-pantheon/config.h | 2 + arch/arm/include/asm/arch-pantheon/pantheon.h | 7 - board/Marvell/aspenite/aspenite.c | 1 + board/Marvell/dreamplug/Makefile | 54 ++++++ board/Marvell/dreamplug/dreamplug.c | 151 +++++++++++++++ board/Marvell/dreamplug/dreamplug.h | 42 ++++ board/Marvell/dreamplug/kwbimage.cfg | 163 ++++++++++++++++ board/Marvell/gplugd/gplugd.c | 13 ++ board/Marvell/guruplug/guruplug.c | 1 + board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 1 + board/Marvell/openrd/openrd.c | 1 + board/Marvell/rd6281a/rd6281a.c | 1 + board/Marvell/sheevaplug/sheevaplug.c | 1 + board/keymile/km_arm/km_arm.c | 1 + boards.cfg | 1 + drivers/gpio/kw_gpio.c | 1 + drivers/gpio/mvmfp.c | 7 - drivers/net/mvgbe.c | 2 + drivers/serial/serial.c | 9 - drivers/spi/Makefile | 1 + drivers/spi/armada100_spi.c | 228 +++++++++++++++++++++++ drivers/spi/kirkwood_spi.c | 5 + drivers/usb/host/ehci-kirkwood.c | 1 + include/configs/dreamplug.h | 151 +++++++++++++++ include/configs/gplugd.h | 19 ++- 43 files changed, 1088 insertions(+), 149 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s create mode 100644 arch/arm/include/asm/arch-armada100/spi.h create mode 100644 board/Marvell/dreamplug/Makefile create mode 100644 board/Marvell/dreamplug/dreamplug.c create mode 100644 board/Marvell/dreamplug/dreamplug.h create mode 100644 board/Marvell/dreamplug/kwbimage.cfg create mode 100644 drivers/spi/armada100_spi.c create mode 100644 include/configs/dreamplug.h
Regards.. Prafulla . . .
Hi Prafulla,
Le 18/10/2011 13:12, Prafulla Wadaskar a écrit :
Hi Albert
Please kindly pull The following changes since commit 0e005ee09d3424e2780efc6895fcbfbdf7a492fa: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster
This commit is not present in u-boot-arm... It is the result of a merge of u-boot-arm/master into u-boot-marvell/master. This is not the way a pull request should be prepared according to the U-Boot Wiki.
I would much prefer you to fetch u-boot-arm/master, then rebase your master branch onto it, then request a pull relative to u-boot-arm/master, i.e. use the following commands (assuming your git setup has a remote called u-boot-arm)
git fetch u-boot-arm git checkout master git rebase u-boot-arm/master git push ... git request-pull
Regards.. Prafulla . . .
Amicalement,
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: Tuesday, October 18, 2011 11:26 PM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; wd@denx.de; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
Le 18/10/2011 13:12, Prafulla Wadaskar a écrit :
Hi Albert
Please kindly pull The following changes since commit
0e005ee09d3424e2780efc6895fcbfbdf7a492fa:
Prafulla Wadaskar (1): Merge branch 'master' of
git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster
This commit is not present in u-boot-arm... It is the result of a merge of u-boot-arm/master into u-boot-marvell/master. This is not the way a pull request should be prepared according to the U-Boot Wiki.
I would much prefer you to fetch u-boot-arm/master, then rebase your master branch onto it, then request a pull relative to u-boot-arm/master, i.e. use the following commands (assuming your git setup has a remote called u-boot-arm)
git fetch u-boot-arm git checkout master git rebase u-boot-arm/master git push ... git request-pull
Hi Albert
I followed similar process(instead of git fetch I am using git pull, and I am not sure git push and git pull-request are interchanged). I will check and let you know.
I will regenerate a new pull request.
Regards.. Prafulla . .
Hi Prafulla,
Le 19/10/2011 06:01, Prafulla Wadaskar a écrit :
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: Tuesday, October 18, 2011 11:26 PM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; wd@denx.de; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
Le 18/10/2011 13:12, Prafulla Wadaskar a écrit :
Hi Albert
Please kindly pull The following changes since commit
0e005ee09d3424e2780efc6895fcbfbdf7a492fa:
Prafulla Wadaskar (1): Merge branch 'master' ofgit://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster
This commit is not present in u-boot-arm... It is the result of a merge of u-boot-arm/master into u-boot-marvell/master. This is not the way a pull request should be prepared according to the U-Boot Wiki.
I would much prefer you to fetch u-boot-arm/master, then rebase your master branch onto it, then request a pull relative to u-boot-arm/master, i.e. use the following commands (assuming your git setup has a remote called u-boot-arm)
git fetch u-boot-arm git checkout master git rebase u-boot-arm/master git push ... git request-pull
Hi Albert
I followed similar process(instead of git fetch I am using git pull, and I am not sure git push and git pull-request are interchanged). I will check and let you know.
The issue is with the git pull command, because a git pull amounts to a git fetch followed by a git merge -- that's what causes the commit you base your pull request on.
Yes, I know 'git pull' is the command given in the Wiki, but the way the instructions are laid out in the Wiki, this pull is done in an ad hoc branch and will not cause a merge to your master.
I *definitely* will go and rewrite the Wiki on this, both to make explanations simpler and less error-prone, and to account for the layered u-boot / u-boot-arm / u-boot-{ti,marvell,imx,samsung,atmel} repository workflow.
As for git push and git request-pull, if you request before push you'll see that the request has an error message about not being able to locate the branch; the order must be push, then request pull (which is logical: before I can pull your branch, it must be made available).
I will regenerate a new pull request.
Thanks a lot!
Regards.. Prafulla . .
Amicalement,
Hi Albert
Please kindly pull The following changes since commit 457c2c8e1e1d201beb32961acb5520cf240373ab: Fabio Estevam (1): imx: fix coding style
are available in the git repository at:
u-boot-marvell.git master branch.
Ajay Bhargav (4): SPI: Add SPI driver support for Marvell Armada100 Armada100: Add SPI support for Marvell gplugD Armada100: Add SPI flash support for Marvell gplugD Armada100: Add env storage support for Marvell gplugD
Jason Cooper (1): dreamplug: initial board support.
Lei Wen (5): ARM: pantheon: reduce dependence of including platform file ARM: armada100: reduce dependence of including platform file ARM: kirkwood: reduce dependence of including platform file serial: reduce include platform file for marvell chip gpio: mvmfp: reduce include platform file
Michael Walle (1): kirkwood_spi: add dummy spi_init()
Prafulla Wadaskar (1): gplug: fixed build error as a result of code cleanup patch
MAINTAINERS | 4 + arch/arm/cpu/arm926ejs/armada100/cpu.c | 2 +- arch/arm/cpu/arm926ejs/armada100/dram.c | 1 + arch/arm/cpu/arm926ejs/armada100/timer.c | 1 + arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/dram.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/timer.c | 1 + arch/arm/cpu/arm926ejs/pantheon/cpu.c | 2 +- arch/arm/cpu/arm926ejs/pantheon/dram.c | 1 + arch/arm/cpu/arm926ejs/pantheon/timer.c | 1 + arch/arm/include/asm/arch-armada100/armada100.h | 120 +------------ arch/arm/include/asm/arch-armada100/config.h | 1 + arch/arm/include/asm/arch-armada100/cpu.h | 125 +++++++++++++ arch/arm/include/asm/arch-armada100/mfp.h | 6 + arch/arm/include/asm/arch-armada100/spi.h | 95 ++++++++++ arch/arm/include/asm/arch-kirkwood/config.h | 1 + arch/arm/include/asm/arch-kirkwood/kirkwood.h | 6 - arch/arm/include/asm/arch-pantheon/config.h | 2 + arch/arm/include/asm/arch-pantheon/pantheon.h | 7 - board/Marvell/aspenite/aspenite.c | 1 + board/Marvell/dreamplug/Makefile | 54 ++++++ board/Marvell/dreamplug/dreamplug.c | 151 +++++++++++++++ board/Marvell/dreamplug/dreamplug.h | 42 ++++ board/Marvell/dreamplug/kwbimage.cfg | 163 ++++++++++++++++ board/Marvell/gplugd/gplugd.c | 13 ++ board/Marvell/guruplug/guruplug.c | 1 + board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 1 + board/Marvell/openrd/openrd.c | 1 + board/Marvell/rd6281a/rd6281a.c | 1 + board/Marvell/sheevaplug/sheevaplug.c | 1 + board/keymile/km_arm/km_arm.c | 1 + boards.cfg | 1 + drivers/gpio/kw_gpio.c | 1 + drivers/gpio/mvmfp.c | 7 - drivers/net/mvgbe.c | 2 + drivers/serial/serial.c | 9 - drivers/spi/Makefile | 1 + drivers/spi/armada100_spi.c | 228 +++++++++++++++++++++++ drivers/spi/kirkwood_spi.c | 5 + drivers/usb/host/ehci-kirkwood.c | 1 + include/configs/dreamplug.h | 151 +++++++++++++++ include/configs/gplugd.h | 19 ++- 43 files changed, 1088 insertions(+), 149 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s create mode 100644 arch/arm/include/asm/arch-armada100/spi.h create mode 100644 board/Marvell/dreamplug/Makefile create mode 100644 board/Marvell/dreamplug/dreamplug.c create mode 100644 board/Marvell/dreamplug/dreamplug.h create mode 100644 board/Marvell/dreamplug/kwbimage.cfg create mode 100644 drivers/spi/armada100_spi.c create mode 100644 include/configs/dreamplug.h
Regards.. Prafulla . . .
Hi Prafulla,
Le 20/10/2011 13:36, Prafulla Wadaskar a écrit :
Hi Albert
Please kindly pull The following changes since commit 457c2c8e1e1d201beb32961acb5520cf240373ab: Fabio Estevam (1): imx: fix coding style
are available in the git repository at:
u-boot-marvell.git master branch.
Ajay Bhargav (4): SPI: Add SPI driver support for Marvell Armada100 Armada100: Add SPI support for Marvell gplugD Armada100: Add SPI flash support for Marvell gplugD Armada100: Add env storage support for Marvell gplugD
Jason Cooper (1): dreamplug: initial board support.
Lei Wen (5): ARM: pantheon: reduce dependence of including platform file ARM: armada100: reduce dependence of including platform file ARM: kirkwood: reduce dependence of including platform file serial: reduce include platform file for marvell chip gpio: mvmfp: reduce include platform file
Michael Walle (1): kirkwood_spi: add dummy spi_init()
Prafulla Wadaskar (1): gplug: fixed build error as a result of code cleanup patch
Applied to u-boot-arm/master, thanks!
Amicalement,
participants (2)
-
Albert ARIBAUD -
Prafulla Wadaskar