From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 9 Aug 2011 18:14:50 +0000 (+0200)
Subject: Revert "dsp5680xx: disable for now, it generates warnings"
X-Git-Tag: v0.6.0-rc1~638
X-Git-Url: https://review.openocd.org/gitweb?a=commitdiff_plain;h=7d2bf8805df5ec9f108758188e85f2d355f720c4;hp=c2c19c50186f6686c072f65ade8984771987305f;p=openocd.git

Revert "dsp5680xx: disable for now, it generates warnings"

This reverts commit d567df02b9f3e7d2e7e78b3c2907ecad9aa4bbd4.
---

diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
index 6dd95fe49c..d7d66b0381 100644
--- a/src/flash/nor/Makefile.am
+++ b/src/flash/nor/Makefile.am
@@ -31,10 +31,8 @@ NOR_DRIVERS = \
 	str9xpec.c \
 	tms470.c \
 	virtual.c \
-	fm3.c
-
-# Disabled for now, it generates warnings
-# dsp5680xx_flash.c 
+	fm3.c \
+	dsp5680xx_flash.c
 
 noinst_HEADERS = \
 	core.h \
diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c
index 669b0b9f07..5d6e248201 100644
--- a/src/flash/nor/drivers.c
+++ b/src/flash/nor/drivers.c
@@ -43,7 +43,7 @@ extern struct flash_driver faux_flash;
 extern struct flash_driver virtual_flash;
 extern struct flash_driver stmsmi_flash;
 extern struct flash_driver em357_flash;
-//extern struct flash_driver dsp5680xx_flash;
+extern struct flash_driver dsp5680xx_flash;
 extern struct flash_driver fm3_flash;
 
 /**
@@ -73,9 +73,8 @@ static struct flash_driver *flash_drivers[] = {
 	&virtual_flash,
 	&stmsmi_flash,
 	&em357_flash,
-	// Disabled for now, it generates warnings
-	//&dsp5680xx_flash,
 	&fm3_flash,
+	&dsp5680xx_flash,
 	NULL,
 };
 
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 2de064633b..27ad054fb1 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -33,10 +33,8 @@ libtarget_la_SOURCES = \
 	$(MIPS32_SRC) \
 	avrt.c \
 	dsp563xx.c \
-	dsp563xx_once.c
-	
-# This file generates warnings, disabled for now, see also target.c
-#	dsp5680xx.c
+	dsp563xx_once.c \
+	dsp5680xx.c
 
 TARGET_CORE_SRC = \
 	algorithm.c \
diff --git a/src/target/target.c b/src/target/target.c
index f62915ef35..03431560f5 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -81,7 +81,7 @@ extern struct target_type arm11_target;
 extern struct target_type mips_m4k_target;
 extern struct target_type avr_target;
 extern struct target_type dsp563xx_target;
-//extern struct target_type dsp5680xx_target;
+extern struct target_type dsp5680xx_target;
 extern struct target_type testee_target;
 extern struct target_type avr32_ap7k_target;
 
@@ -104,8 +104,7 @@ static struct target_type *target_types[] =
 	&mips_m4k_target,
 	&avr_target,
 	&dsp563xx_target,
-// Disabled for now, it generates warnings
-//	&dsp5680xx_target,
+	&dsp5680xx_target,
 	&testee_target,
 	&avr32_ap7k_target,
 	NULL,