From 6c799115cbd4dc825b7c5dd4d60fe01e5128817b Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Tue, 7 Feb 2017 20:12:32 +0100 Subject: fpga/microchip16: Avoid redefinition warning Signed-off-by: Michael Buesch --- .../fpga/src/microchip16/microchip16dip14dip20/microchip16dip14dip20.v | 1 + libtoprammer/fpga/src/microchip16/microchip16sip6/microchip16sip6.v | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libtoprammer/fpga/src/microchip16/microchip16dip14dip20/microchip16dip14dip20.v b/libtoprammer/fpga/src/microchip16/microchip16dip14dip20/microchip16dip14dip20.v index 3df1c40..02cdad9 100644 --- a/libtoprammer/fpga/src/microchip16/microchip16dip14dip20/microchip16dip14dip20.v +++ b/libtoprammer/fpga/src/microchip16/microchip16dip14dip20/microchip16dip14dip20.v @@ -24,6 +24,7 @@ `include "common.vh" `include "microchip16.vh" +`undef DUT_SDIO `define DUT_SDIO 17 `define DELAY42NSEC(D42NSEC) __delay_count <= (D42NSEC) - 1;//41.666 ns wait cycle if D42NSEC = 1 diff --git a/libtoprammer/fpga/src/microchip16/microchip16sip6/microchip16sip6.v b/libtoprammer/fpga/src/microchip16/microchip16sip6/microchip16sip6.v index 5e8b3fb..f36e669 100644 --- a/libtoprammer/fpga/src/microchip16/microchip16sip6/microchip16sip6.v +++ b/libtoprammer/fpga/src/microchip16/microchip16sip6/microchip16sip6.v @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -`define DUT_SDIO 27 `include "microchip16.vh" + `ALL_WITHOUT_ZIF(microchip16sip6, 32'hDF05, 1) `ZIF_UNUSED(1) `ZIF_UNUSED(2) `ZIF_UNUSED(3) -- cgit v1.2.3