From 4157f3e0123e12871fd039acfdaa8a3ee465d8b9 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 21 May 2019 08:38:57 -0700 Subject: [PATCH] gdb: Remove the RISC-V GDB Now that GDB 8.3 has been merged into the meta layer we no longer need a custom GDB version. Signed-off-by: Alistair Francis --- conf/machine/baremetal-riscv32.conf | 2 -- conf/machine/baremetal-riscv64.conf | 2 -- conf/machine/freedom-u540.conf | 2 -- conf/machine/include/qemuriscv.inc | 2 -- .../gdb/gdb-cross-canadian_riscv.bb | 5 --- recipes-devtools/gdb/gdb-cross_riscv.bb | 2 -- recipes-devtools/gdb/gdb-riscv.inc | 10 ------ recipes-devtools/gdb/gdb_riscv.bb | 31 ------------------- 8 files changed, 56 deletions(-) delete mode 100644 recipes-devtools/gdb/gdb-cross-canadian_riscv.bb delete mode 100644 recipes-devtools/gdb/gdb-cross_riscv.bb delete mode 100644 recipes-devtools/gdb/gdb-riscv.inc delete mode 100644 recipes-devtools/gdb/gdb_riscv.bb diff --git a/conf/machine/baremetal-riscv32.conf b/conf/machine/baremetal-riscv32.conf index 2be64dd..fbc8d69 100644 --- a/conf/machine/baremetal-riscv32.conf +++ b/conf/machine/baremetal-riscv32.conf @@ -6,8 +6,6 @@ DEFAULTTUNE = "riscv32" require conf/machine/include/qemu.inc require conf/machine/include/tune-riscv.inc -GDBVERSION = "riscv" - # qemuboot options QB_MACHINE = "-machine virt" QB_DEFAULT_KERNEL = "fw_payload.elf" diff --git a/conf/machine/baremetal-riscv64.conf b/conf/machine/baremetal-riscv64.conf index 74d1151..39da3b6 100644 --- a/conf/machine/baremetal-riscv64.conf +++ b/conf/machine/baremetal-riscv64.conf @@ -6,8 +6,6 @@ DEFAULTTUNE = "riscv64" require conf/machine/include/qemu.inc require conf/machine/include/tune-riscv.inc -GDBVERSION = "riscv" - # qemuboot options QB_MACHINE = "-machine virt" QB_DEFAULT_KERNEL = "fw_payload.elf" diff --git a/conf/machine/freedom-u540.conf b/conf/machine/freedom-u540.conf index 5f8eb71..054faf7 100644 --- a/conf/machine/freedom-u540.conf +++ b/conf/machine/freedom-u540.conf @@ -11,8 +11,6 @@ KERNEL_IMAGETYPE = "Image" PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline" -GDBVERSION = "riscv" - EXTRA_IMAGEDEPENDS += "opensbi" RISCV_SBI_PLAT = "sifive/fu540" diff --git a/conf/machine/include/qemuriscv.inc b/conf/machine/include/qemuriscv.inc index 1ceeb45..72395a3 100644 --- a/conf/machine/include/qemuriscv.inc +++ b/conf/machine/include/qemuriscv.inc @@ -7,8 +7,6 @@ MACHINE_FEATURES = "screen keyboard ext2 ext3 serial" KERNEL_IMAGETYPE = "Image" -GDBVERSION = "riscv" - SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0" IMAGE_FSTYPES_append = " ext4" diff --git a/recipes-devtools/gdb/gdb-cross-canadian_riscv.bb b/recipes-devtools/gdb/gdb-cross-canadian_riscv.bb deleted file mode 100644 index e97e599..0000000 --- a/recipes-devtools/gdb/gdb-cross-canadian_riscv.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-devtools/gdb/gdb-common.inc -require recipes-devtools/gdb/gdb-cross-canadian.inc -require gdb-${PV}.inc - -DEPENDS += "bison-native" diff --git a/recipes-devtools/gdb/gdb-cross_riscv.bb b/recipes-devtools/gdb/gdb-cross_riscv.bb deleted file mode 100644 index 62dae91..0000000 --- a/recipes-devtools/gdb/gdb-cross_riscv.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-devtools/gdb/gdb-cross.inc -require gdb-${PV}.inc diff --git a/recipes-devtools/gdb/gdb-riscv.inc b/recipes-devtools/gdb/gdb-riscv.inc deleted file mode 100644 index 5bd0509..0000000 --- a/recipes-devtools/gdb/gdb-riscv.inc +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRCREV = "9d1447e09d4aa673826039321163b5a684e8e043" -SRC_URI = "git://sourceware.org/git/binutils-gdb.git" -S = "${WORKDIR}/git" - diff --git a/recipes-devtools/gdb/gdb_riscv.bb b/recipes-devtools/gdb/gdb_riscv.bb deleted file mode 100644 index fcbbbe8..0000000 --- a/recipes-devtools/gdb/gdb_riscv.bb +++ /dev/null @@ -1,31 +0,0 @@ -require recipes-devtools/gdb/gdb.inc -require gdb-${PV}.inc - -DEPENDS += "bison-native" - -inherit python3-dir - -EXTRA_OEMAKE_append_libc-musl = "\ - gt_cv_func_gnugettext1_libc=yes \ - gt_cv_func_gnugettext2_libc=yes \ - gl_cv_func_gettimeofday_clobber=no \ - " - -do_configure_prepend() { - if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then - cat > ${WORKDIR}/python << EOF -#!/bin/sh -case "\$2" in - --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; - --exec-prefix) echo "${exec_prefix}" ;; - *) exit 1 ;; -esac -exit 0 -EOF - chmod +x ${WORKDIR}/python - fi -} -CFLAGS_append_libc-musl = " -Drpl_gettimeofday=gettimeofday" - -ALLOW_EMPTY_gdbserver = "1"