Skip to contentSkip to conversation

u-boot-socfpga/master

GIT PULL Marek Vasut 2 participants 2 messages Nov 30, 2015

lore
Share & tools
lore
#0 lore raw

The following changes since commit fa8883a1e39a20e72aaa5093af0c80062cb95757:

Merge branch 'master' of git://git.denx.de/u-boot-i2c (2015-11-27 08:41:03
-0500)

are available in the git repository at:

git://git.denx.de/u-boot-socfpga.git

for you to fetch changes up to 486f4fa98c65baa6d70008ceb2d93ac0f8f7bd96:

arm: socfpga: Remove fsloadcmd from environment (2015-11-30 13:30:19 +0100)

----------------------------------------------------------------
Chin Liang See (3):
mmc: socfpga_dw_mmc: Move drvsel and smplsel to dts
arm: socfpga: dts: Adding drvsel and smplsel to dts
arm: socfpga: Remove fsloadcmd from environment

Dinh Nguyen (2):
ARM: socfpga: arria10: add base address map for Arria10
ARM: socfpga: rename the cyclone5 and arria5 base address file

Marek Vasut (1):
arm: socfpga: Repair SoCrates board

Philipp Rosenberger (1):
arm: socfpga: reset: FIX address of tstscratch register

arch/arm/dts/socfpga_arria5.dtsi |
2 +
arch/arm/dts/socfpga_cyclone5.dtsi |
2 +
arch/arm/dts/socfpga_cyclone5_socrates.dts |
5 +
arch/arm/mach-socfpga/Kconfig |
7 +
arch/arm/mach-socfpga/include/mach/base_addr_a10.h |
45 +++++
arch/arm/mach-socfpga/include/mach/{socfpga_base_addrs.h => base_addr_ac5.h} |
0
arch/arm/mach-socfpga/include/mach/reset_manager.h |
1 +
board/ebv/socrates/MAINTAINERS |
6 +
board/ebv/socrates/Makefile |
9 +
board/ebv/socrates/qts/iocsr_config.h |
660 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
board/ebv/socrates/qts/pinmux_config.h |
219 ++++++++++++++++++++
board/ebv/socrates/qts/pll_config.h |
85 ++++++++
board/ebv/socrates/qts/sdram_config.h |
341 ++++++++++++++++++++++++++++++++
board/ebv/socrates/socfpga.c |
85 ++++++++
configs/socfpga_socrates_defconfig |
3 +-
drivers/mmc/socfpga_dw_mmc.c |
29 ++-
include/configs/socfpga_arria5_socdk.h |
3 +-
include/configs/socfpga_common.h |
2 -
include/configs/socfpga_cyclone5_socdk.h |
3 +-
include/configs/socfpga_de0_nano_soc.h |
3 +-
include/configs/socfpga_mcvevk.h |
2 +-
include/configs/socfpga_sockit.h |
3 +-
include/configs/socfpga_socrates.h |
95 +++++++++

 23 files changed, 1590 insertions(+), 20 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/base_addr_a10.h
 rename arch/arm/mach-socfpga/include/mach/{socfpga_base_addrs.h => 
base_addr_ac5.h} (100%)
 create mode 100644 board/ebv/socrates/MAINTAINERS
 create mode 100644 board/ebv/socrates/Makefile
 create mode 100644 board/ebv/socrates/qts/iocsr_config.h
 create mode 100644 board/ebv/socrates/qts/pinmux_config.h
 create mode 100644 board/ebv/socrates/qts/pll_config.h
 create mode 100644 board/ebv/socrates/qts/sdram_config.h
 create mode 100644 board/ebv/socrates/socfpga.c
 create mode 100644 include/configs/socfpga_socrates.h
#1 lore raw
Quoted 5 lines · Marek Vasut

The following changes since commit fa8883a1e39a20e72aaa5093af0c80062cb95757:

Merge branch 'master' of git://git.denx.de/u-boot-i2c (2015-11-27 08:41:03
-0500)

Quoted 8 lines

are available in the git repository at:

git://git.denx.de/u-boot-socfpga.git

for you to fetch changes up to 486f4fa98c65baa6d70008ceb2d93ac0f8f7bd96:

arm: socfpga: Remove fsloadcmd from environment (2015-11-30 13:30:19 +0100)

Applied to u-boot/master, thanks!

Signature · 8 lines
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/20151130/8d2a72a8/attachment.sig>