From patchwork Wed Apr 17 16:37:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 237285 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7273A2C0180 for ; Thu, 18 Apr 2013 02:37:38 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F44F4A2DE; Wed, 17 Apr 2013 18:37:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R9Z9raCHnuEL; Wed, 17 Apr 2013 18:37:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 680A64A2E2; Wed, 17 Apr 2013 18:37:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 580904A2E2 for ; Wed, 17 Apr 2013 18:37:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8zteDY1PYix9 for ; Wed, 17 Apr 2013 18:37:13 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from aribaud.fr (aribaud.fr [82.235.144.2]) by theia.denx.de (Postfix) with ESMTPS id D51144A2DE for ; Wed, 17 Apr 2013 18:37:11 +0200 (CEST) Received: from lilith ([192.168.128.3]) by janus with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1USVM4-0006fl-7W; Wed, 17 Apr 2013 18:37:08 +0200 Date: Wed, 17 Apr 2013 18:37:06 +0200 From: Albert ARIBAUD To: Tom Rini Message-ID: <20130417183706.1f1aea93@lilith> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.13; x86_64-pc-linux-gnu) Mime-Version: 1.0 Cc: U-Boot Subject: [U-Boot] Pull request: u-boot-arm/master X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 Amicalement,