commit 5a1d069ae77b052a90add9d5c52efedf6a70e58e
author Nicolas Pitre <npitre@baylibre.com> Wed Mar 31 13:41:39 2021 -0400
committer Kumar Gala <kumar.gala@gmail.com> Thu Apr 01 01:03:04 2021 -0500
tree 8e3f44410bc752e386e48ea02633bcedbfaa0c8a
parent ebcc316e1cef9608ca0a74d9f39a6c67b2c86c0d

cmake: pick up some crumbs after the arm/arm64 split

Pick up some crumbs after the arm/arm64 split.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>

cmake/toolchain/zephyr/0.11/Kconfig

diff --git a/cmake/toolchain/zephyr/0.11/Kconfig b/cmake/toolchain/zephyr/0.11/Kconfig
index 8515de0..f8a3731 100644
--- a/cmake/toolchain/zephyr/0.11/Kconfig
+++ b/cmake/toolchain/zephyr/0.11/Kconfig
@@ -5,4 +5,4 @@
 
 config TOOLCHAIN_ZEPHYR_0_11
 	def_bool y
-	select HAS_NEWLIB_LIBC_NANO if (ARC || (ARM && !ARM64) || RISCV)
+	select HAS_NEWLIB_LIBC_NANO if (ARC || ARM || RISCV)

cmake/toolchain/zephyr/0.11/target.cmake

diff --git a/cmake/toolchain/zephyr/0.11/target.cmake b/cmake/toolchain/zephyr/0.11/target.cmake
index 3a95a8e..f7fbc3dd 100644
--- a/cmake/toolchain/zephyr/0.11/target.cmake
+++ b/cmake/toolchain/zephyr/0.11/target.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set(CROSS_COMPILE_TARGET_arm64      arm-zephyr-eabi)
-set(CROSS_COMPILE_TARGET_arm     aarch64-zephyr-elf)
+set(CROSS_COMPILE_TARGET_arm        arm-zephyr-eabi)
+set(CROSS_COMPILE_TARGET_arm64   aarch64-zephyr-elf)
 set(CROSS_COMPILE_TARGET_nios2     nios2-zephyr-elf)
 set(CROSS_COMPILE_TARGET_riscv   riscv64-zephyr-elf)
 set(CROSS_COMPILE_TARGET_mips     mipsel-zephyr-elf)