From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Thu, 19 Feb 2015 15:34:09 +0100 Subject: [U-Boot] [PATCH 1/2] dm: Protect device_unbind() with CONFIG_DM_DEVICE_REMOVE In-Reply-To: References: <1424295379-14689-1-git-send-email-marex@denx.de> <201502190950.38935.marex@denx.de> Message-ID: <201502191534.09117.marex@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 Thursday, February 19, 2015 at 03:29:52 PM, Simon Glass wrote: > Hi Marek, Hi Simon, > On 19 February 2015 at 01:50, Marek Vasut wrote: > > On Thursday, February 19, 2015 at 02:06:38 AM, Simon Glass wrote: > >> On 18 February 2015 at 14:36, Marek Vasut wrote: > >> > Since device_unbind() is also defined in device-remove.c, > >> > which is compiled in only in case CONFIG_DM_DEVICE_REMOVE > >> > is defined, protect the device_unbind() prototype with the > >> > same CONFIG_DM_DEVICE_REMOVE check. > >> > > >> > Signed-off-by: Marek Vasut > >> > Cc: Simon Glass > >> > Cc: Stefan Roese > >> > Cc: Tom Rini > >> > --- > >> > > >> > include/dm/device-internal.h | 4 ++++ > >> > 1 file changed, 4 insertions(+) > >> > >> Acked-by: Simon Glass > > > > Tom, can you please pick this one, I need it to repair the socfpga, > > so I'd like to have it in before I submit new PR for that. > > I'll bring it into u-boot-dm in any case. > > I didn't see a build error though? What is broken at present? Try building u-boot-socfpga/master . The patches there enable DT (CONFIG_OF_CONTROL) on SoCFPGA always. And in case this is enabled, the Cadence SPI and DW SPI drivers are compiled in. But those two drivers require CONFIG_DM and CONFIG_DM_SPI ... and spi-uclass.c contains calls to device_unbind() . Best regards, Marek Vasut