From: Simon Goldschmidt Date: Wed, 15 May 2019 20:00:30 +0200 Subject: [U-Boot] [PATCH] spl: kconfig: separate sysreset and firmware drivers from misc In-Reply-To: <38fbbbb86a434890951f03af3cfbb467@SFHDAG6NODE3.st.com> References: <20190504200356.22099-1-simon.k.r.goldschmidt@gmail.com> <38fbbbb86a434890951f03af3cfbb467@SFHDAG6NODE3.st.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am 15.05.2019 um 18:19 schrieb Patrick DELAUNAY: > Hi Simon > >> >> This adds separate kconfig options for drivers/sysreset and >> drivers/firmware. >> >> Up to now, CONFIG_SPL_DRIVERS_MISC_SUPPORT added drivers/misc to SPL >> build but also added drivers/firmware and drivers/sysreset at the same >> time. >> >> Since that is confusing, this patch adds CONFIG_SPL_SYSRESET_SUPPORT >> for >> drivers/sysreset and CONFIG_SPL_DRIVERS_FIRMWARE_SUPPORT for >> drivers/firmware (and accordingly for the TPL options). >> >> To keep the binaries unchanged, this patch enables the 2 new options >> on all boards where DRIVERS_MISC_SUPPORT has been enabled before. >> >> Signed-off-by: Simon Goldschmidt > > I have one compilation failed for one board (on latest master branch) > > arm: + stm32f746-disco > +drivers/built-in.o: In function `do_reset': > +drivers/sysreset/sysreset-uclass.c:113: multiple definition of `do_reset' > +arch/arm/lib/built-in.o:arch/arm/lib/reset.c:30: first defined here > +drivers/built-in.o: In function `reset_cpu': > +drivers/sysreset/sysreset-uclass.c:107: multiple definition of `reset_cpu' > +arch/arm/cpu/armv7m/built-in.o:arch/arm/cpu/armv7m/cpu.c:53: first defined here > +make[2]: *** [spl/u-boot-spl] Error 1 > +make[1]: *** [spl/u-boot-spl] Error 2 > +make: *** [sub-make] Error 2 > > But you have perhaps other patch in your branch... > > => for me select SPL_SYSRESET need to be removed for config STM32F7 to avoid driver/sysreset/uclass.c compilation Right, thanks for the hint. Seems like I need to not select CONFIG_SPL_SYSRESET if CONFIG_SYSRESET wasn't set. Also, I need to throw this at travis before sending v3... Regards, Simon > > For stm32mp and stm32: > > SPL_MISC needed for rcc > SPL_SYSRESET are needed for only stm32mp1 cause compilation error for stm32 > > SPL_FIRMWARE is not needed but I will remove it when this patch will by merged. > > For the other part > > Reviewed-by: Patrick Delaunay > > Thanks, > Patrick > >> ---