From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Mon, 7 Jan 2019 23:53:59 +0100 Subject: [U-Boot] [PATCH v1 2/4] arm: socfpga: fix compiling with OF_PLATDATA In-Reply-To: <20190107211423.10151-3-simon.k.r.goldschmidt@gmail.com> References: <20190107211423.10151-1-simon.k.r.goldschmidt@gmail.com> <20190107211423.10151-3-simon.k.r.goldschmidt@gmail.com> Message-ID: <77643167-9ebe-cac6-78fa-0a98151f61e1@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 1/7/19 10:14 PM, Simon Goldschmidt wrote: > 'socfpga_eth_reset_common' must not be compiled when OF_PLATDATA is enabled > since it uses functions accessing the devicetree. > > Since this function is not used in SPL anyway, change the compile guard > to reflect this and fix compiling SPL with OF_PLATDATA. Doesn't this break ethernet in SPL ? I think it does. The real fix is to move this PHY mode configuration into the driver. > Signed-off-by: Simon Goldschmidt > --- > > arch/arm/mach-socfpga/misc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c > index 78fbe28724..30f74d9940 100644 > --- a/arch/arm/mach-socfpga/misc.c > +++ b/arch/arm/mach-socfpga/misc.c > @@ -120,7 +120,7 @@ int arch_cpu_init(void) > return 0; > } > > -#ifdef CONFIG_ETH_DESIGNWARE > +#if defined CONFIG_ETH_DESIGNWARE && !defined CONFIG_SPL_BUILD > static int dwmac_phymode_to_modereg(const char *phymode, u32 *modereg) > { > if (!phymode) > -- Best regards, Marek Vasut