[U-Boot] pull request for u-boot-tegra/next into ARM next
Albert,
Please pull u-boot-tegra/next into ARM next as per the discussion currently on-going with Lucas Stach on the list. Thanks!
./MAKEALL -s tegra20 runs OK, and checkpatch.pl is clean except for 1 bogus warning about a macro needing parens.
The following changes since commit 1c27059a2f7158a9c9a8778535b030935d75179d: Albert ARIBAUD (1): Merge remote-tracking branch 'u-boot/master'
are available in the git repository at:
git://git.denx.de/u-boot-tegra next
Lucas Stach (6): tegra20: complete periph_id enum tegra20: add clock_set_pllout function tegra20: rework UART GPIO handling tegra: add funcmux entry for NAND attached to KBC tegra: clean up board include hell tegra: nand: add board pinmux
Stephen Warren (1): tegra: enable CONFIG_CMD_PART
Thierry Reding (2): tegra: Update Avionic Design vendor prefix tegra: Rename Medcom to Medcom-Wide
Tom Warren (2): Tegra20: Move some code files to common directories for upcoming Tegra30 patches. Tegra20: Move some include files to arch-tegra for sharing with Tegra30
MAINTAINERS | 2 +- Makefile | 2 + arch/arm/cpu/arm720t/tegra-common/Makefile | 47 +++ .../cpu/arm720t/{tegra20 => tegra-common}/cpu.h | 0 .../cpu/arm720t/{tegra20 => tegra-common}/spl.c | 18 +- arch/arm/cpu/arm720t/tegra20/Makefile | 1 - arch/arm/cpu/arm720t/tegra20/cpu.c | 12 +- arch/arm/cpu/armv7/tegra-common/Makefile | 48 +++ .../armv7/{tegra20 => tegra-common}/cmd_enterrcm.c | 4 +- arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/usb.c | 8 +- arch/arm/cpu/tegra-common/Makefile | 48 +++ .../{tegra20-common/ap20.c => tegra-common/ap.c} | 12 +- .../cpu/{tegra20-common => tegra-common}/board.c | 9 +- .../lowlevel_init.S | 0 .../{tegra20-common => tegra-common}/sys_info.c | 0 .../cpu/{tegra20-common => tegra-common}/timer.c | 4 +- arch/arm/cpu/tegra20-common/Makefile | 3 +- arch/arm/cpu/tegra20-common/clock.c | 47 +++- arch/arm/cpu/tegra20-common/emc.c | 4 +- arch/arm/cpu/tegra20-common/funcmux.c | 19 +- arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/cpu/tegra20-common/pmu.c | 8 +- arch/arm/cpu/tegra20-common/warmboot.c | 18 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 14 +- .../asm/{arch-tegra20/ap20.h => arch-tegra/ap.h} | 0 arch/arm/include/asm/arch-tegra/board.h | 48 +++ .../asm/{arch-tegra20 => arch-tegra}/clk_rst.h | 11 +- arch/arm/include/asm/arch-tegra/clock.h | 265 +++++++++++++ .../asm/{arch-tegra20 => arch-tegra}/fuse.h | 0 .../arm/include/asm/arch-tegra/gpio.h | 27 +- .../include/asm/{arch-tegra20 => arch-tegra}/mmc.h | 0 .../include/asm/{arch-tegra20 => arch-tegra}/pmc.h | 0 .../include/asm/{arch-tegra20 => arch-tegra}/scu.h | 0 .../asm/{arch-tegra20 => arch-tegra}/sys_proto.h | 0 .../{arch-tegra20/tegra20.h => arch-tegra/tegra.h} | 14 +- .../asm/{arch-tegra20 => arch-tegra}/tegra_i2c.h | 4 +- .../asm/{arch-tegra20 => arch-tegra}/tegra_mmc.h | 0 .../asm/{arch-tegra20 => arch-tegra}/tegra_spi.h | 0 .../asm/{arch-tegra20 => arch-tegra}/timer.h | 0 .../asm/{arch-tegra20 => arch-tegra}/uart.h | 0 .../asm/{arch-tegra20 => arch-tegra}/warmboot.h | 0 arch/arm/include/asm/arch-tegra20/board.h | 30 -- arch/arm/include/asm/arch-tegra20/clock-tables.h | 196 ++++++++++ arch/arm/include/asm/arch-tegra20/clock.h | 388 +------------------- arch/arm/include/asm/arch-tegra20/funcmux.h | 1 + arch/arm/include/asm/arch-tegra20/gpio.h | 22 +- .../board.h => include/asm/arch-tegra20/tegra.h} | 17 +- board/avionic-design/common/tamonten.c | 20 +- ...{tegra20-medcom.dts => tegra20-medcom-wide.dts} | 2 +- board/avionic-design/dts/tegra20-plutux.dts | 2 +- board/avionic-design/dts/tegra20-tec.dts | 2 +- .../{medcom => medcom-wide}/Makefile | 0 board/compal/paz00/paz00.c | 11 +- board/compulab/trimslice/trimslice.c | 13 +- board/nvidia/common/board.c | 42 ++- board/nvidia/common/emc.c | 8 +- board/nvidia/common/uart-spi-switch.c | 6 +- board/nvidia/harmony/harmony.c | 11 +- board/nvidia/seaboard/seaboard.c | 6 +- board/nvidia/whistler/whistler.c | 13 +- boards.cfg | 2 +- drivers/gpio/tegra_gpio.c | 2 +- drivers/i2c/tegra_i2c.c | 4 +- drivers/input/tegra-kbc.c | 2 +- drivers/mmc/tegra_mmc.c | 6 +- drivers/mtd/nand/tegra_nand.c | 6 +- drivers/spi/tegra_spi.c | 7 +- include/configs/{medcom.h => medcom-wide.h} | 8 +- include/configs/tegra-common-post.h | 9 + include/configs/tegra20-common.h | 4 +- spl/Makefile | 2 + 72 files changed, 917 insertions(+), 627 deletions(-) create mode 100644 arch/arm/cpu/arm720t/tegra-common/Makefile rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/cpu.h (100%) rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/spl.c (91%) create mode 100644 arch/arm/cpu/armv7/tegra-common/Makefile rename arch/arm/cpu/armv7/{tegra20 => tegra-common}/cmd_enterrcm.c (96%) create mode 100644 arch/arm/cpu/tegra-common/Makefile rename arch/arm/cpu/{tegra20-common/ap20.c => tegra-common/ap.c} (95%) rename arch/arm/cpu/{tegra20-common => tegra-common}/board.c (94%) rename arch/arm/cpu/{tegra20-common => tegra-common}/lowlevel_init.S (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/sys_info.c (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/timer.c (97%) rename arch/arm/include/asm/{arch-tegra20/ap20.h => arch-tegra/ap.h} (100%) create mode 100644 arch/arm/include/asm/arch-tegra/board.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/clk_rst.h (95%) create mode 100644 arch/arm/include/asm/arch-tegra/clock.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/fuse.h (100%) rename board/nvidia/common/board.h => arch/arm/include/asm/arch-tegra/gpio.h (62%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/mmc.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/pmc.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/scu.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/sys_proto.h (100%) rename arch/arm/include/asm/{arch-tegra20/tegra20.h => arch-tegra/tegra.h} (90%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_i2c.h (98%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_mmc.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_spi.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/timer.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/uart.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/warmboot.h (100%) delete mode 100644 arch/arm/include/asm/arch-tegra20/board.h create mode 100644 arch/arm/include/asm/arch-tegra20/clock-tables.h rename arch/arm/{cpu/arm720t/tegra20/board.h => include/asm/arch-tegra20/tegra.h} (73%) rename board/avionic-design/dts/{tegra20-medcom.dts => tegra20-medcom-wide.dts} (92%) rename board/avionic-design/{medcom => medcom-wide}/Makefile (100%) rename include/configs/{medcom.h => medcom-wide.h} (89%)
Hi Tom,
On Mon, 1 Oct 2012 13:26:19 -0700, Tom Warren twarren.nvidia@gmail.com wrote:
Albert,
Please pull u-boot-tegra/next into ARM next as per the discussion currently on-going with Lucas Stach on the list. Thanks!
./MAKEALL -s tegra20 runs OK, and checkpatch.pl is clean except for 1 bogus warning about a macro needing parens.
The following changes since commit 1c27059a2f7158a9c9a8778535b030935d75179d: Albert ARIBAUD (1): Merge remote-tracking branch 'u-boot/master'
are available in the git repository at:
git://git.denx.de/u-boot-tegra next
Lucas Stach (6): tegra20: complete periph_id enum tegra20: add clock_set_pllout function tegra20: rework UART GPIO handling tegra: add funcmux entry for NAND attached to KBC tegra: clean up board include hell tegra: nand: add board pinmux
Stephen Warren (1): tegra: enable CONFIG_CMD_PART
Thierry Reding (2): tegra: Update Avionic Design vendor prefix tegra: Rename Medcom to Medcom-Wide
Tom Warren (2): Tegra20: Move some code files to common directories for upcoming Tegra30 patches. Tegra20: Move some include files to arch-tegra for sharing with Tegra30
MAINTAINERS | 2 +- Makefile | 2 + arch/arm/cpu/arm720t/tegra-common/Makefile | 47 +++ .../cpu/arm720t/{tegra20 => tegra-common}/cpu.h | 0 .../cpu/arm720t/{tegra20 => tegra-common}/spl.c | 18 +- arch/arm/cpu/arm720t/tegra20/Makefile | 1 - arch/arm/cpu/arm720t/tegra20/cpu.c | 12 +- arch/arm/cpu/armv7/tegra-common/Makefile | 48 +++ .../armv7/{tegra20 => tegra-common}/cmd_enterrcm.c | 4 +- arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/usb.c | 8 +- arch/arm/cpu/tegra-common/Makefile | 48 +++ .../{tegra20-common/ap20.c => tegra-common/ap.c} | 12 +- .../cpu/{tegra20-common => tegra-common}/board.c | 9 +- .../lowlevel_init.S | 0 .../{tegra20-common => tegra-common}/sys_info.c | 0 .../cpu/{tegra20-common => tegra-common}/timer.c | 4 +- arch/arm/cpu/tegra20-common/Makefile | 3 +- arch/arm/cpu/tegra20-common/clock.c | 47 +++- arch/arm/cpu/tegra20-common/emc.c | 4 +- arch/arm/cpu/tegra20-common/funcmux.c | 19 +- arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/cpu/tegra20-common/pmu.c | 8 +- arch/arm/cpu/tegra20-common/warmboot.c | 18 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 14 +- .../asm/{arch-tegra20/ap20.h => arch-tegra/ap.h} | 0 arch/arm/include/asm/arch-tegra/board.h | 48 +++ .../asm/{arch-tegra20 => arch-tegra}/clk_rst.h | 11 +- arch/arm/include/asm/arch-tegra/clock.h | 265 +++++++++++++ .../asm/{arch-tegra20 => arch-tegra}/fuse.h | 0 .../arm/include/asm/arch-tegra/gpio.h | 27 +- .../include/asm/{arch-tegra20 => arch-tegra}/mmc.h | 0 .../include/asm/{arch-tegra20 => arch-tegra}/pmc.h | 0 .../include/asm/{arch-tegra20 => arch-tegra}/scu.h | 0 .../asm/{arch-tegra20 => arch-tegra}/sys_proto.h | 0 .../{arch-tegra20/tegra20.h => arch-tegra/tegra.h} | 14 +- .../asm/{arch-tegra20 => arch-tegra}/tegra_i2c.h | 4 +- .../asm/{arch-tegra20 => arch-tegra}/tegra_mmc.h | 0 .../asm/{arch-tegra20 => arch-tegra}/tegra_spi.h | 0 .../asm/{arch-tegra20 => arch-tegra}/timer.h | 0 .../asm/{arch-tegra20 => arch-tegra}/uart.h | 0 .../asm/{arch-tegra20 => arch-tegra}/warmboot.h | 0 arch/arm/include/asm/arch-tegra20/board.h | 30 -- arch/arm/include/asm/arch-tegra20/clock-tables.h | 196 ++++++++++ arch/arm/include/asm/arch-tegra20/clock.h | 388 +------------------- arch/arm/include/asm/arch-tegra20/funcmux.h | 1 + arch/arm/include/asm/arch-tegra20/gpio.h | 22 +- .../board.h => include/asm/arch-tegra20/tegra.h} | 17 +- board/avionic-design/common/tamonten.c | 20 +- ...{tegra20-medcom.dts => tegra20-medcom-wide.dts} | 2 +- board/avionic-design/dts/tegra20-plutux.dts | 2 +- board/avionic-design/dts/tegra20-tec.dts | 2 +- .../{medcom => medcom-wide}/Makefile | 0 board/compal/paz00/paz00.c | 11 +- board/compulab/trimslice/trimslice.c | 13 +- board/nvidia/common/board.c | 42 ++- board/nvidia/common/emc.c | 8 +- board/nvidia/common/uart-spi-switch.c | 6 +- board/nvidia/harmony/harmony.c | 11 +- board/nvidia/seaboard/seaboard.c | 6 +- board/nvidia/whistler/whistler.c | 13 +- boards.cfg | 2 +- drivers/gpio/tegra_gpio.c | 2 +- drivers/i2c/tegra_i2c.c | 4 +- drivers/input/tegra-kbc.c | 2 +- drivers/mmc/tegra_mmc.c | 6 +- drivers/mtd/nand/tegra_nand.c | 6 +- drivers/spi/tegra_spi.c | 7 +- include/configs/{medcom.h => medcom-wide.h} | 8 +- include/configs/tegra-common-post.h | 9 + include/configs/tegra20-common.h | 4 +- spl/Makefile | 2 + 72 files changed, 917 insertions(+), 627 deletions(-) create mode 100644 arch/arm/cpu/arm720t/tegra-common/Makefile rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/cpu.h (100%) rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/spl.c (91%) create mode 100644 arch/arm/cpu/armv7/tegra-common/Makefile rename arch/arm/cpu/armv7/{tegra20 => tegra-common}/cmd_enterrcm.c (96%) create mode 100644 arch/arm/cpu/tegra-common/Makefile rename arch/arm/cpu/{tegra20-common/ap20.c => tegra-common/ap.c} (95%) rename arch/arm/cpu/{tegra20-common => tegra-common}/board.c (94%) rename arch/arm/cpu/{tegra20-common => tegra-common}/lowlevel_init.S (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/sys_info.c (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/timer.c (97%) rename arch/arm/include/asm/{arch-tegra20/ap20.h => arch-tegra/ap.h} (100%) create mode 100644 arch/arm/include/asm/arch-tegra/board.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/clk_rst.h (95%) create mode 100644 arch/arm/include/asm/arch-tegra/clock.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/fuse.h (100%) rename board/nvidia/common/board.h => arch/arm/include/asm/arch-tegra/gpio.h (62%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/mmc.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/pmc.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/scu.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/sys_proto.h (100%) rename arch/arm/include/asm/{arch-tegra20/tegra20.h => arch-tegra/tegra.h} (90%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_i2c.h (98%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_mmc.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_spi.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/timer.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/uart.h (100%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/warmboot.h (100%) delete mode 100644 arch/arm/include/asm/arch-tegra20/board.h create mode 100644 arch/arm/include/asm/arch-tegra20/clock-tables.h rename arch/arm/{cpu/arm720t/tegra20/board.h => include/asm/arch-tegra20/tegra.h} (73%) rename board/avionic-design/dts/{tegra20-medcom.dts => tegra20-medcom-wide.dts} (92%) rename board/avionic-design/{medcom => medcom-wide}/Makefile (100%) rename include/configs/{medcom.h => medcom-wide.h} (89%)
Applied to u-boot-arm/next, thanks!
Amicalement,
participants (2)
-
Albert ARIBAUD -
Tom Warren