From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PULL] u-boot-socfpga/topic/arm/socfpga-20141006
Date: Mon, 6 Oct 2014 20:28:26 -0400 [thread overview]
Message-ID: <20141007002826.GF25506@bill-the-cat> (raw)
In-Reply-To: <201410061752.23411.marex@denx.de>
On Mon, Oct 06, 2014 at 05:52:23PM +0200, Marek Vasut wrote:
> Hi Tom,
>
> this depends on the previous five pull requests, as can be seen below. I merged
> the five branches and based this PR on top of the merge, I hope that's OK.
>
> The following changes since commit 77fa164839048609e0379f4f2f276a5d6892a0eb:
>
> Merge branches 'topic/drivers/fpga-20141006', 'topic/drivers/mmc-20141006',
> 'topic/drivers/net-20141006', 'topic/tools/mkimage-20141006' and
> 'topic/arm/cache-20141006' into HEAD (2014-10-06 17:45:55 +0200)
>
> are available in the git repository at:
>
>
> git://git.denx.de/u-boot-socfpga.git topic/arm/socfpga-20141006
>
> for you to fetch changes up to 2f210639c4f003b0d5310273979441f1bfc88eae:
>
> arm: socfpga: Use CMD_FS_GENERIC (2014-10-06 17:46:51 +0200)
>
> ----------------------------------------------------------------
> Chin Liang See (2):
> arm: socfpga: Enable DWMMC for SOCFPGA
> arm: socfpga: Enable SDMMC boot for SOCFPGA U-Boot
>
> Marek Vasut (23):
> arm: socfpga: Clean up base address file
> arm: socfpga: sysmgr: Clean up system manager
> arm: socfpga: clock: Implant order into bit definitions
> arm: socfpga: clock: Drop nonsense inlining from clock manager code
> arm: socfpga: clock: Add missing stubs into board file
> arm: socfpga: clock: Trim down code duplication
> arm: socfpga: clock: Clean up bit definitions
> arm: socfpga: clock: Sync with reference code
> arm: socfpga: timer: Pull the timer reload value from config file
> arm: socfpga: reset: Add EMAC reset functions
> arm: socfpga: board: Align checkboard() output
> arm: socfpga: reset: Add function to reset FPGA bridges
> arm: socfpga: sysmgr: Add FPGA bits into system manager
> arm: socfpga: cache: Define cacheline size
> arm: socfpga: cache: Enable D-Cache
> arm: socfpga: cache: Enable PL310 L2 cache
> arm: socfpga: scu: Add SCU register file
> arm: socfpga: nic301: Add NIC-301 GPV register file
> arm: socfpga: pl310: Map SDRAM to 0x0
> arm: socfpga: Move cache_enable to CPU code
> arm: socfpga: Add command to control HPS-FPGA bridges
> arm: socfpga: Clean up SoCFPGA configuration
> arm: socfpga: Use CMD_FS_GENERIC
>
> Pavel Machek (11):
> arm: socfpga: Complete the list of base addresses
> arm: socfpga: Add watchdog disable for socfpga
> arm: socfpga: clock: Add code to read clock configuration
> arm: socfpga: mmc: Pick the clock from clock manager
> arm: socfpga: misc: Add proper ethernet initialization
> arm: socfpga: misc: Add SD controller init
> arm: socfpga: misc: Align print_cpuinfo() output
> arm: socfpga: board: Correctly set ATAG position
> arm: socfpga: fpga: Add SoCFPGA FPGA programming interface
> arm: socfpga: nic301: Add NIC-301 configuration code
> arm: socfpga: Split SoCFPGA configuration
>
> arch/arm/cpu/armv7/socfpga/Makefile | 3 +-
> arch/arm/cpu/armv7/socfpga/clock_manager.c | 340
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
> arch/arm/cpu/armv7/socfpga/fpga_manager.c | 78
> +++++++++++++++++++
> arch/arm/cpu/armv7/socfpga/misc.c | 236
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
> arch/arm/cpu/armv7/socfpga/reset_manager.c | 67 +++++++++++++++++
> arch/arm/cpu/armv7/socfpga/spl.c | 174
> ++++++++++++++++++++++++------------------
> arch/arm/cpu/armv7/socfpga/system_manager.c | 57 ++++++++++++--
> arch/arm/cpu/armv7/socfpga/timer.c | 2 +
> arch/arm/include/asm/arch-socfpga/clock_manager.h | 306
> ++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
> arch/arm/include/asm/arch-socfpga/fpga_manager.h | 77
> +++++++++++++++++++
> arch/arm/include/asm/arch-socfpga/nic301.h | 195
> ++++++++++++++++++++++++++++++++++++++++++++++++
> arch/arm/include/asm/arch-socfpga/reset_manager.h | 9 +++
> arch/arm/include/asm/arch-socfpga/scu.h | 23 ++++++
> arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h | 62 ++++++++++++---
> arch/arm/include/asm/arch-socfpga/system_manager.h | 111
> ++++++++++++++++++++-------
> board/altera/socfpga/pll_config.h | 3 +
> board/altera/socfpga/socfpga_cyclone5.c | 6 +-
> drivers/fpga/Makefile | 1 +
> drivers/fpga/altera.c | 3 +
> drivers/fpga/socfpga.c | 301
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> drivers/mmc/socfpga_dw_mmc.c | 15 +++-
> include/altera.h | 6 ++
> include/configs/socfpga_common.h | 196
> ++++++++++++++++++++++++++++++++++++++++++++++++
> include/configs/socfpga_cyclone5.h | 316
> ++++++++++++++++-------------------------------------------------------------
> 24 files changed, 2018 insertions(+), 569 deletions(-)
> create mode 100644 arch/arm/cpu/armv7/socfpga/fpga_manager.c
> create mode 100644 arch/arm/include/asm/arch-socfpga/fpga_manager.h
> create mode 100644 arch/arm/include/asm/arch-socfpga/nic301.h
> create mode 100644 arch/arm/include/asm/arch-socfpga/scu.h
> create mode 100644 drivers/fpga/socfpga.c
> create mode 100644 include/configs/socfpga_common.h
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141006/b930a4b3/attachment.pgp>
prev parent reply other threads:[~2014-10-07 0:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-06 15:52 [U-Boot] [PULL] u-boot-socfpga/topic/arm/socfpga-20141006 Marek Vasut
2014-10-07 0:28 ` Tom Rini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141007002826.GF25506@bill-the-cat \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.