diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -3,7 +3,7 @@ VERSION = 2026 PATCHLEVEL = 04 SUBLEVEL = -EXTRAVERSION = -rc4 +EXTRAVERSION = NAME = # *DOCUMENTATION* @@ -531,7 +531,7 @@ UBOOTINCLUDE := \ -I$(srctree)/lib/mbedtls/external/mbedtls/include) \ $(if $(CONFIG_$(PHASE_)SYS_THUMB_BUILD), \ $(if $(CONFIG_HAS_THUMB2), \ - $(if $(CONFIG_CPU_V7M), \ + $(if $(CONFIG_CPU_V7M_V8M), \ -I$(srctree)/arch/arm/thumb1/include), \ -I$(srctree)/arch/arm/thumb1/include)) \ -I$(srctree)/arch/$(ARCH)/include \ @@ -1050,7 +1050,7 @@ UBOOTINCLUDE := \ -I$(srctree)/lib/mbedtls/external/mbedtls/include) \ $(if $(CONFIG_$(PHASE_)SYS_THUMB_BUILD), \ $(if $(CONFIG_HAS_THUMB2), \ - $(if $(CONFIG_CPU_V7M), \ + $(if $(CONFIG_CPU_V7M_V8M), \ -I$(srctree)/arch/arm/thumb1/include), \ -I$(srctree)/arch/arm/thumb1/include)) \ -I$(srctree)/arch/$(ARCH)/include \ @@ -1446,11 +1446,15 @@ quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ ifeq ($(CONFIG_OF_UPSTREAM),y) +ifeq ($(CONFIG_CPU_V8M),y) +dt_dir := dts/upstream/src/arm64 +else ifeq ($(CONFIG_ARM64),y) dt_dir := dts/upstream/src/arm64 else dt_dir := dts/upstream/src/$(ARCH) endif +endif else dt_dir := arch/$(ARCH)/dts endif @@ -2143,7 +2147,8 @@ ENV_FILE := $(if $(ENV_SOURCE_FILE),$(ENV_FILE_CFG),$(wildcard $(ENV_FILE_BOARD) quiet_cmd_gen_envp = ENVP $@ cmd_gen_envp = \ if [ -s "$(ENV_FILE)" ]; then \ - $(CPP) -P $(cpp_flags) -x assembler-with-cpp -undef \ + $(CPP) -P $(KBUILD_CPPFLAGS) $(UBOOTINCLUDE) \ + -x assembler-with-cpp -undef \ -D__ASSEMBLY__ \ -D__UBOOT_CONFIG__ \ -DDEFAULT_DEVICE_TREE=$(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE)) \ @@ -2767,8 +2772,7 @@ DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \ linkcheckdocs dochelp refcheckdocs texinfodocs infodocs PHONY += $(DOC_TARGETS) $(DOC_TARGETS): scripts_basic FORCE - $(Q)PYTHONPATH=$(srctree)/test/py/tests:$(srctree)/test/py \ - $(MAKE) $(build)=doc $@ + $(Q)$(MAKE) $(build)=doc $@ PHONY += checkstack ubootrelease ubootversion |