summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-09-30 00:00:56 +1000
committerNathan Rossi <nathan@nathanrossi.com>2017-10-18 18:00:09 +1000
commitf27e34fc790b5571fdd7bcd8a36320353f5fbb8c (patch)
treef8f6e4fdd9f3b09ec5cbd831f3b059fae10bdfc9 /conf
parent0fb4608c502f2d333ef964a08a3d6adfb5fcc5ac (diff)
downloadmeta-xilinx-f27e34fc790b5571fdd7bcd8a36320353f5fbb8c.tar.gz
tune-*.inc: Remove KMACHINE
KMACHINE is now set by the kernel recipe, this is due to different kernels providing different kmeta sources which can provide one or more different KMACHINEs for a specific machine. Additionally linux-xlnx no longer uses KMACHINEs and is defaulted to the linux-xlnx trees defconfigs. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/tune-microblaze.inc3
-rw-r--r--conf/machine/include/tune-zynq.inc3
-rw-r--r--conf/machine/include/tune-zynqmp.inc4
3 files changed, 0 insertions, 10 deletions
diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index 382d885e..835de41b 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -12,9 +12,6 @@ KERNEL_IMAGETYPE ?= "linux.bin.ub"
12# U-Boot Configuration 12# U-Boot Configuration
13UBOOT_MACHINE ?= "microblaze-generic_config" 13UBOOT_MACHINE ?= "microblaze-generic_config"
14 14
15# linux-yocto KMACHINE
16KMACHINE ?= "microblaze"
17
18# default to use the gdb 7.7.1 15# default to use the gdb 7.7.1
19PREFERRED_VERSION_gdb ?= "7.7.1" 16PREFERRED_VERSION_gdb ?= "7.7.1"
20PREFERRED_VERSION_gdb-cross ?= "7.7.1" 17PREFERRED_VERSION_gdb-cross ?= "7.7.1"
diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
index cb0ebec1..19e73412 100644
--- a/conf/machine/include/tune-zynq.inc
+++ b/conf/machine/include/tune-zynq.inc
@@ -10,6 +10,3 @@ KERNEL_IMAGETYPE ?= "uImage"
10# Set default load address. 10# Set default load address.
11# Override with KERNEL_EXTRA_ARGS_<board> += "..." in machine file if required 11# Override with KERNEL_EXTRA_ARGS_<board> += "..." in machine file if required
12KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000" 12KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
13
14# KMACHINE
15KMACHINE ?= "zynq"
diff --git a/conf/machine/include/tune-zynqmp.inc b/conf/machine/include/tune-zynqmp.inc
index e0285806..79c62969 100644
--- a/conf/machine/include/tune-zynqmp.inc
+++ b/conf/machine/include/tune-zynqmp.inc
@@ -6,7 +6,3 @@ require conf/machine/include/soc-family.inc
6 6
7# Linux Configuration 7# Linux Configuration
8KERNEL_IMAGETYPE ?= "Image" 8KERNEL_IMAGETYPE ?= "Image"
9
10# KMACHINE
11KMACHINE ?= "zynqmp"
12