Pull request: socfpga-next
mbox series

Message ID CAAh8qsxVGteV+aRws+_BaR-AVWP8wb0ysA4f3YLkPE1xEV4uOA@mail.gmail.com
State New
Delegated to: Marek Vasut
Headers show
Series
  • Pull request: socfpga-next
Related show

Pull-request

https://github.com/goldsimon/u-boot.git socfpga-next

Message

Simon Goldschmidt Dec. 9, 2019, 8:09 a.m. UTC
The following changes since commit b38c3a641fc01fcd4eda5fa107ae3c247baa0196:

  Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
(2019-12-08 10:51:00 -0500)

are available in the git repository at:

  https://github.com/goldsimon/u-boot.git socfpga-next

for you to fetch changes up to ed2d3002c23d1c5632a03a64676102f0445d627e:

  arm: socfpga: agilex: Enable Agilex SoC build (2019-12-09 08:49:51 +0100)

----------------------------------------------------------------
Ley Foon Tan (24):
      spl: Allow cache drivers to be used in SPL
      arm: dts: socfpga: Add u-boot, dm-pre-reloc for sysmgr and clkmgr nodes
      arm: socfpga: Convert reset manager from struct to defines
      arm: socfpga: Convert system manager from struct to defines
      arm: socfpga: Convert clock manager from struct to defines
      arm: socfpga: agilex: Add base address for Intel Agilex SoC
      arm: socfpga: Move firewall code to firewall file
      arm: socfpga: Move Stratix10 and Agilex reset manager common code
      arm: socfpga: agilex: Add reset manager support
      arm: socfpga: Move Stratix10 and Agilex system manager common code
      arm: socfpga: agilex: Add system manager support
      arm: socfpga: Move Stratix10 and Agilex clock manager common code
      arm: socfpga: Fix CLKMGR_INTOSC_HZ to 400MHz
      clk: agilex: Add clock driver for Agilex
      arm: socfpga: agilex: Add clock wrapper functions
      cache: Add Arteris Ncore cache coherent unit driver
      arm: agilex: Add clock handoff offset for Agilex
      ddr: altera: Restructure Stratix 10 SDRAM driver
      ddr: altera: agilex: Add SDRAM driver for Agilex
      board: intel: agilex: Add socdk board support for Intel Agilex SoC
      arm: socfpga: agilex: Add SPL for Agilex SoC
      arm: dts: agilex: Add base dtsi and devkit dts
      configs: socfpga: Move Stratix10 and Agilex common CONFIGs
      arm: socfpga: agilex: Enable Agilex SoC build

 arch/arm/Kconfig                                                  |   4 +-
 arch/arm/dts/Makefile                                             |   1 +
 arch/arm/dts/socfpga-common-u-boot.dtsi                           |   8 +
 arch/arm/dts/socfpga.dtsi                                         |   2 +-
 arch/arm/dts/socfpga_agilex-u-boot.dtsi                           |
96 +++++++++++
 arch/arm/dts/socfpga_agilex.dtsi                                  |
622 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi                     |  39 +++++
 arch/arm/dts/socfpga_agilex_socdk.dts                             |
141 +++++++++++++++
 arch/arm/dts/socfpga_arria10.dtsi                                 |   2 +-
 arch/arm/dts/socfpga_arria10_socdk.dtsi                           |   8 +
 arch/arm/dts/socfpga_stratix10.dtsi                               |   2 +-
 arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi                  |   8 +
 arch/arm/mach-socfpga/Kconfig                                     |  16 ++
 arch/arm/mach-socfpga/Makefile                                    |  17 ++
 arch/arm/mach-socfpga/clock_manager.c                             |  14 +-
 arch/arm/mach-socfpga/clock_manager_agilex.c                      |
85 ++++++++++
 arch/arm/mach-socfpga/clock_manager_arria10.c                     |
155 +++++++++--------
 arch/arm/mach-socfpga/clock_manager_gen5.c                        |
211 +++++++++++++----------
 arch/arm/mach-socfpga/clock_manager_s10.c                         |
218 ++++++++++++++----------
 arch/arm/mach-socfpga/firewall.c                                  |
107 ++++++++++++
 arch/arm/mach-socfpga/include/mach/base_addr_s10.h                |   4 +
 arch/arm/mach-socfpga/include/mach/clock_manager.h                |   4 +
 arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h         |  14 ++
 arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h        |
133 ++++++---------
 arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h           |
112 +++++-------
 arch/arm/mach-socfpga/include/mach/clock_manager_s10.h            |
131 ++++++--------
 arch/arm/mach-socfpga/include/mach/clock_manager_soc64.h          |  21 +++
 arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} |  10 +-
 arch/arm/mach-socfpga/include/mach/handoff_s10.h                  |   9 +-
 arch/arm/mach-socfpga/include/mach/misc.h                         |   1 +
 arch/arm/mach-socfpga/include/mach/reset_manager.h                |   7 +-
 arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h        |  43 +----
 arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h           |  22 +--
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h            |
118 -------------
 arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h          |  38 +++++
 arch/arm/mach-socfpga/include/mach/system_manager.h               |   7 +-
 arch/arm/mach-socfpga/include/mach/system_manager_arria10.h       |
94 +++-------
 arch/arm/mach-socfpga/include/mach/system_manager_gen5.h          |
123 +++-----------
 arch/arm/mach-socfpga/include/mach/system_manager_s10.h           |
176 -------------------
 arch/arm/mach-socfpga/include/mach/system_manager_soc64.h         |
123 ++++++++++++++
 arch/arm/mach-socfpga/mailbox_s10.c                               |   6 +-
 arch/arm/mach-socfpga/misc.c                                      |
66 ++++++++
 arch/arm/mach-socfpga/misc_arria10.c                              |  11 +-
 arch/arm/mach-socfpga/misc_gen5.c                                 |  38 +++--
 arch/arm/mach-socfpga/misc_s10.c                                  |   9 +-
 arch/arm/mach-socfpga/reset_manager_arria10.c                     |
73 ++++----
 arch/arm/mach-socfpga/reset_manager_gen5.c                        |  37 ++--
 arch/arm/mach-socfpga/reset_manager_s10.c                         |  56 +++---
 arch/arm/mach-socfpga/scan_manager.c                              |   6 +-
 arch/arm/mach-socfpga/spl_a10.c                                   |  12 +-
 arch/arm/mach-socfpga/spl_agilex.c                                |
98 +++++++++++
 arch/arm/mach-socfpga/spl_gen5.c                                  |  26 ++-
 arch/arm/mach-socfpga/spl_s10.c                                   |
109 ++----------
 arch/arm/mach-socfpga/system_manager_gen5.c                       |  42 +++--
 arch/arm/mach-socfpga/system_manager_s10.c                        |  42 +++--
 arch/arm/mach-socfpga/wrap_pll_config_s10.c                       |  20 ++-
 board/intel/agilex-socdk/MAINTAINERS                              |   7 +
 board/intel/agilex-socdk/Makefile                                 |   7 +
 board/intel/agilex-socdk/socfpga.c                                |   7 +
 common/spl/Kconfig                                                |   6 +
 configs/socfpga_agilex_defconfig                                  |  60 +++++++
 drivers/Makefile                                                  |   1 +
 drivers/cache/Kconfig                                             |   8 +
 drivers/cache/Makefile                                            |   3 +-
 drivers/cache/cache-ncore.c                                       |
164 ++++++++++++++++++
 drivers/clk/altera/Makefile                                       |   1 +
 drivers/clk/altera/clk-agilex.c                                   |
579 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/clk/altera/clk-agilex.h                                   |
237 ++++++++++++++++++++++++++
 drivers/ddr/altera/Kconfig                                        |   6 +-
 drivers/ddr/altera/Makefile                                       |   3 +-
 drivers/ddr/altera/sdram_agilex.c                                 |
168 ++++++++++++++++++
 drivers/ddr/altera/sdram_gen5.c                                   |  12 +-
 drivers/ddr/altera/sdram_s10.c                                    |
300 +-------------------------------
 drivers/ddr/altera/sdram_s10.h                                    |
148 +---------------
 drivers/ddr/altera/sdram_soc64.c                                  |
305 +++++++++++++++++++++++++++++++++
 drivers/ddr/altera/sdram_soc64.h                                  |
187 ++++++++++++++++++++
 drivers/fpga/socfpga_arria10.c                                    |   7 +-
 drivers/fpga/socfpga_gen5.c                                       |   4 +-
 drivers/mmc/socfpga_dw_mmc.c                                      |  17 +-
 drivers/sysreset/sysreset_socfpga.c                               |   6 +-
 include/configs/socfpga_agilex_socdk.h                            |  12 ++
 include/configs/socfpga_soc64_common.h                            |
203 ++++++++++++++++++++++
 include/configs/socfpga_stratix10_socdk.h                         |
192 +--------------------
 include/dt-bindings/clock/agilex-clock.h                          |
71 ++++++++
 84 files changed, 4369 insertions(+), 1949 deletions(-)
 create mode 100644 arch/arm/dts/socfpga_agilex-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex_socdk.dts
 create mode 100644 arch/arm/mach-socfpga/clock_manager_agilex.c
 create mode 100644 arch/arm/mach-socfpga/firewall.c
 create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h
 create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_soc64.h
 rename arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} (94%)
 delete mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h
 create mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h
 delete mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_s10.h
 create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
 create mode 100644 arch/arm/mach-socfpga/spl_agilex.c
 create mode 100644 board/intel/agilex-socdk/MAINTAINERS
 create mode 100644 board/intel/agilex-socdk/Makefile
 create mode 100644 board/intel/agilex-socdk/socfpga.c
 create mode 100644 configs/socfpga_agilex_defconfig
 create mode 100644 drivers/cache/cache-ncore.c
 create mode 100644 drivers/clk/altera/clk-agilex.c
 create mode 100644 drivers/clk/altera/clk-agilex.h
 create mode 100644 drivers/ddr/altera/sdram_agilex.c
 create mode 100644 drivers/ddr/altera/sdram_soc64.c
 create mode 100644 drivers/ddr/altera/sdram_soc64.h
 create mode 100644 include/configs/socfpga_agilex_socdk.h
 create mode 100644 include/configs/socfpga_soc64_common.h
 create mode 100644 include/dt-bindings/clock/agilex-clock.h

Comments

Marek Vasut Dec. 9, 2019, 12:52 p.m. UTC | #1
On 12/9/19 9:09 AM, Simon Goldschmidt wrote:
> The following changes since commit b38c3a641fc01fcd4eda5fa107ae3c247baa0196:
> 
>   Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
> (2019-12-08 10:51:00 -0500)
> 
> are available in the git repository at:
> 
>   https://github.com/goldsimon/u-boot.git socfpga-next

Applied, thanks
Simon Goldschmidt Dec. 9, 2019, 1:14 p.m. UTC | #2
On Mon, Dec 9, 2019 at 1:57 PM Marek Vasut <marex@denx.de> wrote:
>
> On 12/9/19 9:09 AM, Simon Goldschmidt wrote:
> > The following changes since commit b38c3a641fc01fcd4eda5fa107ae3c247baa0196:
> >
> >   Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
> > (2019-12-08 10:51:00 -0500)
> >
> > are available in the git repository at:
> >
> >   https://github.com/goldsimon/u-boot.git socfpga-next
>
> Applied, thanks

Hmm, I hadn't expected this, but travis says stratix10 and agilex now fail due
to the MTD "cleanup" Tom recently pushed.

I've pushed a fix for the 2nd last commit, travis is running.

Sorry for the mess.

Regards,
Simon