[meta-xilinx] [PATCH 5/7] tune-*.inc: Remove KMACHINE

Nathan Rossi nathan at nathanrossi.com
Thu Oct 5 05:20:51 PDT 2017


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 at nathanrossi.com>
---
 conf/machine/include/tune-microblaze.inc | 3 ---
 conf/machine/include/tune-zynq.inc       | 3 ---
 conf/machine/include/tune-zynqmp.inc     | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index 382d885e02..835de41b44 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -12,9 +12,6 @@ KERNEL_IMAGETYPE ?= "linux.bin.ub"
 # U-Boot Configuration
 UBOOT_MACHINE ?= "microblaze-generic_config"
 
-# linux-yocto KMACHINE
-KMACHINE ?= "microblaze"
-
 # default to use the gdb 7.7.1
 PREFERRED_VERSION_gdb ?= "7.7.1"
 PREFERRED_VERSION_gdb-cross ?= "7.7.1"
diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
index cb0ebec1c8..19e7341257 100644
--- a/conf/machine/include/tune-zynq.inc
+++ b/conf/machine/include/tune-zynq.inc
@@ -10,6 +10,3 @@ KERNEL_IMAGETYPE ?= "uImage"
 # Set default load address.
 # Override with KERNEL_EXTRA_ARGS_<board> += "..." in machine file if required
 KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
-
-# KMACHINE
-KMACHINE ?= "zynq"
diff --git a/conf/machine/include/tune-zynqmp.inc b/conf/machine/include/tune-zynqmp.inc
index e0285806a4..79c6296969 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
 
 # Linux Configuration
 KERNEL_IMAGETYPE ?= "Image"
-
-# KMACHINE
-KMACHINE ?= "zynqmp"
-
-- 
2.14.2





More information about the meta-xilinx mailing list