diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 49 |
1 files changed, 27 insertions, 22 deletions
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ VERSION = 2026 -PATCHLEVEL = 04 +PATCHLEVEL = 07 SUBLEVEL = EXTRAVERSION = NAME = @@ -829,6 +829,21 @@ autoconf_is_old := $(shell find . -path ./$(KCONFIG_CONFIG) -newer \ include/config/auto.conf) ifeq ($(autoconf_is_old),) include $(srctree)/config.mk + +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 + include $(srctree)/arch/$(ARCH)/Makefile endif endif @@ -920,7 +935,7 @@ endif ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os else ifdef CONFIG_CC_OPTIMIZE_FOR_DEBUG --KBUILD_CFLAGS += -Og +KBUILD_CFLAGS += -Og # Avoid false positives -Wmaybe-uninitialized # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394 KBUILD_CFLAGS += -Wno-maybe-uninitialized @@ -1081,7 +1096,7 @@ libs-$(CONFIG_OF_EMBED) += dts/ libs-y += env/ libs-y += lib/ libs-y += fs/ -libs-$(filter y,$(CONFIG_NET) $(CONFIG_NET_LWIP)) += net/ +libs-$(CONFIG_NET) += net/ libs-y += disk/ libs-y += drivers/ libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ @@ -1373,7 +1388,7 @@ expect = $(foreach cfg,$(1),y) # 1: List of options to migrate to (e.g. "CONFIG_DM_MMC CONFIG_BLK") # 2: Name of component (e.g . "Ethernet drivers") # 3: Release deadline (e.g. "v202.07") -# 4: Condition to require before checking (e.g. "$(CONFIG_NET)") +# 4: Condition to require before checking (e.g. "$(CONFIG_NET_LEGACY)") # Note: Script avoids bash construct, hence the strange double 'if' # (patches welcome!) define deprecated @@ -1445,20 +1460,6 @@ dt_binding_check: scripts_dtc 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 - ifeq ($(CONFIG_MULTI_DTB_FIT),y) ifeq ($(CONFIG_MULTI_DTB_FIT_LZO),y) @@ -1578,6 +1579,9 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE %.scif: %.srec $(Q)$(MAKE) $(build)=arch/arm/mach-renesas $@ +%.shdr: %.srec + $(Q)$(MAKE) $(build)=arch/arm/mach-renesas $@ + OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \ $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_SEPARATE),-R .bootpg -R .resetvec)) @@ -1682,7 +1686,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ build -u -d $(binman_dtb) -O . -m \ --allow-missing --fake-ext-blobs \ $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ - -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I . -I $(srctree)/board/$(BOARDDIR) -I $(srctree) \ $(foreach f,$(of_list_dirs),-I $(f)) -a of-list=$(of_list) \ $(foreach f,$(BINMAN_INDIRS),-I $(f)) \ -a atf-bl1-path=${BL1} \ @@ -2147,7 +2151,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)) \ @@ -2540,7 +2545,7 @@ CLEAN_FILES += $(MODVERDIR) \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) CLEAN_FILES += include/autoconf.mk* include/bmp_logo.h include/bmp_logo_data.h \ - include/config.h include/generated/env.* drivers/video/u_boot_logo.S \ + include/config.h include/generated/env.* drivers/video/u_boot_logo.bmp.S \ tools/version.h u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ @@ -2607,6 +2612,7 @@ clean: $(clean-dirs) \( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '*.ko.*' -o -name '*.su' -o -name '*.pyc' \ -o -name '*.dtb' -o -name '*.dtbo' -o -name '*.dtb.S' -o -name '*.dt.yaml' \ + -o -name '*.dtb.clean.dts' -o -name '*.dtb.full.dts' -o -name '*.dtb.diff' \ -o -name '*.dwo' -o -name '*.lst' \ -o -name '*.su' -o -name '*.mod' -o -name '*.usyms' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ @@ -2686,7 +2692,6 @@ pip pip_test pip_release: _pip _pip: scripts/make_pip.sh u_boot_pylib ${PIP_ARGS} - scripts/make_pip.sh patman ${PIP_ARGS} scripts/make_pip.sh buildman ${PIP_ARGS} scripts/make_pip.sh dtoc ${PIP_ARGS} scripts/make_pip.sh binman ${PIP_ARGS} |