From patchwork Tue Nov 29 22:53:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 128353 X-Patchwork-Delegate: albert.aribaud@free.fr 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 8405DB6F62 for ; Wed, 30 Nov 2011 09:53:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD89B2828A; Tue, 29 Nov 2011 23:53:30 +0100 (CET) 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 fFeVpP+NsFTQ; Tue, 29 Nov 2011 23:53:30 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DCC9628389; Tue, 29 Nov 2011 23:53:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9193728389 for ; Tue, 29 Nov 2011 23:53:22 +0100 (CET) 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 q9GojbMsTq84 for ; Tue, 29 Nov 2011 23:53:19 +0100 (CET) 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 mail-qw0-f51.google.com (mail-qw0-f51.google.com [209.85.216.51]) by theia.denx.de (Postfix) with ESMTPS id 3AD752828A for ; Tue, 29 Nov 2011 23:53:17 +0100 (CET) Received: by qadb10 with SMTP id b10so2218698qad.3 for ; Tue, 29 Nov 2011 14:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; bh=PiwIPdixJ5+JHX+9CdsTpOi6hAo7N6C+oB/TS/4vnCw=; b=jzy+/Dpuo9cBqUQ5kcRgKL4x7cRPMb8itfq3mzVISPC3F6ehE66xHihYhFiGttSRl0 uAGo4/7qZnRPQ+TeTYia2uXiDntYytnSdEy8xGcO4xhennkKUy/1C5A9LrRZzYcX8YnY 9KFHfQy9sspbI47sKFFPoyKL7075BB3HXyZSE= MIME-Version: 1.0 Received: by 10.224.189.78 with SMTP id dd14mr669607qab.31.1322607196499; Tue, 29 Nov 2011 14:53:16 -0800 (PST) Received: by 10.229.94.72 with HTTP; Tue, 29 Nov 2011 14:53:16 -0800 (PST) Date: Tue, 29 Nov 2011 15:53:16 -0700 Message-ID: From: Tom Rini To: u-boot@lists.denx.de, Albert ARIBAUD Subject: [U-Boot] Please pull u-boot-ti/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 The following changes since commit f2695a272849764cda09bcce6f86d03105e9e46d: Marek Vasut (1): PXA: Drop XM250 board are available in the git repository at: git://git.denx.de/u-boot-ti.git master Anatolij Gustschin (1): ARM: davinci_dm6467Tevm: Fix build breakage Aneesh V (13): armv7: disable L2 cache in cleanup_before_linux() armv7: include armv7/cpu.c in SPL build armv7: setup vector start.S: remove omap3 specific code from start.S omap: Improve PLL parameter calculation tool omap4: ttyO2 instead of ttyS2 in default bootargs omap: fix cache line size for omap3/omap4 boards omap4460: fix TPS initialization omap: remove I2C from SPL omap4: emif: fix error in driver omap4460: add ES1.1 identification omap4+: streamline CONFIG_SYS_TEXT_BASE and other SDRAM addresses omap4: fix IO setting Christian Riesch (8): arm, davinci: Move pinmux functions from board to arch tree arm, hawkboard: Remove obsolete struct pinmux_config i2c_pins arm, da850evm: Do pinmux configuration for EMAC together with other pinmuxes arm, da850: Add pinmux configurations to the arch tree arm, da850evm: Use the pinmux configurations defined in the arch tree arm, hawkboard: Use the pinmux configurations defined in the arch tree arm, davinci: Remove duplication of pinmux configuration code arm: printf() is not available in some SPL configurations Heiko Schocher (6): arm, arm926ejs: always do cpu critical inits arm, davinci: move davinci_rtc struct to hardware.h arm, davinci, da850: add uart1 tx rx pinmux config arm, board/davinci/common/misc.c: Codingstyle cleanup arm, davinci: move misc function in arch tree arm, davinci: add support for am1808 based enbw_cmc board Ilya Yanok (10): davinci_emac: move arch-independent defines to separate header davinci_emac: use internal addresses in buffer descriptors davinci_emac: conditionally compile specific PHY support arm926ejs: add noop implementation for dcache ops davinci_emac: fix for running with dcache enabled davinci_emac: hardcode 100Mbps for AM35xx and RMII AM35xx: add EMAC support AM3517: move AM3517 specific mux defines to generic header nand_spl_simple: add support for software ECC omap_gpmc: use SOFTECC in SPL if it's enabled Koen Kooi (1): BeagleBoard: config: Really switch to ttyO2 Prabhakar Lad (1): ARM: davici_emac: Fix condition for number of phy detects Thomas Weber (3): ARM: OMAP3: Remove unused define CONFIG_OMAP3430 ARM: OMAP3: Remove unused define SDRC_R_C_B ARM: OMAP: Remove STACKSIZE for IRQ and FIQ if unused Tom Rini (15): omap3: mem: Comment enable_gpmc_cs_config more OMAP3: Update SDRC dram_init to always call make_cs1_contiguous() OMAP3: Add a helper function to set timings in SDRC OMAP3: Change mem_ok to clear again after reading back OMAP3: Remove get_mem_type prototype omap3: mem: Add MCFG helper macro OMAP3: Add optimal SDRC autorefresh control values OMAP3: Suffix all Micron memory timing parts with their speed OMAP3 SPL: Rework memory initalization and devkit8000 support OMAP3 SPL: Add identify_nand_chip function OMAP3: Add SPL support to Beagleboard OMAP3: Add SPL support to omap3_evm AM3517: Add SPL support AM3517 CraneBoard: Add SPL support OMAP3: Add SPL_BOARD_INIT hook MAINTAINERS | 1 + arch/arm/cpu/arm926ejs/Makefile | 2 +- arch/arm/cpu/arm926ejs/cache.c | 75 +++ arch/arm/cpu/arm926ejs/davinci/Makefile | 3 +- arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 36 +- arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c | 171 ++++++ arch/arm/cpu/arm926ejs/davinci/dp83848.c | 1 + arch/arm/cpu/arm926ejs/davinci/et1011c.c | 1 + arch/arm/cpu/arm926ejs/davinci/ksz8873.c | 1 + arch/arm/cpu/arm926ejs/davinci/lxt972.c | 1 + .../arm/cpu/arm926ejs/davinci}/misc.c | 19 +- .../arm/cpu/arm926ejs/davinci/pinmux.c | 0 arch/arm/cpu/arm926ejs/start.S | 6 +- arch/arm/cpu/armv7/Makefile | 4 +- arch/arm/cpu/armv7/cpu.c | 1 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 8 - arch/arm/cpu/armv7/omap-common/emif-common.c | 4 +- arch/arm/cpu/armv7/omap-common/spl.c | 5 +- arch/arm/cpu/armv7/omap3/Makefile | 4 + arch/arm/cpu/armv7/omap3/board.c | 5 + arch/arm/cpu/armv7/omap3/emac.c | 44 ++ arch/arm/cpu/armv7/omap3/lowlevel_init.S | 8 + arch/arm/cpu/armv7/omap3/mem.c | 13 +- arch/arm/cpu/armv7/omap3/sdrc.c | 145 +++--- arch/arm/cpu/armv7/omap3/spl_id_nand.c | 87 +++ arch/arm/cpu/armv7/omap4/hwinit.c | 17 +- arch/arm/cpu/armv7/start.S | 38 +- arch/arm/include/asm/arch-davinci/emac_defs.h | 289 ---------- arch/arm/include/asm/arch-davinci/hardware.h | 41 ++ arch/arm/include/asm/arch-davinci/pinmux_defs.h | 51 ++ arch/arm/include/asm/arch-omap3/am35x_def.h | 3 + arch/arm/include/asm/arch-omap3/emac_defs.h | 56 ++ arch/arm/include/asm/arch-omap3/mem.h | 156 ++++-- arch/arm/include/asm/arch-omap3/mux.h | 41 ++ arch/arm/include/asm/arch-omap3/omap3.h | 1 + arch/arm/include/asm/arch-omap3/sys_proto.h | 4 +- arch/arm/include/asm/arch-omap4/omap.h | 2 + arch/arm/include/asm/omap_common.h | 5 + arch/arm/lib/eabi_compat.c | 2 + board/ait/cam_enc_4xx/cam_enc_4xx.c | 15 - board/davinci/da8xxevm/da830evm.c | 2 - board/davinci/da8xxevm/da850evm.c | 159 +----- board/davinci/da8xxevm/hawkboard_nand_spl.c | 59 +-- board/davinci/ea20/ea20.c | 2 - board/{davinci/common => enbw/enbw_cmc}/Makefile | 12 +- board/enbw/enbw_cmc/enbw_cmc.c | 607 ++++++++++++++++++++ board/logicpd/am3517evm/am3517evm.c | 2 +- board/logicpd/am3517evm/am3517evm.h | 40 -- board/logicpd/am3517evm/config.mk | 30 - board/ti/am3517crane/am3517crane.c | 2 +- board/ti/am3517crane/am3517crane.h | 39 -- board/ti/am3517crane/config.mk | 29 - board/ti/beagle/beagle.c | 71 +++- board/ti/beagle/config.mk | 33 -- board/ti/evm/config.mk | 33 -- board/ti/evm/evm.c | 41 ++- board/ti/panda/panda_mux_data.h | 2 +- board/ti/sdp4430/sdp.c | 7 + board/ti/sdp4430/sdp4430_mux_data.h | 6 +- board/timll/devkit8000/devkit8000.c | 21 + boards.cfg | 1 + drivers/mtd/nand/nand_ecc.c | 2 +- drivers/mtd/nand/nand_spl_simple.c | 11 +- drivers/mtd/nand/omap_gpmc.c | 4 +- drivers/net/davinci_emac.c | 94 +++- drivers/net/davinci_emac.h | 315 ++++++++++ drivers/rtc/davinci.c | 26 - include/configs/am3517_crane.h | 64 ++- include/configs/am3517_evm.h | 64 ++- include/configs/apollon.h | 4 - include/configs/cm_t35.h | 8 - include/configs/da850_am18xxevm.h | 1 + include/configs/da850evm.h | 1 + include/configs/davinci_dm6467Tevm.h | 1 + include/configs/devkit8000.h | 14 +- include/configs/dig297.h | 4 - include/configs/enbw_cmc.h | 451 +++++++++++++++ include/configs/hawkboard.h | 1 + include/configs/igep0020.h | 4 - include/configs/igep0030.h | 4 - include/configs/omap3_beagle.h | 71 ++- include/configs/omap3_evm.h | 35 ++- include/configs/omap3_evm_common.h | 41 +- include/configs/omap3_evm_quick_mmc.h | 10 + include/configs/omap3_evm_quick_nand.h | 22 + include/configs/omap3_mvblx.h | 10 +- include/configs/omap3_overo.h | 10 +- include/configs/omap3_pandora.h | 10 +- include/configs/omap3_sdp3430.h | 10 +- include/configs/omap3_zoom1.h | 10 +- include/configs/omap3_zoom2.h | 10 +- include/configs/omap4_common.h | 20 +- include/configs/omap5_evm.h | 19 +- nand_spl/board/davinci/da8xxevm/Makefile | 20 +- tools/omap/clocks_get_m_n.c | 187 +++--- 95 files changed, 2923 insertions(+), 1199 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/cache.c create mode 100644 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c rename {board/davinci/common => arch/arm/cpu/arm926ejs/davinci}/misc.c (90%) rename board/davinci/common/davinci_pinmux.c => arch/arm/cpu/arm926ejs/davinci/pinmux.c (100%) create mode 100644 arch/arm/cpu/armv7/omap3/emac.c create mode 100644 arch/arm/cpu/armv7/omap3/spl_id_nand.c create mode 100644 arch/arm/include/asm/arch-davinci/pinmux_defs.h create mode 100644 arch/arm/include/asm/arch-omap3/emac_defs.h rename board/{davinci/common => enbw/enbw_cmc}/Makefile (88%) create mode 100644 board/enbw/enbw_cmc/enbw_cmc.c delete mode 100644 board/logicpd/am3517evm/config.mk delete mode 100644 board/ti/am3517crane/config.mk delete mode 100644 board/ti/beagle/config.mk delete mode 100644 board/ti/evm/config.mk create mode 100644 drivers/net/davinci_emac.h create mode 100644 include/configs/enbw_cmc.h