On Wed, Apr 17, 2013 at 06:37:06PM +0200, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > c4a4e2e20ca226948b62ed116df98f7a3932f2ac: > > ARMv7: start.S: stay in HYP mode if u-boot is entered in it > (2013-04-15 18:30:59 +0200) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to f2e8a87305a55652488af140adcf65b1e688f287: > > exynos: fdt: Add TMU node for snow (2013-04-17 10:00:44 +0900) > > Note: there is a trivial merge conflict for > include/configs/exynos5250-dt.h: > > ++<<<<<<< HEAD > +/* USB boot mode */ > +#define EXYNOS_COPY_USB_FNPTR_ADDR 0x02020070 > +#define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002 > +#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018 > ++======= > + /* TPM */ > + #define CONFIG_TPM > + #define CONFIG_CMD_TPM > + #define CONFIG_INFINEON_TPM_I2C > + #define CONFIG_INFINEON_TPM_I2C_BUS 3 > + #define CONFIG_INFINEON_TPM_I2C_ADDR 0x20 > ++>>>>>>> u-boot/master > > ---------------------------------------------------------------- > Simon Glass (2): > exynos: Correct use of 64-bit division > exynos: fdt: Add TMU node for snow > > Stephen Warren (1): > ARM: tegra: support T33 SKU of Tegra30 > > Thierry Reding (4): > Tegra: All Tamonten-derived boards use onboard NAND > Tegra: Medcom-Wide: Enable NAND and boot script support > Tegra: Plutux: Enable NAND and boot script support > Tegra: TEC: Enable boot script support > > Tom Warren (7): > Tegra: enable verify support for the crc32 command > Tegra: Restore cp15 VBAR _start vector write for ARMv7 > Tegra: Configure L2 cache control reg properly. > Tegra114: Initialize System Counter (TSC) with osc frequency > Tegra: Fix MSELECT clock divisors for T30/T114. > Tegra: Split tegra_get_chip_type() into soc & sku funcs > Tegra: T30: Beaver board support. > > Vivek Gautam (1): > Exynos5: Add support for USB download boot mode > > MAINTAINERS | 1 + > arch/arm/cpu/arm720t/tegra-common/cpu.c | 48 ++++++++------- > arch/arm/cpu/arm720t/tegra-common/cpu.h | 4 +- > arch/arm/cpu/arm720t/tegra114/cpu.c | 10 ++-- > arch/arm/cpu/arm720t/tegra30/cpu.c | 4 +- > arch/arm/cpu/armv7/s5p-common/timer.c | 7 ++- > arch/arm/cpu/armv7/start.S | 2 - > arch/arm/cpu/tegra-common/Makefile | 2 +- > arch/arm/cpu/tegra-common/ap.c | 53 +++++++++++------ > arch/arm/cpu/tegra-common/cache.c | 48 +++++++++++++++ > arch/arm/cpu/tegra-common/clock.c | 3 + > arch/arm/cpu/tegra114-common/clock.c | 22 +++++++ > arch/arm/cpu/tegra20-common/clock.c | 4 ++ > arch/arm/cpu/tegra20-common/pmu.c | 4 +- > arch/arm/cpu/tegra30-common/clock.c | 4 ++ > arch/arm/include/asm/arch-tegra/ap.h | 21 ++++++- > arch/arm/include/asm/arch-tegra/clock.h | 3 + > arch/arm/include/asm/arch-tegra/tegra.h | 1 + > arch/arm/include/asm/arch-tegra114/sysctr.h | 35 +++++++++++ > arch/arm/include/asm/arch-tegra114/tegra.h | 1 + > board/avionic-design/dts/tegra20-tamonten.dtsi | 11 ++++ > board/avionic-design/dts/tegra20-tec.dts | 11 ---- > board/nvidia/common/emc.c | 2 +- > board/nvidia/dts/tegra30-beaver.dts | 71 > ++++++++++++++++++++++ board/samsung/dts/exynos5250-snow.dts > | 14 +++++ board/samsung/smdk5250/spl_boot.c | 40 > ++++++++++++- boards.cfg | 1 + > include/configs/beaver.h | 76 > ++++++++++++++++++++++++ > include/configs/exynos5250-dt.h | 5 ++ > include/configs/medcom-wide.h | 21 ++++--- > include/configs/plutux.h | 18 +++--- > include/configs/tec.h | 10 +--- > include/configs/tegra-common.h | 2 + 33 files > changed, 467 insertions(+), 92 deletions(-) create mode 100644 > arch/arm/cpu/tegra-common/cache.c create mode 100644 > arch/arm/include/asm/arch-tegra114/sysctr.h create mode 100644 > board/nvidia/dts/tegra30-beaver.dts create mode 100644 > include/configs/beaver.h
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot