On Wed, Aug 19, 2015 at 06:39:29AM +0200, Marek Vasut wrote: > On Tuesday, August 18, 2015 at 07:53:23 PM, Tom Rini wrote: > > On Wed, Aug 12, 2015 at 07:31:55AM +0900, Masahiro Yamada wrote: > > > We have flipped CONFIG_SPL_DISABLE_OF_CONTROL. We have cleansing > > > devices, $(SPL_) and CONFIG_IS_ENABLED(), so we are ready to clear > > > > > > away the ugly logic in include/fdtdec.h: > > > #ifdef CONFIG_OF_CONTROL > > > # if defined(CONFIG_SPL_BUILD) && !defined(SPL_OF_CONTROL) > > > # define OF_CONTROL 0 > > > # else > > > # define OF_CONTROL 1 > > > # endif > > > #else > > > # define OF_CONTROL 0 > > > #endif > > > > > > Now CONFIG_IS_ENABLED(OF_CONTROL) is the substitute. It refers to > > > CONFIG_OF_CONTROL for U-boot proper and CONFIG_SPL_OF_CONTROL for > > > SPL. > > > > > > Also, we no longer have to cancel CONFIG_OF_CONTROL in > > > include/config_uncmd_spl.h and scripts/Makefile.spl. > > > > > > Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com> > > > Reviewed-by: Tom Rini <tr...@konsulko.com> > > > Reviewed-by: Simon Glass <s...@chromium.org> > > > Acked-by: Linus Walleij <linus.wall...@linaro.org> > > > > (With a slight change due to samsun PR, but applied cleanly after > > rename) > > Applied to u-boot/master, thanks! > > And this just broke just about every SoCFPGA platform (try ie. > socfpga_cyclone5) > ;-) I poked into this a bit and noticed that adding #include <linux/kconfig.h> > into include/configs/socfpga_common.h fixes the issue, but I'd like to check > with you if this is the correct way of fixing it.
Broke it how?
$ ./tools/buildman/buildman socfpga_cyclone5
boards.cfg is up to date. Nothing to do.
Building current source for 1 boards (1 thread, 6 jobs per thread)
1 0 0 /1 socfpga_cyclone5
--
Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
