Skip to contentSkip to conversation

u-boot-socfpga/master

GIT PULL Marek Vasut 2 participants 2 messages Apr 29, 2015

lore
Share & tools
lore
#0 lore raw

The following changes since commit 1733259d25015c28c47990ec11af99b3f62f811c:

Merge branch 'master' of git://git.denx.de/u-boot-video (2015-04-20 09:13:52
-0400)

are available in the git repository at:

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

for you to fetch changes up to e5c57eea4f4ac8c27343bde137b069ef816e69d7:

socfpga: implement arria V socdk SPI flash config in dts (2015-04-27 03:08:43
+0200)

----------------------------------------------------------------
Dinh Nguyen (15):
arm: socfpga: spl: Add CONFIG_SPL_MAX_SIZE to be 64KB
arm: socfpga: add functions to bring sdram, timer, and uart out of reset
arm: socfpga: spl: enable sdram, timer and uart
arm: socfpga: spl: Add call to timer_init
arm: socfpga: spl: allow bootrom to enable IOs after warm reset
arm: socfpga: spl: add sdram init and calibration
arm: socfpga: spl: printout sdram size
arm: socfpga: spl: Use common lowlevel_init
arm: socfpga: spl: add CONFIG_SPL_STACK to socfpga_common.h
arm: socfpga: spl: Adjust the SYS_INIT_RAM_SIZE to have room for the spl
malloc
arm: socfpga: spl: Add SDRAM check
arm: socfpga: fix uart0 pin mux configuration
arm: socfpga: spl: Add s_init stub
arm: socfpga: spl: add board_init_f to SPL
arm: socfpga: spl: update peripheral pll for dev kit

Marek Vasut (3):
spi: Add Designware SPI controller Kconfig entry
spi: Add Cadence QSPI controller Kconfig entry
arm: socfpga: spl: Add stub sdram.h

Pavel Machek (2):
socfpga: implement socdk SPI flash config in dts
socfpga: implement arria V socdk SPI flash config in dts

 arch/arm/cpu/armv7/Makefile                        |  2 +-                                                                                       
 arch/arm/cpu/armv7/socfpga/Makefile                |  1 -                                                                                        
 arch/arm/cpu/armv7/socfpga/lowlevel_init.S         | 45 
---------------------------------------------                                            
 arch/arm/cpu/armv7/socfpga/reset_manager.c         | 24 
++++++++++++++++++++++++                                                                 
 arch/arm/cpu/armv7/socfpga/spl.c                   | 61 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                            
 arch/arm/cpu/armv7/socfpga/system_manager.c        |  9 +++++++++                                                                                
 arch/arm/dts/socfpga_arria5_socdk.dts              | 24 
++++++++++++++++++++++++
 arch/arm/dts/socfpga_cyclone5_socdk.dts            | 24 
++++++++++++++++++++++++
 arch/arm/include/asm/arch-socfpga/reset_manager.h  |  6 ++++++
 arch/arm/include/asm/arch-socfpga/sdram.h          | 19 +++++++++++++++++++
 arch/arm/include/asm/arch-socfpga/system_manager.h |  1 +
 board/altera/socfpga/pinmux_config.c               |  4 ++--
 board/altera/socfpga/pll_config.h                  |  2 +-
 board/altera/socfpga/socfpga.c                     |  2 ++
 drivers/spi/Kconfig                                | 16 ++++++++++++++++
 include/configs/socfpga_common.h                   |  8 +++++++-
 16 files changed, 197 insertions(+), 51 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/socfpga/lowlevel_init.S
 create mode 100644 arch/arm/include/asm/arch-socfpga/sdram.h
#1 lore raw
Quoted 5 lines · Marek Vasut

The following changes since commit 1733259d25015c28c47990ec11af99b3f62f811c:

Merge branch 'master' of git://git.denx.de/u-boot-video (2015-04-20 09:13:52
-0400)

Quoted 9 lines

are available in the git repository at:

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

for you to fetch changes up to e5c57eea4f4ac8c27343bde137b069ef816e69d7:

socfpga: implement arria V socdk SPI flash config in dts (2015-04-27 03:08:43
+0200)

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/20150429/9cc3450f/attachment.sig>