diff options
| author | Tom Rini <[email protected]> | 2026-07-06 18:26:12 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-07-06 18:26:12 -0600 |
| commit | ee5d46b45ec0c63f8f9dd1e816e0dac3452ccc3d (patch) | |
| tree | 800cd9e204ca027144070101884c0d5d3c00130f /Makefile | |
| parent | ece349ade2973e220f524ce59e59711cc919263f (diff) | |
| parent | a18265f1ccb7a272721ed4286ed3b5a6182ff424 (diff) | |
Merge branch 'next'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 15 insertions, 14 deletions
@@ -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 @@ -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) |