From ff3af0b21c04eb6dd5bc42cc4bd59f99b47b23a5 Mon Sep 17 00:00:00 2001
From: Andreas Olofsson <andreas@adapteva.com>
Date: Mon, 2 Nov 2015 16:15:20 -0500
Subject: [PATCH] Fixing include files for emailbox - All "folders" should be
 independent

---
 emailbox/hdl/emailbox.v        |  2 +-
 emailbox/hdl/emailbox_regmap.v | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/emailbox/hdl/emailbox.v b/emailbox/hdl/emailbox.v
index ab980ef..9750515 100644
--- a/emailbox/hdl/emailbox.v
+++ b/emailbox/hdl/emailbox.v
@@ -18,7 +18,7 @@
  #
  ###########################################################################
  */
-//`include "emailbox_regmap.v" // is there a better way?
+`include "emailbox_regmap.v" // is there a better way?
 module emailbox (/*AUTOARG*/
    // Outputs
    mi_dout, mailbox_full, mailbox_not_empty,
diff --git a/emailbox/hdl/emailbox_regmap.v b/emailbox/hdl/emailbox_regmap.v
index 282ce7e..d8c0c88 100644
--- a/emailbox/hdl/emailbox_regmap.v
+++ b/emailbox/hdl/emailbox_regmap.v
@@ -1,7 +1,11 @@
 `ifndef EMAILBOX_REGMAP_V_
-`define EMAILBOX_REGMAP_V_
+ `define EMAILBOX_REGMAP_V_
 
-`define E_MAILBOXLO    6'd4 //F0314-reserved-->move?
-`define E_MAILBOXHI    6'd5 //F0318-reserved
+ `ifndef  E_MAILBOXLO
+  `define E_MAILBOXLO    6'd4
+ `endif
+ `ifndef  E_MAILBOXHI
+  `define E_MAILBOXHI    6'd5
+ `endif
 
 `endif