diff --git a/hash/amiga_a1000.xml b/hash/amiga_a1000.xml
deleted file mode 100644
index 1cf25c628d6..00000000000
--- a/hash/amiga_a1000.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
-
-
-
-
-
- Workbench 1.0
- 1985
- Commodore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Workbench 1.0 (US)
- 1985
- Commodore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Workbench 1.1
- 1986
- Commodore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Workbench 1.1 (US)
- 1985
- Commodore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Workbench 1.2
- 1986
- Commodore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Workbench 1.3
- 1988
- Commodore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- EmuTOS 0.9.3
- 2014
- EmuTOS development team
-
-
-
-
-
-
-
-
-
diff --git a/hash/amiga_a3000.xml b/hash/amiga_amix.xml
similarity index 72%
rename from hash/amiga_a3000.xml
rename to hash/amiga_amix.xml
index 2e3c6ac0f83..c8ef2f1c742 100644
--- a/hash/amiga_a3000.xml
+++ b/hash/amiga_amix.xml
@@ -1,55 +1,16 @@
-
-
+
-
-
-
- Kickstart 2.01
- 1990
- Commodore
-
-
-
-
-
-
-
-
-
- Kickstart 2.04
- 1991
- Commodore
-
-
-
-
-
-
-
-
-
-
-
- A3000 Install Disk 2.03
- 1991
- Commodore
-
-
-
-
-
-
-
-
-
diff --git a/hash/amiga_workbench.xml b/hash/amiga_workbench.xml
index 9232766e525..771edc8f2eb 100644
--- a/hash/amiga_workbench.xml
+++ b/hash/amiga_workbench.xml
@@ -3,33 +3,70 @@
@@ -129,13 +190,22 @@ List of known part numbers
Workbench 1.0
1985
Commodore
-
+
+
+
+
+
+
+
+
+
-
+
+
@@ -147,55 +217,128 @@ List of known part numbers
Workbench 1.1
- 1985
+ 1986
Commodore
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 1.1 (PAL)
+ 1986
+ Commodore
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ Workbench 1.2 Rev. 33.43 (De)
+ 1986
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Workbench 1.2 Rev. 33.56 A500/A2000
1987
Commodore
-
-
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
- Workbench 1.2 Rev. 33.56 A500
+ Workbench 1.2 Rev. 33.56 A500 (US)
1987
Commodore
-
-
+
+
+
-
+
+
@@ -207,13 +350,15 @@ List of known part numbers
Workbench 1.2 Rev. 33.56 A500 (UK)
1987
Commodore
-
-
+
+
+
-
+
-
+
+
@@ -225,13 +370,15 @@ List of known part numbers
Workbench 1.2 Rev. 33.56 A500 (De)
1987
Commodore
-
-
+
+
+
-
+
+
@@ -241,20 +388,25 @@ List of known part numbers
-
-
+
+
+
+
+
Workbench 1.2 Rev. 33.56 A2000
1987
Commodore
-
-
+
+
+
-
+
-
+
+
@@ -266,13 +418,14 @@ List of known part numbers
Workbench 1.2 Rev. 33.56 A2000 (De)
1987
Commodore
-
-
+
+
-
+
+
@@ -285,13 +438,13 @@ List of known part numbers
Workbench 1.2 Rev. 33.61 A500/A2000
1987
Commodore
-
-
+
+
-
+
@@ -301,20 +454,46 @@ List of known part numbers
-
-
- Workbench 1.3 Rev. 34.20
+ Workbench 1.3 Rev. 34.20 (Enhancer Software)
1988
Commodore
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 1.3 Rev. 34.20 (US)
+ 1988
+ Commodore
+
+
+
+
+
+
+
+
+
@@ -326,14 +505,15 @@ List of known part numbers
Workbench 1.3 Rev. 34.20 (UK)
1988
Commodore
-
-
+
+
+
-
-
+
+
@@ -345,14 +525,16 @@ List of known part numbers
Workbench 1.3 Rev. 34.20 (De)
1988
Commodore
-
-
+
+
+
-
+
-
-
+
+
+
@@ -360,30 +542,72 @@ List of known part numbers
-
-
+
+
+
+ Workbench 1.3 Rev. 34.21 (No)
+ 1988
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+ Workbench 1.3 Rev. 34.20 (Dk)
+ 1988
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- Workbench 1.3.2
+ Workbench 1.3.2 Rev. 34.28 (US)
1988
Commodore
-
-
+
+
+
-
+
-
-
-
+
+
@@ -395,16 +619,15 @@ List of known part numbers
Workbench 1.3.2 Rev. 34.28 (UK)
1988
Commodore
-
-
+
+
-
+
-
-
-
+
+
@@ -413,17 +636,19 @@ List of known part numbers
- Workbench 1.3.2 (De)
+ Workbench 1.3.2 Rev. 34.28 (De)
1988
Commodore
-
+
+
-
-
+
+
+
@@ -431,23 +656,21 @@ List of known part numbers
-
+
-
-
-
-
- Workbench 1.3.2 (It)
+
+ Workbench 1.3.2 Rev. 34.28 (Es)
1988
Commodore
-
-
+
+
-
+
-
+
+
@@ -455,38 +678,91 @@ List of known part numbers
-
+
+
-
- Workbench 1.3.3 (US)
+
+ Workbench 1.3.2 Rev. 34.28 (It)
+ 1988
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 1.3.2 Rev. 34.28 A3000 (US)
1990
Commodore
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 1.3.3 Rev. 34.34 (Enhancer Software)
+ 1990
+ Commodore
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
- Workbench 1.3.3
- 1988
+
+ Workbench 1.3.3 Rev. 34.34 (US)
+ 1990
Commodore
-
-
+
+
+
-
-
+
+
@@ -495,18 +771,18 @@ List of known part numbers
- Workbench 1.3.3 (UK)
- 1988
+ Workbench 1.3.3 Rev. 34.34 (UK)
+ 1990
Commodore
-
-
+
+
-
-
+
+
@@ -515,54 +791,200 @@ List of known part numbers
- Workbench 1.3.3 (De)
+ Workbench 1.3.3 Rev. 34.34 (De)
1990
Commodore
-
+
+
-
+
-
+
+
-
+
-
+
+ Workbench 1.3.3 Rev. 34.34 (Fr/Be)
+ 1990
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 1.3.3 Rev. 34.34 (Dk)
+ 1990
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 2.0 Rev. 36.68 A3000
+ 1990
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 2.01 Rev. 36.69 A3000
+ 1990
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 2.03 Rev. 36.102 A3000
+ 1991
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Workbench 2.04 Rev. 37.67
1991
Commodore
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
+
@@ -570,78 +992,228 @@ List of known part numbers
+
+ Workbench 2.04 Rev. 37.67 A3000
+ 1991
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Workbench 2.05 Rev. 37.71
1992
Commodore
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+ Workbench 2.05 Rev. 37.71 A3000
+ 1992
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 2.05 Rev. 37.72
+ 1992
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Workbench 2.1 Rev. 38.35
+ 1992
+ Commodore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Workbench 2.1 Rev. 38.36
1992
Commodore
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -650,148 +1222,208 @@ List of known part numbers
+
+
+
+
+
+
+
+
Workbench 3.0 Rev. 39.29
1992
Commodore
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
Workbench 3.1 Rev. 40.42
- 1995
- ESCOM
-
-
-
+ 1994
+ Commodore
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
- Workbench 3.1 Rev. 40.42 (A4000T)
+
+
+
+
+ Workbench 3.1 Rev. 40.42 (ESCOM)
1995
ESCOM
-
+
+
-
+
-
+
+
-
+
-
-
+
+
-
+
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+ Workbench 3.1 Rev. 40.42 A4000T (ESCOM)
+ 1995
+ ESCOM
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/amiga/amiga.cpp b/src/mame/amiga/amiga.cpp
index 77591798003..8ace20c81aa 100644
--- a/src/mame/amiga/amiga.cpp
+++ b/src/mame/amiga/amiga.cpp
@@ -1804,8 +1804,6 @@ void a1000_state::a1000(machine_config &config)
ADDRESS_MAP_BANK(config, m_overlay).set_map(&a1000_state::a1000_overlay_map).set_options(ENDIANNESS_BIG, 16, 22, 0x200000);
ADDRESS_MAP_BANK(config, "bootrom").set_map(&a1000_state::a1000_bootrom_map).set_options(ENDIANNESS_BIG, 16, 19, 0x40000);
ADDRESS_MAP_BANK(config, m_chipset).set_map(&a1000_state::ocs_map).set_options(ENDIANNESS_BIG, 16, 9, 0x200);
-
- SOFTWARE_LIST(config, "a1000_list").set_original("amiga_a1000");
}
void a1000_state::a1000n(machine_config &config)
@@ -2027,7 +2025,7 @@ void a3000_state::a3000(machine_config &config)
// TODO: zorro3 slots, super dmac, scsi
// software
- SOFTWARE_LIST(config, "a3000_list").set_original("amiga_a3000");
+ SOFTWARE_LIST(config, "amix_list").set_original("amiga_amix");
SOFTWARE_LIST(config, "ecs_list").set_original("amigaecs_flop");
}