Message ID | CA+m5__LW4ZvuYKNgppGZc01UeowR56OiYDnLYzs7KG5sqZb4Fg@mail.gmail.com |
---|---|
State | Superseded |
Delegated to: | Albert ARIBAUD |
Headers | show |
Albert, Has this been pulled into ARM master? I don't think I saw a response from you, but I might have missed it. Thanks, Tom On Mon, Jul 30, 2012 at 1:07 PM, Tom Warren <twarren.nvidia@gmail.com> wrote: > Albert, > > Please pull u-boot-tegra/master into ARM master. Thanks! > > The following changes since commit f8f09dd40423b7f9ea0f0b810a8f5da9cd580a17: > Benoît Thébaudeau (1): > ARM1136: Fix cache range checks > > are available in the git repository at: > > git://git.denx.de/u-boot-tegra master > > Allen Martin (15): > 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: add support for SPL CPU > 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 > > MAINTAINERS | 18 ++-- > Makefile | 26 ++++ > arch/arm/cpu/arm720t/cpu.c | 2 + > arch/arm/cpu/arm720t/interrupts.c | 5 + > arch/arm/cpu/arm720t/start.S | 19 +++- > .../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 | 132 +++++++++++++++++ > arch/arm/cpu/armv7/start.S | 2 - > 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 > .../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/harmony.h | 14 +- > include/configs/medcom.h | 12 +- > 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 | 24 ++- > spl/Makefile | 10 ++ > 106 files changed, 742 insertions(+), 510 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/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%)
Hi Tom, On Fri, 3 Aug 2012 16:35:40 -0700, Tom Warren <twarren.nvidia@gmail.com> wrote: > Albert, > > Has this been pulled into ARM master? I don't think I saw a response > from you, but I might have missed it. Sorry Tom, but I have been unavailable for some time and especially on jul 30 and 31, so no, it has not been pulled in. :( I am pulling it in right now, but I have sparse access to Internet right now. > Thanks, > > Tom Amicalement,
Hi Albert, On Sun, 5 Aug 2012 21:46:21 +0200, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote: > Hi Tom, > > On Fri, 3 Aug 2012 16:35:40 -0700, Tom Warren <twarren.nvidia@gmail.com> wrote: > > Albert, > > > > Has this been pulled into ARM master? I don't think I saw a response > > from you, but I might have missed it. > > Sorry Tom, but I have been unavailable for some time and especially on jul 30 and 31, > so no, it has not been pulled in. :( > > I am pulling it in right now, but I have sparse access to Internet right now. Seems like f414d013c5e129e66c04ff699bd60b34894d3d38 breaks a lot of builds with the stock Ubuntu linaro toolchain, e.g. -------------------------------------------------------------------------------------- $ ./MAKEALL jornada Configuring for jornada board... make: *** [jornada_config] Error 1 arm-linux-gnueabi-size: './u-boot': No such file make: *** No rule to make target `include/autoconf.mk', needed by `depend'. Stop. make: *** Waiting for unfinished jobs.... --------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with warnings but no errors: 1 ( jornada ) ---------------------------------------------------------- -------------------------------------------------------------------------------------- The .MAKELOG is empty and the .ERR says: -------------------------------------------------------------------------------------- make: *** No rule to make target `include/autoconf.mk', needed by `depend'. Sto p. make: *** Waiting for unfinished jobs.... -------------------------------------------------------------------------------------- Amicalement,
Albert, On Sun, Aug 5, 2012 at 12:46 PM, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote: > Hi Tom, > > On Fri, 3 Aug 2012 16:35:40 -0700, Tom Warren <twarren.nvidia@gmail.com> wrote: >> Albert, >> >> Has this been pulled into ARM master? I don't think I saw a response >> from you, but I might have missed it. > > Sorry Tom, but I have been unavailable for some time and especially on jul 30 and 31, > so no, it has not been pulled in. :( No worries, just checking. Thanks. Tom > > I am pulling it in right now, but I have sparse access to Internet right now. > >> Thanks, >> >> Tom > > Amicalement, > -- > Albert.
On Mon, Aug 06, 2012 at 08:53:42AM -0700, Tom Warren wrote: > > Seems like f414d013c5e129e66c04ff699bd60b34894d3d38 breaks a lot of builds > > with the stock Ubuntu linaro toolchain, e.g. > > > > ---------------------------------------------------------------------------- > > ---------- > > > > $ ./MAKEALL jornada > > Configuring for jornada board... > > make: *** [jornada_config] Error 1 > > arm-linux-gnueabi-size: './u-boot': No such file > > make: *** No rule to make target `include/autoconf.mk', needed by `depend'. > > Stop. > > make: *** Waiting for unfinished jobs.... > > > > --------------------- SUMMARY ---------------------------- Boards compiled: > > 1 Boards with warnings but no errors: 1 ( jornada ) > > ---------------------------------------------------------- > > > > ---------------------------------------------------------------------------- > > ---------- > > > > The .MAKELOG is empty and the .ERR says: > > > > ---------------------------------------------------------------------------- > > ---------- > > make: *** No rule to make target `include/autoconf.mk', needed by `depend'. > > Sto p. > > make: *** Waiting for unfinished jobs.... > > ---------------------------------------------------------------------------- > > ---------- > > Here's my log using linaro 4.6.2 on my Ubuntu 10.04LTS dev system: > > $ arm-linux-gnueabi-gcc --version > arm-linux-gnueabi-gcc (Ubuntu/Linaro 4.6.2-14ubuntu2~ppa1) 4.6.2 > Copyright (C) 2011 Free Software Foundation, Inc. > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > > $ printenv CROSS_COMPILE > arm-linux-gnueabi- > > $ ./MAKEALL jornada > Configuring for jornada board... > text data bss dec hex filename > 131282 2724 4596 138602 21d6a ./u-boot > > --------------------- SUMMARY ---------------------------- > Boards compiled: 1 > ---------------------------------------------------------- > $ > > I don't see the same warning - in fact it builds fine. I always run an ARM MAKEALL before submitting a pull request, using my default (4.4.1) toolchain. > > Allen did the SPL work - adding him for comment. > I'm trying to reproduce now. f414d013c5e129e66c04ff699bd60b34894d3d38 only changes the generation of include/config.mk. When it fails does include/config.mk get generated and does it look correct? -Allen