diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 4 | ||||
| -rw-r--r-- | linux/linux.mk | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/linux/Config.in b/linux/Config.in index 41f039e2ca..a4977d1fe5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.13)" + bool "Latest version (4.14)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (v4.4.83-cip8)" @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.13.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.83-cip8" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.mk b/linux/linux.mk index bd5589bae0..5300b9cfc5 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -484,18 +484,17 @@ endif # BR_BUILDING $(eval $(kconfig-package)) # Support for rebuilding the kernel after the cpio archive has -# been generated in $(BINARIES_DIR)/rootfs.cpio. -$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio +# been generated. +.PHONY: linux-rebuild-with-initramfs +linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_target_installed +linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_images_installed +linux-rebuild-with-initramfs: rootfs-cpio +linux-rebuild-with-initramfs: @$(call MESSAGE,"Rebuilding kernel with initramfs") # Build the kernel. - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) + $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_TARGET_NAME) $(LINUX_APPEND_DTB) # Copy the kernel image(s) to its(their) final destination $(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR)) # If there is a .ub file copy it to the final destination test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR) - $(Q)touch $@ - -# The initramfs building code must make sure this target gets called -# after it generated the initramfs list of files. -linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt |
