diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
index fe08196d..d820da92 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
@@ -20,8 +20,9 @@
                 <memory-segment start="0x0000" size="0x001000" type="io" rw="RW" exec="0" name="IO"/>
                 <memory-segment start="0x1000" size="0x000800" type="eeprom" rw="RW" exec="0" name="MAPPED_EEPROM"/>
                 <memory-segment start="0x2000" size="0x002000" type="ram" rw="RW" exec="0" name="INTERNAL_SRAM"/>
-                <memory-segment start="0x4000" size="0xFFBFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"
-                                external="true"/>
+                <!-- We don't support external SRAM (for now) -->
+<!--                <memory-segment start="0x4000" size="0xFFBFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"-->
+<!--                                external="true"/>-->
             </address-space>
             <address-space name="eeprom" id="eeprom" start="0x0000" size="0x0800">
                 <memory-segment start="0x0000" size="0x0800" type="eeprom" rw="RW" exec="0" name="EEPROM"
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
index 0c6c4f21..8f291c56 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
@@ -24,8 +24,9 @@
                 <memory-segment start="0x0000" size="0x001000" type="io" rw="RW" exec="0" name="IO"/>
                 <memory-segment start="0x1000" size="0x000800" type="eeprom" rw="RW" exec="0" name="MAPPED_EEPROM"/>
                 <memory-segment start="0x2000" size="0x002000" type="ram" rw="RW" exec="0" name="INTERNAL_SRAM"/>
-                <memory-segment start="0x4000" size="0xFFBFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"
-                                external="true"/>
+                <!-- We don't support external SRAM (for now) -->
+<!--                <memory-segment start="0x4000" size="0xFFBFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"-->
+<!--                                external="true"/>-->
             </address-space>
             <address-space name="eeprom" id="eeprom" start="0x00000" size="0x0800">
                 <memory-segment start="0x00000" size="0x0800" type="eeprom" rw="RW" exec="0" name="EEPROM"
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
index 74c167bd..75f3a6e2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
@@ -20,8 +20,9 @@
                 <memory-segment start="0x0000" size="0x001000" type="io" rw="RW" exec="0" name="IO"/>
                 <memory-segment start="0x1000" size="0x000800" type="eeprom" rw="RW" exec="0" name="MAPPED_EEPROM"/>
                 <memory-segment start="0x2000" size="0x001000" type="ram" rw="RW" exec="0" name="INTERNAL_SRAM"/>
-                <memory-segment start="0x3000" size="0xFFCFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"
-                                external="true"/>
+                <!-- We don't support external SRAM (for now) -->
+<!--                <memory-segment start="0x3000" size="0xFFCFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"-->
+<!--                                external="true"/>-->
             </address-space>
             <address-space name="eeprom" id="eeprom" start="0x0000" size="0x0800">
                 <memory-segment start="0x0000" size="0x0800" type="eeprom" rw="RW" exec="0" name="EEPROM"
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
index 174857de..404737fa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
@@ -24,8 +24,9 @@
                 <memory-segment start="0x0000" size="0x001000" type="io" rw="RW" exec="0" name="IO"/>
                 <memory-segment start="0x1000" size="0x000800" type="eeprom" rw="RW" exec="0" name="MAPPED_EEPROM"/>
                 <memory-segment start="0x2000" size="0x001000" type="ram" rw="RW" exec="0" name="INTERNAL_SRAM"/>
-                <memory-segment start="0x3000" size="0xFFCFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"
-                                external="true"/>
+                <!-- We don't support external SRAM (for now) -->
+<!--                <memory-segment start="0x3000" size="0xFFCFFF" type="ram" rw="RW" exec="0" name="EXTERNAL_SRAM"-->
+<!--                                external="true"/>-->
             </address-space>
             <address-space name="eeprom" id="eeprom" start="0x00000" size="0x0800">
                 <memory-segment start="0x00000" size="0x0800" type="eeprom" rw="RW" exec="0" name="EEPROM"