mirror of
https://github.com/armbian/build.git
synced 2025-08-09 20:56:57 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
90 lines
2.5 KiB
Diff
90 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: The-going <48602507+The-going@users.noreply.github.com>
|
|
Date: Tue, 1 Feb 2022 21:04:08 +0300
|
|
Subject: scripts: add overlay compilation support
|
|
|
|
---
|
|
.gitignore | 1 +
|
|
scripts/Makefile.dtbinst | 16 ++++++++--
|
|
scripts/Makefile.lib | 9 ++++++
|
|
3 files changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/.gitignore b/.gitignore
|
|
index 0bbae167bf93..d790eee1273d 100644
|
|
--- a/.gitignore
|
|
+++ b/.gitignore
|
|
@@ -42,6 +42,7 @@
|
|
*.rpm
|
|
*.rsi
|
|
*.s
|
|
+*.scr
|
|
*.so
|
|
*.so.dbg
|
|
*.su
|
|
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
|
|
index 4405d5b67578..6e3f7fa513d5 100644
|
|
--- a/scripts/Makefile.dtbinst
|
|
+++ b/scripts/Makefile.dtbinst
|
|
@@ -19,8 +19,10 @@ include $(kbuild-file)
|
|
|
|
dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
|
|
subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
|
|
+script-files := $(addprefix $(dst)/, $(scr-y))
|
|
+readme-files := $(addprefix $(dst)/, $(dtbotxt-y))
|
|
|
|
-__dtbs_install: $(dtbs) $(subdirs)
|
|
+__dtbs_install: $(dtbs) $(script-files) $(readme-files) $(subdirs)
|
|
@:
|
|
|
|
quiet_cmd_dtb_install = INSTALL $@
|
|
@@ -32,8 +34,18 @@ $(dst)/%.dtb: $(obj)/%.dtb
|
|
$(dst)/%.dtbo: $(obj)/%.dtbo
|
|
$(call cmd,dtb_install)
|
|
|
|
+$(dst)/%.scr: $(obj)/%.scr
|
|
+ $(call cmd,dtb_install)
|
|
+
|
|
+$(dst)/README.%-overlays: $(obj)/README.%-overlays
|
|
+ $(call cmd,dtb_install)
|
|
+
|
|
PHONY += $(subdirs)
|
|
$(subdirs):
|
|
- $(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
|
|
+ $(Q)if [ $(subst $(obj)/,,$@) = overlay ]; then \
|
|
+ $(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@); \
|
|
+ else \
|
|
+ $(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@)); \
|
|
+ fi
|
|
|
|
.PHONY: $(PHONY)
|
|
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
|
index 68d0134bdbf9..8fe35137004f 100644
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -88,6 +88,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m,
|
|
|
|
always-y += $(dtb-y)
|
|
|
|
+# Overlay Fixup script targets
|
|
+extra-y += $(scr-y) $(dtbotxt-y)
|
|
+
|
|
# Add subdir path
|
|
|
|
ifneq ($(obj),.)
|
|
@@ -421,6 +424,12 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
|
|
$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
|
|
$(call if_changed_dep,dtc)
|
|
|
|
+quiet_cmd_scr = MKIMAGE $@
|
|
+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
|
|
+
|
|
+$(obj)/%.scr: $(src)/%.scr-cmd FORCE
|
|
+ $(call if_changed,scr)
|
|
+
|
|
dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
|
|
|
|
# Bzip2
|
|
--
|
|
Armbian
|
|
|