Pull request: socfpga-next
mbox series

Message ID CAAh8qswWjHE3OecAfZTGoMSpB7i4ugDFbAbLdjrBSu29LoqG8w@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. 10, 2019, 10:01 a.m. UTC
Hi Marek,

after fixing Stratix10 build warnings, please pull this updated Agilex
series for next.

Travis ran successfully this time:
https://travis-ci.org/goldsimon/u-boot/builds/622657322

Regards,
Simon

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 ea3dd6e26aadf03f4a182d3350d74d8dc5a19c51:

  arm: socfpga: agilex: Enable Agilex SoC build (2019-12-09 14:10:56 +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                            |
202 ++++++++++++++++++++++++++
 include/configs/socfpga_stratix10_socdk.h                         |
192 +------------------------
 include/dt-bindings/clock/agilex-clock.h                          |
71 ++++++++++
 84 files changed, 4368 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. 12, 2019, 12:18 a.m. UTC | #1
On 12/10/19 11:01 AM, Simon Goldschmidt wrote:
> Hi Marek,
> 
> after fixing Stratix10 build warnings, please pull this updated Agilex
> series for next.
> 
> Travis ran successfully this time:
> https://travis-ci.org/goldsimon/u-boot/builds/622657322
> 
> Regards,
> Simon
> 
> 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
> 

Rebase this on socfpga/next please, so the fix is visible and I don't
have to rewrite the branch.
Simon Goldschmidt Dec. 12, 2019, 7:38 a.m. UTC | #2
On Thu, Dec 12, 2019 at 2:04 AM Marek Vasut <marex@denx.de> wrote:
>
> On 12/10/19 11:01 AM, Simon Goldschmidt wrote:
> > Hi Marek,
> >
> > after fixing Stratix10 build warnings, please pull this updated Agilex
> > series for next.
> >
> > Travis ran successfully this time:
> > https://travis-ci.org/goldsimon/u-boot/builds/622657322
> >
> > Regards,
> > Simon
> >
> > 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
> >
>
> Rebase this on socfpga/next please, so the fix is visible and I don't
> have to rewrite the branch.

The thing is, I did something wrong in the 2nd newest commit
("configs: socfpga: Move Stratix10 and Agilex common CONFIGs").

So we can either fix this commit and rewrite the 'next' branch or
live with bisect being broken for Stratix10.

Just tell me which way I should proceed.

Regards,
Simon
Ley Foon Tan Dec. 12, 2019, 7:43 a.m. UTC | #3
> -----Original Message-----
> From: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> Sent: Thursday, December 12, 2019 3:38 PM
> To: Marek Vasut <marex@denx.de>
> Cc: Tan, Ley Foon <ley.foon.tan@intel.com>; U-Boot Mailing List <u-
> boot@lists.denx.de>
> Subject: Re: Pull request: socfpga-next
> 
> On Thu, Dec 12, 2019 at 2:04 AM Marek Vasut <marex@denx.de> wrote:
> >
> > On 12/10/19 11:01 AM, Simon Goldschmidt wrote:
> > > Hi Marek,
> > >
> > > after fixing Stratix10 build warnings, please pull this updated
> > > Agilex series for next.
> > >
> > > Travis ran successfully this time:
> > > https://travis-ci.org/goldsimon/u-boot/builds/622657322
> > >
> > > Regards,
> > > Simon
> > >
> > > 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
> > >
> >
> > Rebase this on socfpga/next please, so the fix is visible and I don't
> > have to rewrite the branch.
> 
> The thing is, I did something wrong in the 2nd newest commit
> ("configs: socfpga: Move Stratix10 and Agilex common CONFIGs").
> 
> So we can either fix this commit and rewrite the 'next' branch or live with
> bisect being broken for Stratix10.
> 
> Just tell me which way I should proceed.
> 
I just sync latest from https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga/tree/next and there is compilation for S10/Agilex.
Found Simon's latest fix for "configs: socfpga: Move Stratix10 and Agilex common CONFIGs" is not merged.

Regards
Ley Foon
Marek Vasut Dec. 12, 2019, 8:09 a.m. UTC | #4
On 12/12/19 8:43 AM, Tan, Ley Foon wrote:
[...]
>>> Rebase this on socfpga/next please, so the fix is visible and I don't
>>> have to rewrite the branch.
>>
>> The thing is, I did something wrong in the 2nd newest commit
>> ("configs: socfpga: Move Stratix10 and Agilex common CONFIGs").
>>
>> So we can either fix this commit and rewrite the 'next' branch or live with
>> bisect being broken for Stratix10.
>>
>> Just tell me which way I should proceed.
>>
> I just sync latest from https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga/tree/next and there is compilation for S10/Agilex.
> Found Simon's latest fix for "configs: socfpga: Move Stratix10 and Agilex common CONFIGs" is not merged.

OK look, just post the fixes to the ML and send them to me in a PR on
top of socfpga/next , otherwise this is gonna be chaos.