Alright, I hope I've gotten it right this time. I had already done a git fetch of the u-boot-arm master (see my very first sentence below), but regardless, I followed your 'always use commands' and I believe I've gotten a valid repo. It's pushed as both 'master' and 'next' to u-boot-tegra.git.
Here's the pull request, please pull into arm master. Thanks.
The following changes since commit e570fe8ef2734fddc15e086b7bc344e64c907e81:
PXA: Kill last remnants of set_GPIO_mode function (2011-12-19 17:52:44 +0100)
are available in the git repository at: git://git.denx.de/u-boot-tegra.git master
Simon Glass (14): tegra2: Tidy UART selection tegra2: Add UARTB support tegra2: config: Enable SPI flash on Seaboard tegra2: Enable SPI environment on Seaboard tegra2: Implement SPI / UART GPIO switch tegra2: spi: Support SPI / UART switch tegra2: Plumb in SPI/UART switch code tegra: Fix build error in plutux, medcom tegra: Move cpu_init_cp15() to arch_cpu_init() tegra: Move clock_early_init() to arch_cpu_init() tegra: add clock_ll_start_uart() to enable UART prior to reloc tegra: Add a function mux feature tegra: Add support for UART init in cpu board.c tegra: Move boards over to use arch-level board UART function
Thierry Reding (7): tegra2: Always build with USE_PRIVATE_LIBGCC=yes. tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000. tegra2: Move tegra2_mmc_init() prototype to public header. tegra2: Add common Avionic Design Tamonten support. tegra2: Add Avionic Design Plutux support. tegra2: Add Avionic Design Medcom support. tegra2: Optimize out-of-tree build for Ventana.
Tom Warren (2): tegra2: spi: Add SPI driver for Tegra2 SOC arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master
MAINTAINERS | 5 + arch/arm/cpu/armv7/tegra2/Makefile | 2 +- arch/arm/cpu/armv7/tegra2/board.c | 58 ++++ arch/arm/cpu/armv7/tegra2/clock.c | 14 + arch/arm/cpu/armv7/tegra2/config.mk | 2 + arch/arm/cpu/armv7/tegra2/funcmux.c | 58 ++++ arch/arm/include/asm/arch-tegra2/board.h | 30 ++ arch/arm/include/asm/arch-tegra2/clock.h | 11 + arch/arm/include/asm/arch-tegra2/funcmux.h | 41 +++ arch/arm/include/asm/arch-tegra2/mmc.h | 27 ++ arch/arm/include/asm/arch-tegra2/tegra2.h | 1 + arch/arm/include/asm/arch-tegra2/tegra2_spi.h | 76 ++++++ arch/arm/include/asm/arch-tegra2/uart-spi-switch.h | 46 ++++ board/avionic-design/common/tamonten.c | 116 ++++++++ board/avionic-design/common/tamonten.h | 32 +++ board/avionic-design/medcom/Makefile | 50 ++++ board/avionic-design/medcom/medcom.c | 45 ++++ board/avionic-design/plutux/Makefile | 50 ++++ board/avionic-design/plutux/plutux.c | 45 ++++ board/nvidia/common/Makefile | 47 ++++ board/nvidia/common/board.c | 73 +---- board/nvidia/common/board.h | 2 +- board/nvidia/common/uart-spi-switch.c | 138 ++++++++++ board/nvidia/harmony/Makefile | 1 - board/nvidia/harmony/harmony.c | 2 +- board/nvidia/seaboard/Makefile | 1 - board/nvidia/seaboard/seaboard.c | 5 +- board/nvidia/ventana/Makefile | 5 +- boards.cfg | 2 + drivers/mmc/tegra2_mmc.h | 2 - drivers/spi/Makefile | 1 + drivers/spi/tegra2_spi.c | 279 ++++++++++++++++++++ include/configs/harmony.h | 3 + include/configs/medcom.h | 64 +++++ include/configs/plutux.h | 64 +++++ include/configs/seaboard.h | 20 ++ include/configs/tegra2-common.h | 5 +- include/configs/ventana.h | 3 + 38 files changed, 1353 insertions(+), 73 deletions(-) create mode 100644 arch/arm/cpu/armv7/tegra2/funcmux.c create mode 100644 arch/arm/include/asm/arch-tegra2/board.h create mode 100644 arch/arm/include/asm/arch-tegra2/funcmux.h create mode 100644 arch/arm/include/asm/arch-tegra2/mmc.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_spi.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart-spi-switch.h create mode 100644 board/avionic-design/common/tamonten.c create mode 100644 board/avionic-design/common/tamonten.h create mode 100644 board/avionic-design/medcom/Makefile create mode 100644 board/avionic-design/medcom/medcom.c create mode 100644 board/avionic-design/plutux/Makefile create mode 100644 board/avionic-design/plutux/plutux.c create mode 100644 board/nvidia/common/Makefile create mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 drivers/spi/tegra2_spi.c create mode 100644 include/configs/medcom.h create mode 100644 include/configs/plutux.h
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: Thursday, December 22, 2011 3:51 PM To: Tom Warren Cc: Wolfgang Denk; u-boot@lists.denx.de Subject: Re: Pull request: u-boot-tegra/next
Le 22/12/2011 22:51, Tom Warren a écrit :
I did a 'git fetch git://git.denx.de/u-boot-arm.git', then rebased on
that, as per the Workflow for Custodian git Repos wiki page. But that gave me a large number of changes in my pull request (most of which weren't my recent ones). So I did (on Simon's advice):
Note that the flow is for master branches, not next, although it can apply on next as well if you request a pull of a next into a next.
git checkout -b next-try u-boot-arm/master git cherry-pick next~23, etc. for the commits I'd added since the last pull request.
You should not have to cherry-pick. If your rebase does not fail, it should leave your branch with only tour patches on it. However, cherry-picking should work just as ok. Note BTW that you can cherry-pick a range, IIRC.
This resulted in a pull request w/just my commits, as below. So I make
'next-try' my 'next' branch& pushed it to u-boot-tegra.
Yet this does not tell me if you want it pushed on my next or master...
Note that I see this in my 'u-boot-arm' cloned repo, master branch:
commit 4f1a2cd1637027f31de7796aedb1fa5fc0ec0f97 Merge: f8d2c65 953209b Author: Wolfgang Denkwd@denx.de Date: Mon Dec 12 07:56:41 2011 +0100
Is that what you see as 'u-boot-arm/master' ? Had you done a 'git fetch u- boot-arm' (or whatever is your nickname for the ARM repo) before rebasing? Because since dec 20, u-boot-arm/master is at commit e570fe8ef2734fddc15e086b7bc344e64c907e81 -- and anyway, that is a commit by Wolfgang to merge the ARM repo, not a commit *from* the ARM repo.
Merge branch 'master' of git://git.denx.de/u-boot-arm * 'master' of git://git.denx.de/u-boot-arm: arm: add __aeabi_unwind_cpp_pr1() function to avoid linkercomplaints
post: fix compile issue for post tests on kirkwoodThe second hash in the 'Merge: ...' line has the below commit #. Maybe
things diverged at some point?
Things cannot diverge between u-boot and u-bot-arm, as I always rebase my pull requests onto the latest u-boot master branch at the very time of the request -- just like pull requests to ARM should always be done above the current u-boot-arm/master.
Let me know how I can straighten this out. I'd like to get it in before I
leave for the holidays.
My advice is:
- Before requesting a pull, make sure you are rebased against the latest u-
boo-arm master and next branches by doing a 'git fetch u-boot-arm' (or whatever your remote nickname for the ARM repo is; if you don't have a remote nickname for it, then do a 'git fetch git://git.denx.de/u-boot-arm') then a 'git rebase u-boot-arm/master' (assuming your own master branch is checked out of course).
I personally always use the commands
git checkout master [that's my local ARM master branch] git fetch u-boot [that syncs my local copy of u-boot/master] git rebase u-boot/master [after that I'm good for a pull req]
before a 'git request-pull'.
- explicitly state which ARM branch the pull should be done into. If you
don't specify explicitly but the branch to pull from is master, I'll pull into ARM master, but otherwise, I'll ask.
Thanks,
np
Tom
Amicalement,
Albert.
----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------