a78cd86132
As part of testing booting Linux kernels on Rockchip devices, it was discovered by Ziyuan Xu and Sandy Patterson that we had multiple and for some cases incomplete isb definitions. This was causing a failure to boot of the Linux kernel. In order to solve this problem as well as cover any corner cases that we may also have had a number of changes are made in order to consolidate things. First, <asm/barriers.h> now becomes the source of isb/dsb/dmb definitions. This however introduces another complexity. Due to needing to build SPL for 32bit tegra with -march=armv4 we need to borrow the __LINUX_ARM_ARCH__ logic from the Linux Kernel in a more complete form. Move this from arch/arm/lib/Makefile to arch/arm/Makefile and add a comment about it. Now that we can always know what the target CPU is capable off we can get always do the correct thing for the barrier. The final part of this is that need to be consistent everywhere and call isb()/dsb()/dmb() and NOT call ISB/DSB/DMB in some cases and the function names in others. Reviewed-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Acked-by: Ziyuan Xu <xzy.xu@rock-chips.com> Acked-by: Sandy Patterson <apatterson@sightlogix.com> Reported-by: Ziyuan Xu <xzy.xu@rock-chips.com> Reported-by: Sandy Patterson <apatterson@sightlogix.com> Signed-off-by: Tom Rini <trini@konsulko.com>
93 lines
2.2 KiB
Makefile
93 lines
2.2 KiB
Makefile
#
|
|
# (C) Copyright 2002-2006
|
|
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
|
|
lib-$(CONFIG_USE_PRIVATE_LIBGCC) += ashldi3.o ashrdi3.o lshrdi3.o \
|
|
lib1funcs.o uldivmod.o div0.o \
|
|
div64.o muldi3.o
|
|
|
|
ifdef CONFIG_CPU_V7M
|
|
obj-y += vectors_m.o crt0.o
|
|
else ifdef CONFIG_ARM64
|
|
obj-y += crt0_64.o
|
|
else
|
|
obj-y += vectors.o crt0.o
|
|
endif
|
|
|
|
ifndef CONFIG_SPL_BUILD
|
|
ifdef CONFIG_ARM64
|
|
obj-y += relocate_64.o
|
|
else
|
|
obj-y += relocate.o
|
|
endif
|
|
|
|
obj-$(CONFIG_CPU_V7M) += cmd_boot.o
|
|
obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
|
|
obj-$(CONFIG_CMD_BOOTM) += bootm.o
|
|
obj-$(CONFIG_CMD_BOOTM) += zimage.o
|
|
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
|
|
obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
|
|
obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
|
|
else
|
|
obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
|
|
obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o
|
|
endif
|
|
obj-$(CONFIG_SEMIHOSTING) += semihosting.o
|
|
|
|
obj-y += sections.o
|
|
obj-y += stack.o
|
|
ifdef CONFIG_CPU_V7M
|
|
obj-y += interrupts_m.o
|
|
else ifdef CONFIG_ARM64
|
|
obj-y += ccn504.o
|
|
obj-y += gic_64.o
|
|
obj-y += interrupts_64.o
|
|
else
|
|
obj-y += interrupts.o
|
|
endif
|
|
ifndef CONFIG_SYSRESET
|
|
obj-y += reset.o
|
|
endif
|
|
|
|
obj-y += cache.o
|
|
ifndef CONFIG_ARM64
|
|
obj-y += cache-cp15.o
|
|
endif
|
|
|
|
obj-y += psci-dt.o
|
|
|
|
obj-$(CONFIG_DEBUG_LL) += debug.o
|
|
|
|
# For EABI conformant tool chains, provide eabi_compat()
|
|
ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
|
|
extra-y += eabi_compat.o
|
|
endif
|
|
|
|
asflags-y += -DCONFIG_ARM_ASM_UNIFIED
|
|
|
|
# some files can only build in ARM or THUMB2, not THUMB1
|
|
|
|
ifdef CONFIG_SYS_THUMB_BUILD
|
|
asflags-$(CONFIG_HAS_THUMB2) += -DCONFIG_THUMB2_KERNEL
|
|
ifndef CONFIG_HAS_THUMB2
|
|
|
|
# for C files, just apend -marm, which will override previous -mthumb*
|
|
|
|
CFLAGS_cache.o := -marm
|
|
CFLAGS_cache-cp15.o := -marm
|
|
|
|
# For .S, drop -mthumb* and other thumb-related options.
|
|
# CFLAGS_REMOVE_* would not have an effet, so AFLAGS_REMOVE_*
|
|
# was implemented and is used here.
|
|
# Also, define ${target}_NO_THUMB_BUILD for these two targets
|
|
# so that the code knows it should not use Thumb.
|
|
|
|
AFLAGS_REMOVE_memset.o := -mthumb -mthumb-interwork
|
|
AFLAGS_REMOVE_memcpy.o := -mthumb -mthumb-interwork
|
|
AFLAGS_memset.o := -DMEMSET_NO_THUMB_BUILD
|
|
AFLAGS_memcpy.o := -DMEMCPY_NO_THUMB_BUILD
|
|
endif
|
|
endif
|