diff options
| -rw-r--r-- | mk/kernel-ver.mk | 10 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion | 16 | ||||
| -rw-r--r-- | target/linux/patches/4.12.10/regmap-default-on.patch (renamed from target/linux/patches/4.12.4/regmap-default-on.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.12.10/startup.patch (renamed from target/linux/patches/4.12.4/startup.patch) | 0 |
4 files changed, 22 insertions, 4 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index b4cd72623..87de97c4a 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -15,11 +15,17 @@ KERNEL_FILE_VER:= $(ADK_TARGET_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif +ifeq ($(ADK_TARGET_KERNEL_VERSION_4_13),y) +KERNEL_FILE_VER:= 4.13 +KERNEL_RELEASE:= 1 +KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) +KERNEL_HASH:= 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c +endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_12),y) -KERNEL_FILE_VER:= 4.12.4 +KERNEL_FILE_VER:= 4.12.10 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f470d75f1f5a375f6882958daf96e7f8552fff28702b70abf3744e1711ef5ac9 +KERNEL_HASH:= c0fbf7b7fdd518a6e731fc7a6f0d9ade0840f553007dd414a223eb4a83a7a684 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y) KERNEL_FILE_VER:= 4.9.40 diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index 652e1d377..c881bdd89 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -15,7 +15,7 @@ default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default ADK_TARGET_KERNEL_VERSION_4_6 if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 -default ADK_TARGET_KERNEL_VERSION_4_12 if ADK_TARGET_SYSTEM_ORANGE_PI0 +default ADK_TARGET_KERNEL_VERSION_4_13 if ADK_TARGET_SYSTEM_ORANGE_PI0 default ADK_TARGET_KERNEL_VERSION_4_9 config ADK_TARGET_KERNEL_VERSION_GIT @@ -29,8 +29,19 @@ config ADK_TARGET_KERNEL_VERSION_GIT select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK +config ADK_TARGET_KERNEL_VERSION_4_13 + bool "4.13" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_CSKY + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_RISCV32 + depends on !ADK_TARGET_ARCH_RISCV64 + depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + config ADK_TARGET_KERNEL_VERSION_4_12 - bool "4.12.4" + bool "4.12.10" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY @@ -39,6 +50,7 @@ config ADK_TARGET_KERNEL_VERSION_4_12 depends on !ADK_TARGET_ARCH_RISCV32 depends on !ADK_TARGET_ARCH_RISCV64 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 config ADK_TARGET_KERNEL_VERSION_4_9 bool "4.9.40" diff --git a/target/linux/patches/4.12.4/regmap-default-on.patch b/target/linux/patches/4.12.10/regmap-default-on.patch index f27eb1d94..f27eb1d94 100644 --- a/target/linux/patches/4.12.4/regmap-default-on.patch +++ b/target/linux/patches/4.12.10/regmap-default-on.patch diff --git a/target/linux/patches/4.12.4/startup.patch b/target/linux/patches/4.12.10/startup.patch index e54ac19a6..e54ac19a6 100644 --- a/target/linux/patches/4.12.4/startup.patch +++ b/target/linux/patches/4.12.10/startup.patch |