[ptxdist] [PATCH 2/2] gdb, gdbserver: prefer the source md5sum from the toolchain

[Roland Hieber <r.hieber@pengutronix.de>]

If the md5sum can be autodetected from the toolchain, we should use the
value from the toolchain and ignore the value specified in the menu.
This eases migration for BSPs that previously specified it in the menu
and didn't clear it when enabling GDB_TOOLCHAIN_VERSION (which defaults
to 'y' if GDBSERVER is used).

Some older OSELAS toolchains (and also non-OSELAS toolchains) don't set
PTXCONF_CROSS_GDB_MD5 in their ptxconfig (or they simply don't have a
ptxconfig). In those cases, the md5sum must be specified in the menu.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/gdb-menu.in  | 12 ++++++++----
 rules/pre/gdb.make |  5 +++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in
index d8be3fef8..af69aca56 100644
--- a/rules/gdb-menu.in
+++ b/rules/gdb-menu.in
@@ -22,16 +22,20 @@ config GDB_VERSION
 endif
 
 config GDB_MD5
 	string "gdb source md5sum"
 	default "d42841167fd061d90fddf9a7212a1f9f" if !GDB_TOOLCHAIN_VERSION
 	help
-	  md5sum for the gdb source archive. If the version is provided by
-	  the toolchain and the toolchain is a OSELAS.Toolchain then this
-	  can be left empty and the md5sum from the toolchain ptxconfig is
-	  used.
+	  md5sum for the gdb source archive.
+	  
+	  If the version is provided by the toolchain and its md5sum can be
+	  autodetected (e.g. with newer OSELAS.Toolchains), then the md5sum
+	  from the toolchain is used instead and the value specified here is
+	  ignored.
+	  
+	  Otherwise, specify the md5sum of the tar.xz archive.
 
 endif
 
 source "generated/debug_tools_gdb.in"
 
 endmenu
diff --git a/rules/pre/gdb.make b/rules/pre/gdb.make
index 31b1975d6..11f48381d 100644
--- a/rules/pre/gdb.make
+++ b/rules/pre/gdb.make
@@ -11,14 +11,15 @@
 SHARED_GDB_MD5		:= $(call remove_quotes,$(PTXCONF_GDB_MD5))
 
 ifdef PTXCONF_GDB_TOOLCHAIN_VERSION
 TOOLCHAIN_CONFIG	:= $(PTXDIST_PLATFORMDIR)/selected_toolchain/ptxconfig
 ifneq ($(wildcard $(TOOLCHAIN_CONFIG)),)
 SHARED_GDB_VERSION	:= $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_VERSION))
-ifeq ($(SHARED_GDB_MD5),)
-SHARED_GDB_MD5		:= $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5))
+TOOLCHAIN_GDB_MD5	:= $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5))
+ifneq ($(TOOLCHAIN_GDB_MD5),)
+SHARED_GDB_MD5		:= $(TOOLCHAIN_GDB_MD5)
 endif
 else
 SHARED_GDB_VERSION	:= $(shell $(PTXCONF_COMPILER_PREFIX)gdb -v | sed -e 's/.* //;q')
 endif
 else
 SHARED_GDB_VERSION	:= $(call remove_quotes,$(PTXCONF_GDB_VERSION))
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de