Remove no longer required differences between SAME70 and SAM4x

Rename bossa/Flash to bossa/BossaFlash to avoid filename collision with
Flash in CoreN2G

5 files changed, 4 insertions, 5 deletions

diff --git a/src/bossa/Flash.cpp b/src/bossa/BossaFlash.cpp
index 953a9f5d..c1fbc0b0 100644
--- a/src/bossa/Flash.cpp
+++ b/src/bossa/BossaFlash.cpp
@@ -26,7 +26,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ///////////////////////////////////////////////////////////////////////////////
-#include "Flash.h"
+#include "BossaFlash.h"
 
 BossaFlash::BossaFlash(Samba& samba,
 			const char* name,
diff --git a/src/bossa/Flash.h b/src/bossa/BossaFlash.h
index afc03664..afc03664 100644
--- a/src/bossa/Flash.h
+++ b/src/bossa/BossaFlash.h
diff --git a/src/bossa/Device.h b/src/bossa/Device.h
index f0a2e5b7..755cc9df 100644
--- a/src/bossa/Device.h
+++ b/src/bossa/Device.h
@@ -30,8 +30,7 @@
 #define _DEVICE_H
 
 #include "Samba.h"
-#include "Flash.h"
-
+#include "BossaFlash.h"
 #include "GCodes/GCodeException.h"
 
 typedef GCodeException DeviceUnsupportedError;
diff --git a/src/bossa/EefcFlash.h b/src/bossa/EefcFlash.h
index 58ea811c..91dc3682 100644
--- a/src/bossa/EefcFlash.h
+++ b/src/bossa/EefcFlash.h
@@ -31,7 +31,7 @@
 
 #include <cstdint>
 
-#include "Flash.h"
+#include "BossaFlash.h"
 
 class EefcFlash : public BossaFlash
 {
diff --git a/src/bossa/Flasher.h b/src/bossa/Flasher.h
index 5198e2a0..f3421883 100644
--- a/src/bossa/Flasher.h
+++ b/src/bossa/Flasher.h
@@ -30,7 +30,7 @@
 #define _FLASHER_H
 
 #include "Device.h"
-#include "Flash.h"
+#include "BossaFlash.h"
 #include "Samba.h"
 
 #include "GCodes/GCodeException.h"