[U-Boot] [PULL] u-boot-socfpga/master

[Tom Rini]

On Thu, Apr 11, 2019 at 08:49:38PM +0200, Simon Goldschmidt wrote:
> 
> 
> On 11.04.19 20:20, Tom Rini wrote:
> >On Thu, Apr 11, 2019 at 08:19:38PM +0200, Marek Vasut wrote:
> >>On 4/11/19 8:17 PM, Tom Rini wrote:
> >>>On Wed, Apr 10, 2019 at 04:46:28PM +0200, Marek Vasut wrote:
> >>>
> >>>>The following changes since commit 3c99166441bf3ea325af2da83cfe65430b49c066:
> >>>>
> >>>>   Prepare v2019.04 (2019-04-08 21:40:40 -0400)
> >>>>
> >>>>are available in the Git repository at:
> >>>>
> >>>>   git://git.denx.de/u-boot-socfpga.git master
> >>>>
> >>>>for you to fetch changes up to ef8679b24ec6226b7198e06747ff047a16030ca4:
> >>>>
> >>>>   arm: dts: Stratix10: Add QSPI node (2019-04-09 13:11:06 +0200)
> >>>>
> >>>
> >>>Arg, sorry I didn't see this sooner:
> >>>        arm:  w+   socfpga_arria10
> >>>+(socfpga_arria10)
> >>>+(socfpga_arria10) WARNING: unmet direct dependencies detected for ALTERA_SDRAM
> >>>+(socfpga_arria10)   Depends on [n]: RAM [=n] && (TARGET_SOCFPGA_GEN5 [=n] || TARGET_SOCFPGA_ARRIA10 [=y])
> >>>+(socfpga_arria10)   Selected by [y]:
> >>>+(socfpga_arria10)   - TARGET_SOCFPGA_ARRIA10 [=y] && ARM [=y] && ARCH_SOCFPGA [=y]
> >>
> >>Is this coming from this PR or not ?
> >
> >Yes, this PR.  Top of tree + this PR only.
> 
> It's not only top of tree + this PR, it also fails for pure
> u-boot-socfpga/master.
> 
> Seems like this bug has been introduced when I made the gen5 driver depend
> on RAM. Unfortunately, all the drivers use one Kconfig item (although these
> are totally different drivers) but now only gen5 depends on RAM. Is there
> any Kconfig magic to fix this without duplicating the config item entries?

I think you may want something more like:
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 04a207c9403e..4a23e327dfb4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -821,14 +821,12 @@ config ARCH_SOCFPGA
 	select DM_SERIAL
 	select ENABLE_ARM_SOC_BOOT0_HOOK if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
 	select OF_CONTROL
-	select RAM if TARGET_SOCFPGA_GEN5
 	select SPL_DM_RESET if DM_RESET
 	select SPL_DM_SERIAL
 	select SPL_LIBCOMMON_SUPPORT
 	select SPL_LIBGENERIC_SUPPORT
 	select SPL_NAND_SUPPORT if SPL_NAND_DENALI
 	select SPL_OF_CONTROL
-	select SPL_RAM if TARGET_SOCFPGA_GEN5
 	select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
 	select SPL_SERIAL_SUPPORT
 	select SPL_WATCHDOG_SUPPORT
diff --git a/drivers/ddr/altera/Kconfig b/drivers/ddr/altera/Kconfig
index 7370d4133a67..8f60b56eb848 100644
--- a/drivers/ddr/altera/Kconfig
+++ b/drivers/ddr/altera/Kconfig
@@ -1,6 +1,7 @@
 config ALTERA_SDRAM
 	bool "SoCFPGA DDR SDRAM driver"
-	depends on RAM
 	depends on TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
+	select RAM if TARGET_SOCFPGA_GEN5
+	select SPL_RAM if TARGET_SOCFPGA_GEN5
 	help
 	  Enable DDR SDRAM controller for the SoCFPGA devices.

But I didn't test anything other than socfpga_arria10/arria5 as
building.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190411/49313b59/attachment.sig>