summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-15 19:15:13 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-15 19:15:30 +0200
commitd9db1a94a5ed1fb6d4c3c3c55cd01c6e6704ce3b (patch)
treead077290dd0db193c4cfe34139e4aac5ebe5d8eb /target/config
parentaa93632c77261538bd8ea540ac78525290a8a69d (diff)
linux: update 4.x kernel, add m68k patch and allow one memory flat
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.binfmt4
-rw-r--r--target/config/Config.in.kernelversion20
2 files changed, 13 insertions, 11 deletions
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt
index 3b88791d6..69da78a44 100644
--- a/target/config/Config.in.binfmt
+++ b/target/config/Config.in.binfmt
@@ -33,13 +33,13 @@ default ADK_TARGET_BINFMT_FLAT_ONE
config ADK_TARGET_BINFMT_FLAT_ONE
bool "One memory region"
- depends on ADK_TARGET_ARCH_BFIN
+ depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_M68K
help
All segments are linked into one memory region.
config ADK_TARGET_BINFMT_FLAT_SEP_DATA
bool "Separate data and code region"
- depends on ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN
+ depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_M68K
help
Allow for the data and text segments to be separated and placed in
different regions of memory.
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 653a332d2..ab2041114 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -24,22 +24,16 @@ config ADK_TARGET_KERNEL_VERSION_4_6
bool "4.6.5"
depends on !ADK_TARGET_ARCH_NDS32
-config ADK_TARGET_KERNEL_VERSION_4_5
- bool "4.5.7"
- depends on !ADK_TARGET_ARCH_NDS32
- depends on !ADK_TARGET_ARCH_NIOS2
- depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
- depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-
config ADK_TARGET_KERNEL_VERSION_4_4
- bool "4.4.14"
+ bool "4.4.17"
depends on !ADK_TARGET_ARCH_NDS32
depends on !ADK_TARGET_ARCH_NIOS2
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
config ADK_TARGET_KERNEL_VERSION_4_1
- bool "4.1.26"
+ bool "4.1.30"
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_H8300
@@ -47,6 +41,7 @@ config ADK_TARGET_KERNEL_VERSION_4_1
depends on !ADK_TARGET_ARCH_NDS32
depends on !ADK_TARGET_ARCH_SPARC
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -63,6 +58,7 @@ config ADK_TARGET_KERNEL_VERSION_3_18
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -77,6 +73,7 @@ config ADK_TARGET_KERNEL_VERSION_3_14
depends on !ADK_TARGET_BOARD_ATH79
depends on !ADK_TARGET_BOARD_BCM28XX
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -93,6 +90,7 @@ config ADK_TARGET_KERNEL_VERSION_3_12
depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -110,6 +108,7 @@ config ADK_TARGET_KERNEL_VERSION_3_10
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -125,6 +124,7 @@ config ADK_TARGET_KERNEL_VERSION_3_4
depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -141,6 +141,7 @@ config ADK_TARGET_KERNEL_VERSION_3_2
depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -157,6 +158,7 @@ config ADK_TARGET_KERNEL_VERSION_2_6_32
depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6