Hi Tom, Le 23/12/2011 00:17, Tom Warren a écrit :
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
The branch is now correctly based above u-boot-arm/master, However, not all commits are bug fixes. Can you reorganize so that all bugfixes are in u-boot-tegra-master, and all non-bugfixes are in .../next above .../master ?
Amicalement, -- Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
