machine-xilinx-default.inc: Setup MicroBlaze preferred GDB

With the perspective removal of tune-microblaze.inc, the following
preferred GDB version configuration for MicroBlaze needs to be
relocated.

This change also drops the setting of gdb-cross* targets as they were
not setup properly since "gdb-cross-${TARGET_ARCH}" was not specified
correctly. This is also preferred as newer GDB (e.g. 8.0) does support
gdb-cross for debugging (just not gdbserver/gdb).

Ideally the MicroBlaze GDB patches should be updated to support the
newest GDB and or upstreamed. However this setup continues to be
available until that occurs.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
index b8f6dd3b..77fbec88 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -36,3 +36,7 @@ XSERVER ?= " \
 
 XSERVER_EXT ?= ""
 XSERVER_EXT_zynqmp ?= "xf86-video-armsoc"
+
+# For MicroBlaze default all microblaze machines to use GDB 7.7.1 (for gdbserver/gdb)
+PREFERRED_VERSION_gdb_microblaze = "7.7.1"
+
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc b/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
index 84b38325..73512fc6 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
+++ b/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
@@ -9,8 +9,3 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
 # U-Boot Configuration
 UBOOT_MACHINE ?= "microblaze-generic_config"
 
-# default to use the gdb 7.7.1
-PREFERRED_VERSION_gdb ?= "7.7.1"
-PREFERRED_VERSION_gdb-cross ?= "7.7.1"
-PREFERRED_VERSION_gdb-cross-canadian ?= "7.7.1"
-