diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 4 | ||||
| -rw-r--r-- | linux/linux.mk | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/linux/Config.in b/linux/Config.in index 3c50acc22..f48e6609e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_3_7 - bool "3.7.6" + bool "3.7.8" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION config BR2_LINUX_KERNEL_VERSION string - default "3.7.6" if BR2_LINUX_KERNEL_3_7 + default "3.7.8" if BR2_LINUX_KERNEL_3_7 default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.mk b/linux/linux.mk index 91a9f500b..0352acd50 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -198,6 +198,13 @@ define LINUX_INSTALL_DTB $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \ $(BINARIES_DIR)/ endef +define LINUX_INSTALL_DTB_TARGET + # dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1 + cp $(addprefix \ + $(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \ + $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \ + $(TARGET_DIR)/boot/ +endef endif endif @@ -234,6 +241,7 @@ endef ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y) define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) + $(LINUX_INSTALL_DTB_TARGET) endef endif |