Re: Pull request: socfpga-next
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.
RE: Pull request: socfpga-next
> -Original Message-
> From: Simon Goldschmidt
> Sent: Thursday, December 12, 2019 3:38 PM
> To: Marek Vasut
> Cc: Tan, Ley Foon ; U-Boot Mailing List b...@lists.denx.de>
> Subject: Re: Pull request: socfpga-next
>
> On Thu, Dec 12, 2019 at 2:04 AM Marek Vasut 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
Re: Pull request: socfpga-next
On Thu, Dec 12, 2019 at 2:04 AM Marek Vasut 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
Re: Pull request: socfpga-next
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.
Pull request: socfpga-next
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
Re: Pull request: socfpga-next
On Mon, Dec 9, 2019 at 1:57 PM Marek Vasut 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
Re: Pull request: socfpga-next
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
Pull request: socfpga-next
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/incl
