Commit a1cfe20d authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

linux: fix appended dtb handling of pre/post v3.8-rc1 



The $(wildcard ) doesn't work for LINUX_APPEND_DTB, because the .dtb
doesn't exist yet at that point.

Also factor the common part out.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b0e63e5b

linux/linux.mk

+12 −15
Original line number Diff line number Diff line
@@ -201,23 +201,20 @@ endef 
endif

endif



ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)

define LINUX_APPEND_DTB

ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)

# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1

	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\

		$(KERNEL_DTS_NAME).dtb dts/$(KERNEL_DTS_NAME).dtb)) \

		>> $(KERNEL_ARCH_PATH)/boot/zImage

	# We need to generate the uImage here after that so that the uImage is

	# generated with the right image size.

	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage

endef

else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)

define LINUX_APPEND_DTB

	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1

	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\

		$(KERNEL_DTS_NAME).dtb dts/$(KERNEL_DTS_NAME).dtb)) \

		>> $(KERNEL_ARCH_PATH)/boot/zImage

	if [ -e $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb ]; then \

		cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb; \

	else \

		cat $(KERNEL_ARCH_PATH)/boot/dts/$(KERNEL_DTS_NAME).dtb; \

	fi >> $(KERNEL_ARCH_PATH)/boot/zImage

endef

ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)

# We need to generate the uImage here after that so that the uImage is

# generated with the right image size.

LINUX_APPEND_DTB += $(sep)$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage

endif

endif



# Compilation. We make sure the kernel gets rebuilt when the