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 <[email protected]> > Reviewed-by: Tom Rini <[email protected]> > Reviewed-by: Simon Glass <[email protected]> > Acked-by: Linus Walleij <[email protected]>
(With a slight change due to samsun PR, but applied cleanly after rename) Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
