NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: handle new dtb location since 3.8-rc1 for appended dtbs

Browse Source 
Similar to how we've done it for seperate dtbs (ef34705087).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2013-01-06 16:47:05 +01:00
parent de1eb105a4
commit 5b33e0b6a1
1 changed files with 9 additions and 2 deletions

11
linux/linux.mk
View File

@ -203,14 +203,21 @@ endif
ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y) ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
define LINUX_APPEND_DTB define LINUX_APPEND_DTB
cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb >> $(KERNEL_ARCH_PATH)/boot/zImage 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
# We need to generate the uImage here after that so that the uImage is # We need to generate the uImage here after that so that the uImage is
# generated with the right image size. # generated with the right image size.
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage
endef endef
else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y) else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
define LINUX_APPEND_DTB define LINUX_APPEND_DTB
cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb >> $(KERNEL_ARCH_PATH)/boot/zImage # 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
endef endef
endif endif