]> git.baikalelectronics.ru Git - uboot.git/commit
ARM: revive CONFIG_USE_ARCH_MEMCPY/MEMSET for UniPhier and Tegra
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 19 Dec 2016 10:31:02 +0000 (19:31 +0900)
committerTom Rini <trini@konsulko.com>
Tue, 27 Dec 2016 16:24:15 +0000 (11:24 -0500)
commit28ed98530c1ff2252531165f71a3a71380bb9ccf
tree759002b71344087bcfb14f1a163c8c41c90b09f7
parent980f230a17fb6d616e84fd0e54f815559867e7ca
ARM: revive CONFIG_USE_ARCH_MEMCPY/MEMSET for UniPhier and Tegra

Commit 2aedfc0a57e0 ("Kconfig: Move USE_ARCH_MEMCPY/MEMSET to
Kconfig") is misconversion.

The original logic in include/configs/uniphier.h was as follows:

  #if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_ARM64)
  #define CONFIG_USE_ARCH_MEMSET
  #define CONFIG_USE_ARCH_MEMCPY
  #endif

This means those configs were enabled when building U-Boot proper,
but disabled when building SPL.  Likewise for Tegra.

Now "depends on !SPL" prevents any boards with SPL support
from reaching these options.  This changed the behavior for
UniPhier and Tegra SoC family.

Please notice these two options only control the U-Boot proper
build.  As you see arch/arm/Makefile, ARM-specific memset/memcpy
are never compiled for SPL.  So, __HAVE_ARCH_MEMCPY/MEMSET should
not set for SPL.

Fixes: 2aedfc0a57e0 ("Kconfig: Move USE_ARCH_MEMCPY/MEMSET to Kconfig")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
arch/arm/Kconfig
arch/arm/include/asm/string.h