projects / openwrt / staging / stintel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
kernel: bump 6.1 to 6.1.60
[openwrt/staging/stintel.git] / include / image.mk
diff --git a/include/image.mk b/include/image.mk
index 87ba60d9541b2cdc7f412e6c908e9272c8676fe2..8f0cbead10809154f874338086d99bc06852f8d7 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -146,7 +146,7 @@ endif
 
 
 # Disable noisy checks by default as in upstream
-DTC_FLAGS += \
+DTC_WARN_FLAGS := \
   -Wno-unit_address_vs_reg \
   -Wno-simple_bus_reg \
   -Wno-unit_address_format \
@@ -159,6 +159,9 @@ DTC_FLAGS += \
   -Wno-graph_port \
   -Wno-unique_unit_address
 
+DTC_FLAGS += $(DTC_WARN_FLAGS)
+DTCO_FLAGS += $(DTC_WARN_FLAGS)
+
 define Image/pad-to
        dd if=$(1) of=$(1).new bs=$(2) conv=sync
        mv $(1).new $(1)
@@ -174,7 +177,7 @@ endef
 # $(2) target dtb file
 # $(3) extra CPP flags
 # $(4) extra DTC flags
-define Image/BuildDTB
+define Image/BuildDTB/sub
        $(TARGET_CROSS)cpp -nostdinc -x assembler-with-cpp \
                $(DTS_CPPFLAGS) \
                -I$(DTS_DIR) \
@@ -183,12 +186,20 @@ define Image/BuildDTB
                -undef -D__DTS__ $(3) \
                -o $(2).tmp $(1)
        $(LINUX_DIR)/scripts/dtc/dtc -O dtb \
-               -i$(dir $(1)) $(DTC_FLAGS) $(4) \
+               -i$(dir $(1)) $(4) \
        $(if $(CONFIG_HAS_DT_OVERLAY_SUPPORT),-@) \
                -o $(2) $(2).tmp
        $(RM) $(2).tmp
 endef
 
+define Image/BuildDTB
+       $(call Image/BuildDTB/sub,$(1),$(2),$(3),$(DTC_FLAGS) $(DEVICE_DTC_FLAGS) $(4))
+endef
+
+define Image/BuildDTBO
+       $(call Image/BuildDTB/sub,$(1),$(2),$(3),$(DTCO_FLAGS) $(DEVICE_DTCO_FLAGS) $(4))
+endef
+
 define Image/mkfs/jffs2/sub-raw
        $(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
                $(2) \
@@ -333,6 +344,9 @@ define Device/InitProfile
   DEVICE_ALT0_TITLE = $$(DEVICE_ALT0_VENDOR) $$(DEVICE_ALT0_MODEL)$$(if $$(DEVICE_ALT0_VARIANT), $$(DEVICE_ALT0_VARIANT))
   DEVICE_ALT1_TITLE = $$(DEVICE_ALT1_VENDOR) $$(DEVICE_ALT1_MODEL)$$(if $$(DEVICE_ALT1_VARIANT), $$(DEVICE_ALT1_VARIANT))
   DEVICE_ALT2_TITLE = $$(DEVICE_ALT2_VENDOR) $$(DEVICE_ALT2_MODEL)$$(if $$(DEVICE_ALT2_VARIANT), $$(DEVICE_ALT2_VARIANT))
+  DEVICE_ALT3_TITLE = $$(DEVICE_ALT3_VENDOR) $$(DEVICE_ALT3_MODEL)$$(if $$(DEVICE_ALT3_VARIANT), $$(DEVICE_ALT3_VARIANT))
+  DEVICE_ALT4_TITLE = $$(DEVICE_ALT4_VENDOR) $$(DEVICE_ALT4_MODEL)$$(if $$(DEVICE_ALT4_VARIANT), $$(DEVICE_ALT4_VARIANT))
+  DEVICE_ALT5_TITLE = $$(DEVICE_ALT5_VENDOR) $$(DEVICE_ALT5_MODEL)$$(if $$(DEVICE_ALT5_VARIANT), $$(DEVICE_ALT5_VARIANT))
   DEVICE_VENDOR :=
   DEVICE_MODEL :=
   DEVICE_VARIANT :=
@@ -345,6 +359,15 @@ define Device/InitProfile
   DEVICE_ALT2_VENDOR :=
   DEVICE_ALT2_MODEL :=
   DEVICE_ALT2_VARIANT :=
+  DEVICE_ALT3_VENDOR :=
+  DEVICE_ALT3_MODEL :=
+  DEVICE_ALT3_VARIANT :=
+  DEVICE_ALT4_VENDOR :=
+  DEVICE_ALT4_MODEL :=
+  DEVICE_ALT4_VARIANT :=
+  DEVICE_ALT5_VENDOR :=
+  DEVICE_ALT5_MODEL :=
+  DEVICE_ALT5_VARIANT :=
   DEVICE_PACKAGES :=
   DEVICE_DESCRIPTION = Build firmware images for $$(DEVICE_TITLE)
 endef
@@ -392,11 +415,14 @@ define Device/Init
   DEVICE_DTS_LOADADDR :=
   DEVICE_DTS_OVERLAY :=
   DEVICE_FDT_NUM :=
+  DEVICE_DTC_FLAGS :=
+  DEVICE_DTCO_FLAGS :=
   SOC :=
 
   BOARD_NAME :=
   UIMAGE_MAGIC :=
   UIMAGE_NAME :=
+  UIMAGE_TIME :=
   DEVICE_COMPAT_VERSION := 1.0
   DEVICE_COMPAT_MESSAGE :=
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
@@ -413,18 +439,21 @@ endef
 DEFAULT_DEVICE_VARS := \
   DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \
   CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
-  VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
-  DEVICE_DTS_CONFIG DEVICE_DTS_DELIMITER DEVICE_DTS_DIR DEVICE_DTS_OVERLAY \
-  DEVICE_DTS_LOADADDR \
+  VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTC_FLAGS \
+  DEVICE_DTCO_FLAGS DEVICE_DTS DEVICE_DTS_CONFIG DEVICE_DTS_DELIMITER \
+  DEVICE_DTS_DIR DEVICE_DTS_OVERLAY DEVICE_DTS_LOADADDR \
   DEVICE_FDT_NUM DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \
-  SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
+  UIMAGE_TIME SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
   UBOOT_PATH IMAGE_SIZE \
   FACTORY_IMG_NAME FACTORY_SIZE \
   DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
   DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
   DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \
   DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \
-  DEVICE_ALT2_VENDOR DEVICE_ALT2_MODEL DEVICE_ALT2_VARIANT
+  DEVICE_ALT2_VENDOR DEVICE_ALT2_MODEL DEVICE_ALT2_VARIANT \
+  DEVICE_ALT3_VENDOR DEVICE_ALT3_MODEL DEVICE_ALT3_VARIANT \
+  DEVICE_ALT4_VENDOR DEVICE_ALT4_MODEL DEVICE_ALT4_VARIANT \
+  DEVICE_ALT5_VENDOR DEVICE_ALT5_MODEL DEVICE_ALT5_VARIANT
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))
@@ -507,6 +536,15 @@ define Device/Build/initramfs
        DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
        DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
        DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
+       DEVICE_ALT3_VENDOR="$$(DEVICE_ALT3_VENDOR)" \
+       DEVICE_ALT3_MODEL="$$(DEVICE_ALT3_MODEL)" \
+       DEVICE_ALT3_VARIANT="$$(DEVICE_ALT3_VARIANT)" \
+       DEVICE_ALT4_VENDOR="$$(DEVICE_ALT4_VENDOR)" \
+       DEVICE_ALT4_MODEL="$$(DEVICE_ALT4_MODEL)" \
+       DEVICE_ALT4_VARIANT="$$(DEVICE_ALT4_VARIANT)" \
+       DEVICE_ALT5_VENDOR="$$(DEVICE_ALT5_VENDOR)" \
+       DEVICE_ALT5_MODEL="$$(DEVICE_ALT5_MODEL)" \
+       DEVICE_ALT5_VARIANT="$$(DEVICE_ALT5_VARIANT)" \
        DEVICE_TITLE="$$(DEVICE_TITLE)" \
        DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
        TARGET="$(BOARD)" \
@@ -537,16 +575,33 @@ define Device/Build/dtb
   image_prepare: $(KDIR)/image-$(1).dtb
   endif
 
+endef
+
+define Device/Build/dtbo
+  ifndef BUILD_DTSO_$(1)
+  BUILD_DTSO_$(1) := 1
+  $(KDIR)/image-$(1).dtbo: FORCE
+       $(call Image/BuildDTBO,$(strip $(2))/$(strip $(3)).dtso,$$@)
+
+  image_prepare: $(KDIR)/image-$(1).dtbo
+  endif
+
 endef
 endif
 
 define Device/Build/kernel
-  $$(eval $$(foreach dts,$$(DEVICE_DTS) $$(DEVICE_DTS_OVERLAY), \
+  $$(eval $$(foreach dts,$$(DEVICE_DTS), \
        $$(call Device/Build/dtb,$$(notdir $$(dts)), \
                $$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)), \
                $$(dts) \
        ) \
   ))
+  $$(eval $$(foreach dtso,$$(DEVICE_DTS_OVERLAY), \
+       $$(call Device/Build/dtbo,$$(notdir $$(dtso)), \
+               $$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)), \
+               $$(dtso) \
+       ) \
+  ))
 
   $(KDIR)/$$(KERNEL_NAME):: image_prepare
   $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
@@ -615,6 +670,15 @@ define Device/Build/image
        DEVICE_ALT2_VENDOR="$(DEVICE_ALT2_VENDOR)" \
        DEVICE_ALT2_MODEL="$(DEVICE_ALT2_MODEL)" \
        DEVICE_ALT2_VARIANT="$(DEVICE_ALT2_VARIANT)" \
+       DEVICE_ALT3_VENDOR="$(DEVICE_ALT3_VENDOR)" \
+       DEVICE_ALT3_MODEL="$(DEVICE_ALT3_MODEL)" \
+       DEVICE_ALT3_VARIANT="$(DEVICE_ALT3_VARIANT)" \
+       DEVICE_ALT4_VENDOR="$(DEVICE_ALT4_VENDOR)" \
+       DEVICE_ALT4_MODEL="$(DEVICE_ALT4_MODEL)" \
+       DEVICE_ALT4_VARIANT="$(DEVICE_ALT4_VARIANT)" \
+       DEVICE_ALT5_VENDOR="$(DEVICE_ALT5_VENDOR)" \
+       DEVICE_ALT5_MODEL="$(DEVICE_ALT5_MODEL)" \
+       DEVICE_ALT5_VARIANT="$(DEVICE_ALT5_VARIANT)" \
        DEVICE_TITLE="$(DEVICE_TITLE)" \
        DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \
        TARGET="$(BOARD)" \
@@ -660,6 +724,15 @@ define Device/Build/artifact
        DEVICE_ALT2_VENDOR="$(DEVICE_ALT2_VENDOR)" \
        DEVICE_ALT2_MODEL="$(DEVICE_ALT2_MODEL)" \
        DEVICE_ALT2_VARIANT="$(DEVICE_ALT2_VARIANT)" \
+       DEVICE_ALT3_VENDOR="$(DEVICE_ALT3_VENDOR)" \
+       DEVICE_ALT3_MODEL="$(DEVICE_ALT3_MODEL)" \
+       DEVICE_ALT3_VARIANT="$(DEVICE_ALT3_VARIANT)" \
+       DEVICE_ALT4_VENDOR="$(DEVICE_ALT4_VENDOR)" \
+       DEVICE_ALT4_MODEL="$(DEVICE_ALT4_MODEL)" \
+       DEVICE_ALT4_VARIANT="$(DEVICE_ALT4_VARIANT)" \
+       DEVICE_ALT5_VENDOR="$(DEVICE_ALT5_VENDOR)" \
+       DEVICE_ALT5_MODEL="$(DEVICE_ALT5_MODEL)" \
+       DEVICE_ALT5_VARIANT="$(DEVICE_ALT5_VARIANT)" \
        DEVICE_TITLE="$(DEVICE_TITLE)" \
        DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \
        TARGET="$(BOARD)" \
@@ -701,6 +774,9 @@ $(if $(strip $(DEVICE_ALT0_TITLE)),Alternative device titles:
 - $(DEVICE_ALT0_TITLE))
 $(if $(strip $(DEVICE_ALT1_TITLE)),- $(DEVICE_ALT1_TITLE))
 $(if $(strip $(DEVICE_ALT2_TITLE)),- $(DEVICE_ALT2_TITLE))
+$(if $(strip $(DEVICE_ALT3_TITLE)),- $(DEVICE_ALT3_TITLE))
+$(if $(strip $(DEVICE_ALT4_TITLE)),- $(DEVICE_ALT4_TITLE))
+$(if $(strip $(DEVICE_ALT5_TITLE)),- $(DEVICE_ALT5_TITLE))
 @@
 
 endef
@@ -718,6 +794,18 @@ ifneq ($$(strip $$(DEVICE_ALT2_TITLE)),)
 DEVICE_DISPLAY = $$(DEVICE_ALT2_TITLE) ($$(DEVICE_TITLE))
 $$(info $$(call Device/DumpInfo,$(1)))
 endif
+ifneq ($$(strip $$(DEVICE_ALT3_TITLE)),)
+DEVICE_DISPLAY = $$(DEVICE_ALT3_TITLE) ($$(DEVICE_TITLE))
+$$(info $$(call Device/DumpInfo,$(1)))
+endif
+ifneq ($$(strip $$(DEVICE_ALT4_TITLE)),)
+DEVICE_DISPLAY = $$(DEVICE_ALT4_TITLE) ($$(DEVICE_TITLE))
+$$(info $$(call Device/DumpInfo,$(1)))
+endif
+ifneq ($$(strip $$(DEVICE_ALT5_TITLE)),)
+DEVICE_DISPLAY = $$(DEVICE_ALT5_TITLE) ($$(DEVICE_TITLE))
+$$(info $$(call Device/DumpInfo,$(1)))
+endif
 DEVICE_DISPLAY = $$(DEVICE_TITLE)
 $$(eval $$(if $$(DEVICE_TITLE),$$(info $$(call Device/DumpInfo,$(1)))))
 endef
Staging tree of Stijn Tintel