| Message ID | CA+m5__+ziZUfc3L8mqE6hSnhP85wPwBKQQmdCR_rCdoMx=T6ng@mail.gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Tom, On Thu, 30 Aug 2012 17:14:09 -0700, Tom Warren <TWarren@nvidia.com> wrote: > Seems to be the root Makefile: > > ifeq ($(SOC),tegra20) > -LIBS += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o > +LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o > endif > > fixes it, i.e. ./MAKEALL -s tegra20 w/arm/master branch pullreq-utm > passes. This change from Daniel Schwierzeck (Makefile: replace LIBS > by LIBS-y) wasn't in the ARM repo I sync'd to before I sent the pull > request. I assume it came from ARM/master since then, or maybe from > u-boot/master. Thanks for the analysis. It *could* be a previous attempt of mine at pulling into ARM some branch where this fix was in and then having to revert to a previous arm/master due to regressions, and your branch was left based on the temporary arm/master with the fix. The only way to avoid this is to strictly follow U-Boot policies for pull requests: always rebase onto the target branch before sending out a pull request, i.e. pull requests to u-boot-arm/master should always be (re)based on u-boot-arm/master, and my ARM pull requests to u-boot/master should always be (re)based on u-boot/master. > Looks like we'll need a v11 tegra20 SPL patchset, unless Albert is > willing to slip-stream this minor fix in. I'll pick Daniel's commit individually, then locally rebase your branch with the V10 SPL patch set. If regression builds are ok, I'll send out the 'applied' for Daniel's patch and your pull req. Amicalement,
Albert, Please pull u-boot-tegra/master into ARM/master. Please ignore previous pull requests for these patches (Tegra20 SPL from Allen Martin), as some additional work was needed to make them viable for all compilers & chips. Also, I've included Tom Rini's latest 2 lowlevel_init fixes, as Allen's work depends on them. Thanks! The following changes since commit 7253ddf4acd3da2c8ac78c98f3ae7d6017499f72: Stephen Warren (1): ARM: add Raspberry Pi model B board, using BCM2835 SoC are available in the git repository at: git://git.denx.de/u-boot-tegra master Allen Martin (16): mkconfig: add support for SPL CPU tegra20: rename tegra2 -> tegra20 tegra20: move tegra20 SoC code to arch/arm/cpu/tegra20-common tegra20: rename CONFIG_MACH_TEGRA_GENERIC tegra20: tec: add tegra20-common-post.h tegra20: make board mkdir commands unconditional mkconfig: remove bashisms and cleanup config.mk generation ARM: Fix arm720t SPL build tegra20: remove timer_init from SPL build ARM: add tegra20 support to arm720t tegra20: add u-boot-*-tegra.bin targets tegra20: move SDRAM param save to later in boot tegra20: enable SPL for tegra20 boards arm: enable libgcc build for SPL spl: fix SPL build of private libgcc tegra20: Remove armv4t build flags Tom Rini (2): omap4/5/am33xx: Make lowlevel_init available to all armv7 platforms armv7: Make lowlevel_init.S's lowlevel_init do ABI compatible stack MAINTAINERS | 18 ++-- Makefile | 26 ++++ arch/arm/cpu/arm720t/cpu.c | 2 + arch/arm/cpu/arm720t/interrupts.c | 5 + arch/arm/cpu/arm720t/start.S | 25 +++- .../cpu/{armv7/tegra2 => arm720t/tegra20}/Makefile | 28 +--- .../arch-tegra2 => cpu/arm720t/tegra20}/board.h | 11 +- .../{armv7/tegra2 => arm720t/tegra20}/config.mk | 12 -- .../{armv7/tegra2/ap20.c => arm720t/tegra20/cpu.c} | 148 ++------------------ .../ap20.h => cpu/arm720t/tegra20/cpu.h} | 15 +-- arch/arm/cpu/arm720t/tegra20/spl.c | 133 ++++++++++++++++++ arch/arm/cpu/armv7/Makefile | 6 +- .../pmu.h => cpu/armv7/lowlevel_init.S} | 35 ++++- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 18 --- arch/arm/cpu/armv7/start.S | 6 +- arch/arm/cpu/armv7/{tegra2 => tegra20}/Makefile | 15 +-- .../cpu/armv7/{tegra2 => tegra20}/cmd_enterrcm.c | 4 +- arch/arm/cpu/armv7/{tegra2 => tegra20}/config.mk | 12 -- arch/arm/cpu/armv7/{tegra2 => tegra20}/usb.c | 2 +- .../cpu/{armv7/tegra2 => tegra20-common}/Makefile | 29 ++--- arch/arm/cpu/tegra20-common/ap20.c | 131 +++++++++++++++++ .../cpu/{armv7/tegra2 => tegra20-common}/board.c | 39 ++---- .../cpu/{armv7/tegra2 => tegra20-common}/clock.c | 10 +- .../cpu/{armv7/tegra2 => tegra20-common}/crypto.c | 0 .../cpu/{armv7/tegra2 => tegra20-common}/crypto.h | 0 .../arm/cpu/{armv7/tegra2 => tegra20-common}/emc.c | 2 +- .../cpu/{armv7/tegra2 => tegra20-common}/funcmux.c | 2 +- .../tegra2 => tegra20-common}/lowlevel_init.S | 0 .../cpu/{armv7/tegra2 => tegra20-common}/pinmux.c | 4 +- .../arm/cpu/{armv7/tegra2 => tegra20-common}/pmu.c | 2 +- .../{armv7/tegra2 => tegra20-common}/sys_info.c | 2 +- .../cpu/{armv7/tegra2 => tegra20-common}/timer.c | 2 +- .../{armv7/tegra2 => tegra20-common}/warmboot.c | 18 ++-- .../tegra2 => tegra20-common}/warmboot_avp.c | 4 +- .../tegra2 => tegra20-common}/warmboot_avp.h | 0 arch/arm/include/asm/arch-am33xx/hardware.h | 3 +- arch/arm/include/asm/arch-am33xx/omap.h | 1 - arch/arm/include/asm/arch-omap4/omap.h | 1 - arch/arm/include/asm/arch-omap5/omap.h | 2 - .../asm/{arch-tegra2 => arch-tegra20}/ap20.h | 4 +- .../asm/{arch-tegra2 => arch-tegra20}/apb_misc.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/board.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/clk_rst.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/clock.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/emc.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/flow.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/funcmux.h | 2 +- .../asm/{arch-tegra2 => arch-tegra20}/fuse.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/gp_padctrl.h | 2 +- .../asm/{arch-tegra2 => arch-tegra20}/gpio.h | 2 +- arch/arm/include/asm/arch-tegra20/hardware.h | 29 ++++ .../asm/{arch-tegra2 => arch-tegra20}/mmc.h | 8 +- .../asm/{arch-tegra2 => arch-tegra20}/pinmux.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/pmc.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/pmu.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/scu.h | 0 .../{arch-tegra2 => arch-tegra20}/sdram_param.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/sys_proto.h | 4 +- .../tegra2.h => arch-tegra20/tegra20.h} | 18 ++-- .../asm/{arch-tegra2 => arch-tegra20}/tegra_i2c.h | 2 +- .../asm/{arch-tegra2 => arch-tegra20}/tegra_spi.h | 4 +- .../asm/{arch-tegra2 => arch-tegra20}/timer.h | 6 +- .../uart-spi-switch.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/uart.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/usb.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/warmboot.h | 0 arch/arm/lib/Makefile | 2 +- board/avionic-design/common/tamonten.c | 4 +- .../dts/{tegra2-medcom.dts => tegra20-medcom.dts} | 0 .../dts/{tegra2-plutux.dts => tegra20-plutux.dts} | 0 .../dts/{tegra2-tec.dts => tegra20-tec.dts} | 0 board/avionic-design/medcom/Makefile | 2 - board/avionic-design/plutux/Makefile | 2 - board/avionic-design/tec/Makefile | 2 - .../dts/{tegra2-paz00.dts => tegra20-paz00.dts} | 0 board/compal/paz00/Makefile | 2 - board/compal/paz00/paz00.c | 6 +- ...{tegra2-trimslice.dts => tegra20-trimslice.dts} | 0 board/compulab/trimslice/Makefile | 2 - board/compulab/trimslice/trimslice.c | 6 +- board/nvidia/common/board.c | 17 ++- board/nvidia/common/emc.c | 2 +- board/nvidia/common/uart-spi-switch.c | 2 +- .../{tegra2-harmony.dts => tegra20-harmony.dts} | 2 +- .../{tegra2-seaboard.dts => tegra20-seaboard.dts} | 0 .../{tegra2-ventana.dts => tegra20-ventana.dts} | 2 +- .../{tegra2-whistler.dts => tegra20-whistler.dts} | 2 +- board/nvidia/harmony/harmony.c | 6 +- board/nvidia/seaboard/seaboard.c | 6 +- board/nvidia/whistler/whistler.c | 6 +- boards.cfg | 23 ++-- doc/README.SPL | 12 ++ drivers/gpio/tegra_gpio.c | 12 +- drivers/i2c/tegra_i2c.c | 12 +- drivers/input/Makefile | 2 +- drivers/mmc/tegra_mmc.c | 32 ++-- drivers/mmc/tegra_mmc.h | 12 +- drivers/spi/tegra_spi.c | 10 +- include/configs/am335x_evm.h | 4 +- include/configs/harmony.h | 14 +- include/configs/medcom.h | 12 +- include/configs/omap4_common.h | 7 +- include/configs/omap5_evm.h | 7 +- include/configs/paz00.h | 12 +- include/configs/plutux.h | 12 +- include/configs/seaboard.h | 20 ++-- include/configs/tec.h | 12 +- ...{tegra2-common-post.h => tegra20-common-post.h} | 73 +++++++++- .../configs/{tegra2-common.h => tegra20-common.h} | 44 ++++-- include/configs/trimslice.h | 14 +- include/configs/ventana.h | 12 +- include/configs/whistler.h | 14 +- include/fdtdec.h | 12 +- include/serial.h | 2 +- mkconfig | 25 +++- spl/Makefile | 10 ++ 116 files changed, 793 insertions(+), 555 deletions(-) copy arch/arm/cpu/{armv7/tegra2 => arm720t/tegra20}/Makefile (56%) copy arch/arm/{include/asm/arch-tegra2 => cpu/arm720t/tegra20}/board.h (81%) copy arch/arm/cpu/{armv7/tegra2 => arm720t/tegra20}/config.mk (73%) rename arch/arm/cpu/{armv7/tegra2/ap20.c => arm720t/tegra20/cpu.c} (63%) copy arch/arm/{include/asm/arch-tegra2/ap20.h => cpu/arm720t/tegra20/cpu.h} (93%) create mode 100644 arch/arm/cpu/arm720t/tegra20/spl.c copy arch/arm/{include/asm/arch-tegra2/pmu.h => cpu/armv7/lowlevel_init.S} (57%) copy arch/arm/cpu/armv7/{tegra2 => tegra20}/Makefile (69%) rename arch/arm/cpu/armv7/{tegra2 => tegra20}/cmd_enterrcm.c (94%) rename arch/arm/cpu/armv7/{tegra2 => tegra20}/config.mk (74%) rename arch/arm/cpu/armv7/{tegra2 => tegra20}/usb.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/Makefile (66%) create mode 100644 arch/arm/cpu/tegra20-common/ap20.c rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/board.c (79%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/clock.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/crypto.c (100%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/crypto.h (100%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/emc.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/funcmux.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/lowlevel_init.S (100%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/pinmux.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/pmu.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/sys_info.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/timer.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/warmboot.c (95%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/warmboot_avp.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/warmboot_avp.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/ap20.h (98%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/apb_misc.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/board.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/clk_rst.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/clock.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/emc.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/flow.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/funcmux.h (97%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/fuse.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/gp_padctrl.h (98%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/gpio.h (99%) create mode 100644 arch/arm/include/asm/arch-tegra20/hardware.h rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/mmc.h (84%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/pinmux.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/pmc.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/pmu.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/scu.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/sdram_param.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/sys_proto.h (93%) rename arch/arm/include/asm/{arch-tegra2/tegra2.h => arch-tegra20/tegra20.h} (87%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/tegra_i2c.h (99%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/tegra_spi.h (96%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/timer.h (92%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/uart-spi-switch.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/uart.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/usb.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/warmboot.h (100%) rename board/avionic-design/dts/{tegra2-medcom.dts => tegra20-medcom.dts} (100%) rename board/avionic-design/dts/{tegra2-plutux.dts => tegra20-plutux.dts} (100%) rename board/avionic-design/dts/{tegra2-tec.dts => tegra20-tec.dts} (100%) rename board/compal/dts/{tegra2-paz00.dts => tegra20-paz00.dts} (100%) rename board/compulab/dts/{tegra2-trimslice.dts => tegra20-trimslice.dts} (100%) rename board/nvidia/dts/{tegra2-harmony.dts => tegra20-harmony.dts} (92%) rename board/nvidia/dts/{tegra2-seaboard.dts => tegra20-seaboard.dts} (100%) rename board/nvidia/dts/{tegra2-ventana.dts => tegra20-ventana.dts} (92%) rename board/nvidia/dts/{tegra2-whistler.dts => tegra20-whistler.dts} (94%) rename include/configs/{tegra2-common-post.h => tegra20-common-post.h} (74%) rename include/configs/{tegra2-common.h => tegra20-common.h} (84%)