Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4355151d authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'all-dtbs' into dt/next

parents 5d5a0ab1 92f687f4

Makefile

+36 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE 
# Carefully list dependencies so we do not try to build scripts twice

# in parallel

PHONY += scripts

scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h)

scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)

	$(Q)$(MAKE) $(build)=$(@)



# Things we need to do before we recursively start building the kernel
@@ -1215,6 +1215,35 @@ kselftest-merge: 
		$(srctree)/tools/testing/selftests/*/config

	+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig



# ---------------------------------------------------------------------------

# Devicetree files



ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/boot/dts/),)

dtstree := arch/$(SRCARCH)/boot/dts

endif



ifneq ($(dtstree),)



%.dtb: prepare3 scripts_dtc

	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@



PHONY += dtbs dtbs_install

dtbs: prepare3 scripts_dtc

	$(Q)$(MAKE) $(build)=$(dtstree)



dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(dtstree)



ifdef CONFIG_OF_EARLY_FLATTREE

all: dtbs

endif



endif



PHONY += scripts_dtc

scripts_dtc: scripts_basic

	$(Q)$(MAKE) $(build)=scripts/dtc



# ---------------------------------------------------------------------------

# Modules
@@ -1424,6 +1453,12 @@ help: 
	@echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existing'

	@echo  '                    .config.'

	@echo  ''

	@$(if $(dtstree), \

		echo 'Devicetree:'; \

		echo '* dtbs            - Build device tree blobs for enabled boards'; \

		echo '  dtbs_install    - Install dtbs to $(INSTALL_DTBS_PATH)'; \

		echo '')



	@echo 'Userspace tools targets:'

	@echo '  use "make tools/help"'

	@echo '  or  "cd tools; make help"'

arch/arc/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -132,11 +132,5 @@ boot_targets += uImage uImage.bin uImage.gz 
$(boot_targets): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



%.dtb %.dtb.S %.dtb.o: scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@



dtbs: scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/arm/Makefile

+1 −19
Original line number Diff line number Diff line
@@ -307,12 +307,7 @@ else 
KBUILD_IMAGE := $(boot)/zImage

endif



# Build the DT binary blobs if we have OF configured

ifeq ($(CONFIG_USE_OF),y)

KBUILD_DTBS := dtbs

endif



all:	$(notdir $(KBUILD_IMAGE)) $(KBUILD_DTBS)

all:	$(notdir $(KBUILD_IMAGE))





archheaders:
@@ -339,17 +334,6 @@ $(BOOT_TARGETS): vmlinux 
$(INSTALL_TARGETS):

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb: | scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@



PHONY += dtbs dtbs_install



dtbs: prepare scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts



dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts



PHONY += vdso_install

vdso_install:

ifeq ($(CONFIG_VDSO),y)
@@ -371,8 +355,6 @@ define archhelp 
  echo  '  uImage        - U-Boot wrapped zImage'

  echo  '  bootpImage    - Combined zImage and initial RAM disk'

  echo  '                  (supply initrd image via make variable INITRD=<path>)'

  echo  '* dtbs          - Build device tree blobs for enabled boards'

  echo  '  dtbs_install  - Install dtbs to $(INSTALL_DTBS_PATH)'

  echo  '  install       - Install uncompressed kernel'

  echo  '  zinstall      - Install compressed kernel'

  echo  '  uinstall      - Install U-Boot wrapped compressed kernel'

arch/arm64/Makefile

+1 −16
Original line number Diff line number Diff line
@@ -113,9 +113,8 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a 
# Default target when executing plain make

boot		:= arch/arm64/boot

KBUILD_IMAGE	:= $(boot)/Image.gz

KBUILD_DTBS	:= dtbs



all:	Image.gz $(KBUILD_DTBS)

all:	Image.gz





Image: vmlinux
@@ -127,17 +126,6 @@ Image.%: Image 
zinstall install:

	$(Q)$(MAKE) $(build)=$(boot) $@



%.dtb: scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@



PHONY += dtbs dtbs_install



dtbs: prepare scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts



dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts



PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
@@ -145,7 +133,6 @@ vdso_install: 
# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(boot)/dts



# We need to generate vdso-offsets.h before compiling certain files in kernel/.

# In order to do that, we should use the archprepare target, but we can't since
@@ -160,8 +147,6 @@ vdso_prepare: prepare0 
define archhelp

  echo  '* Image.gz      - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'

  echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'

  echo  '* dtbs          - Build device tree blobs for enabled boards'

  echo  '  dtbs_install  - Install dtbs to $(INSTALL_DTBS_PATH)'

  echo  '  install       - Install uncompressed kernel'

  echo  '  zinstall      - Install compressed kernel'

  echo  '                  Install using (your) ~/bin/installkernel or'

arch/c6x/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ boot := arch/$(ARCH)/boot 
DTB:=$(subst dtbImage.,,$(filter dtbImage.%, $(MAKECMDGOALS)))

export DTB



ifneq ($(DTB),)

core-y	+= $(boot)/dts/

endif



# With make 3.82 we cannot mix normal and wildcard targets