diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index 2a9d2a3bf29..abdd891572f 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -30,10 +30,11 @@ DEFINE_DEVICE_TYPE(C64_EASYFLASH, c64_easyflash_cartridge_device, "c64_easyflash
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(c64_easyflash_cartridge_device::device_add_mconfig)
-	MCFG_AMD_29F040_ADD(AM29F040_0_TAG)
-	MCFG_AMD_29F040_ADD(AM29F040_1_TAG)
-MACHINE_CONFIG_END
+void c64_easyflash_cartridge_device::device_add_mconfig(machine_config &config)
+{
+	AMD_29F040(config, AM29F040_0_TAG);
+	AMD_29F040(config, AM29F040_1_TAG);
+}
 
 
 //-------------------------------------------------
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 3255d335313..1471d43a430 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -404,9 +404,10 @@ void gba_rom_wariotws_device::gpio_dev_write(uint16_t data, int gpio_dirs)
  Carts with Flash RAM
  -------------------------------------------------*/
 
-MACHINE_CONFIG_START(gba_rom_flash_device::device_add_mconfig)
-	MCFG_PANASONIC_MN63F805MNP_ADD("flash")
-MACHINE_CONFIG_END
+void gba_rom_flash_device::device_add_mconfig(machine_config &config)
+{
+	PANASONIC_MN63F805MNP(config, "flash");
+}
 
 
 READ32_MEMBER(gba_rom_flash_device::read_ram)
@@ -450,9 +451,10 @@ WRITE32_MEMBER(gba_rom_flash_device::write_ram)
 	}
 }
 
-MACHINE_CONFIG_START(gba_rom_flash1m_device::device_add_mconfig)
-	MCFG_SANYO_LE26FV10N1TS_ADD("flash")
-MACHINE_CONFIG_END
+void gba_rom_flash1m_device::device_add_mconfig(machine_config &config)
+{
+	SANYO_LE26FV10N1TS(config, "flash");
+}
 
 
 READ32_MEMBER(gba_rom_flash1m_device::read_ram)
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index ab1b540a6fc..57b7df49e91 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -86,9 +86,10 @@ const tiny_rom_entry *vic20_final_expansion_3_device::device_rom_region() const
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(vic20_final_expansion_3_device::device_add_mconfig)
-	MCFG_AMD_29F040_ADD(AM29F040_TAG)
-MACHINE_CONFIG_END
+void vic20_final_expansion_3_device::device_add_mconfig(machine_config &config)
+{
+	AMD_29F040(config, AM29F040_TAG);
+}
 
 
 
diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp
index 688369e472f..1fb8f9b6420 100644
--- a/src/devices/bus/z88/flash.cpp
+++ b/src/devices/bus/z88/flash.cpp
@@ -53,9 +53,10 @@ void z88_1024k_flash_device::device_start()
 //  device_add_mconfig
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(z88_1024k_flash_device::device_add_mconfig)
-	MCFG_INTEL_E28F008SA_ADD(FLASH_TAG)
-MACHINE_CONFIG_END
+void z88_1024k_flash_device::device_add_mconfig(machine_config &config)
+{
+	INTEL_E28F008SA(config, FLASH_TAG);
+}
 
 /*-------------------------------------------------
     get_cart_base
diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h
index 6a87d243909..7dcf9f7e173 100644
--- a/src/devices/machine/intelfsh.h
+++ b/src/devices/machine/intelfsh.h
@@ -9,110 +9,6 @@
 
 #pragma once
 
-
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_INTEL_28F016S5_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_28F016S5)
-
-#define MCFG_SHARP_LH28F016S_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SHARP_LH28F016S)
-
-#define MCFG_SHARP_LH28F016S_16BIT_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SHARP_LH28F016S_16BIT)
-
-#define MCFG_ATMEL_29C010_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, ATMEL_29C010)
-
-#define MCFG_ATMEL_49F4096_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, ATMEL_49F4096)
-
-#define MCFG_AMD_29F010_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29F010)
-
-#define MCFG_AMD_29F040_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29F040)
-
-#define MCFG_AMD_29F080_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29F080)
-
-#define MCFG_AMD_29F400T_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29F400T)
-
-#define MCFG_AMD_29F800T_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29F800T)
-
-#define MCFG_AMD_29F800B_16BIT_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29F800B_16BIT)
-
-#define MCFG_AMD_29LV200T_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, AMD_29LV200T)
-
-#define MCFG_FUJITSU_29F160T_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, FUJITSU_29F160T)
-
-#define MCFG_FUJITSU_29F016A_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, FUJITSU_29F016A)
-
-#define MCFG_FUJITSU_29DL16X_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, FUJITSU_29DL16X)
-
-#define MCFG_INTEL_E28F400B_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_E28F400B)
-
-#define MCFG_MACRONIX_29L001MC_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, MACRONIX_29L001MC)
-
-#define MCFG_MACRONIX_29LV160TMC_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, MACRONIX_29LV160TMC)
-
-#define MCFG_PANASONIC_MN63F805MNP_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, PANASONIC_MN63F805MNP)
-
-#define MCFG_SANYO_LE26FV10N1TS_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SANYO_LE26FV10N1TS)
-
-#define MCFG_SST_28SF040_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SST_28SF040)
-
-#define MCFG_SST_39VF020_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SST_39VF020)
-
-#define MCFG_SHARP_LH28F400_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SHARP_LH28F400)
-
-#define MCFG_INTEL_E28F008SA_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_E28F008SA)
-
-#define MCFG_INTEL_TE28F160_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_TE28F160)
-
-#define MCFG_INTEL_TE28F320_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_TE28F320)
-
-#define MCFG_SHARP_UNK128MBIT_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SHARP_UNK128MBIT)
-
-#define MCFG_INTEL_28F320J3D_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_28F320J3D)
-
-#define MCFG_INTEL_28F320J5_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, INTEL_28F320J5)
-
-#define MCFG_SST_39VF400A_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, SST_39VF400A)
-
-#define MCFG_TMS_29F040_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, TMS_29F040)
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-// ======================> intelfsh_device
-
 class intelfsh_device : public device_t,
 						public device_nvram_interface
 {
diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp
index 6fb942a7a2a..218bd94afa5 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -61,16 +61,17 @@ linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_c
 	m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16,  26, 0, address_map_constructor(FUNC(linear_flash_pccard_16mb_device::linear_flash_pccard_16mb), this));
 }
 
-MACHINE_CONFIG_START(linear_flash_pccard_16mb_device::device_add_mconfig)
-	MCFG_FUJITSU_29F016A_ADD("1l")
-	MCFG_FUJITSU_29F016A_ADD("1u")
-	MCFG_FUJITSU_29F016A_ADD("2l")
-	MCFG_FUJITSU_29F016A_ADD("2u")
-	MCFG_FUJITSU_29F016A_ADD("3l")
-	MCFG_FUJITSU_29F016A_ADD("3u")
-	MCFG_FUJITSU_29F016A_ADD("4l")
-	MCFG_FUJITSU_29F016A_ADD("4u")
-MACHINE_CONFIG_END
+void linear_flash_pccard_16mb_device::device_add_mconfig(machine_config &config)
+{
+	FUJITSU_29F016A(config, "1l");
+	FUJITSU_29F016A(config, "1u");
+	FUJITSU_29F016A(config, "2l");
+	FUJITSU_29F016A(config, "2u");
+	FUJITSU_29F016A(config, "3l");
+	FUJITSU_29F016A(config, "3u");
+	FUJITSU_29F016A(config, "4l");
+	FUJITSU_29F016A(config, "4u");
+}
 
 
 void linear_flash_pccard_32mb_device::linear_flash_pccard_32mb(address_map &map)
@@ -100,24 +101,25 @@ linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_c
 	m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16,  26, 0, address_map_constructor(FUNC(linear_flash_pccard_32mb_device::linear_flash_pccard_32mb), this));
 }
 
-MACHINE_CONFIG_START(linear_flash_pccard_32mb_device::device_add_mconfig)
-	MCFG_FUJITSU_29F016A_ADD("1l")
-	MCFG_FUJITSU_29F016A_ADD("1u")
-	MCFG_FUJITSU_29F016A_ADD("2l")
-	MCFG_FUJITSU_29F016A_ADD("2u")
-	MCFG_FUJITSU_29F016A_ADD("3l")
-	MCFG_FUJITSU_29F016A_ADD("3u")
-	MCFG_FUJITSU_29F016A_ADD("4l")
-	MCFG_FUJITSU_29F016A_ADD("4u")
-	MCFG_FUJITSU_29F016A_ADD("5l")
-	MCFG_FUJITSU_29F016A_ADD("5u")
-	MCFG_FUJITSU_29F016A_ADD("6l")
-	MCFG_FUJITSU_29F016A_ADD("6u")
-	MCFG_FUJITSU_29F016A_ADD("7l")
-	MCFG_FUJITSU_29F016A_ADD("7u")
-	MCFG_FUJITSU_29F016A_ADD("8l")
-	MCFG_FUJITSU_29F016A_ADD("8u")
-MACHINE_CONFIG_END
+void linear_flash_pccard_32mb_device::device_add_mconfig(machine_config &config)
+{
+	FUJITSU_29F016A(config, "1l");
+	FUJITSU_29F016A(config, "1u");
+	FUJITSU_29F016A(config, "2l");
+	FUJITSU_29F016A(config, "2u");
+	FUJITSU_29F016A(config, "3l");
+	FUJITSU_29F016A(config, "3u");
+	FUJITSU_29F016A(config, "4l");
+	FUJITSU_29F016A(config, "4u");
+	FUJITSU_29F016A(config, "5l");
+	FUJITSU_29F016A(config, "5u");
+	FUJITSU_29F016A(config, "6l");
+	FUJITSU_29F016A(config, "6u");
+	FUJITSU_29F016A(config, "7l");
+	FUJITSU_29F016A(config, "7u");
+	FUJITSU_29F016A(config, "8l");
+	FUJITSU_29F016A(config, "8u");
+}
 
 
 void linear_flash_pccard_64mb_device::linear_flash_pccard_64mb(address_map &map)
@@ -163,37 +165,38 @@ linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_c
 	m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16,  26, 0, address_map_constructor(FUNC(linear_flash_pccard_64mb_device::linear_flash_pccard_64mb), this));
 }
 
-MACHINE_CONFIG_START(linear_flash_pccard_64mb_device::device_add_mconfig)
-	MCFG_FUJITSU_29F016A_ADD("1l")
-	MCFG_FUJITSU_29F016A_ADD("1u")
-	MCFG_FUJITSU_29F016A_ADD("2l")
-	MCFG_FUJITSU_29F016A_ADD("2u")
-	MCFG_FUJITSU_29F016A_ADD("3l")
-	MCFG_FUJITSU_29F016A_ADD("3u")
-	MCFG_FUJITSU_29F016A_ADD("4l")
-	MCFG_FUJITSU_29F016A_ADD("4u")
-	MCFG_FUJITSU_29F016A_ADD("5l")
-	MCFG_FUJITSU_29F016A_ADD("5u")
-	MCFG_FUJITSU_29F016A_ADD("6l")
-	MCFG_FUJITSU_29F016A_ADD("6u")
-	MCFG_FUJITSU_29F016A_ADD("7l")
-	MCFG_FUJITSU_29F016A_ADD("7u")
-	MCFG_FUJITSU_29F016A_ADD("8l")
-	MCFG_FUJITSU_29F016A_ADD("8u")
-	MCFG_FUJITSU_29F016A_ADD("9l")
-	MCFG_FUJITSU_29F016A_ADD("9u")
-	MCFG_FUJITSU_29F016A_ADD("10l")
-	MCFG_FUJITSU_29F016A_ADD("10u")
-	MCFG_FUJITSU_29F016A_ADD("11l")
-	MCFG_FUJITSU_29F016A_ADD("11u")
-	MCFG_FUJITSU_29F016A_ADD("12l")
-	MCFG_FUJITSU_29F016A_ADD("12u")
-	MCFG_FUJITSU_29F016A_ADD("13l")
-	MCFG_FUJITSU_29F016A_ADD("13u")
-	MCFG_FUJITSU_29F016A_ADD("14l")
-	MCFG_FUJITSU_29F016A_ADD("14u")
-	MCFG_FUJITSU_29F016A_ADD("15l")
-	MCFG_FUJITSU_29F016A_ADD("15u")
-	MCFG_FUJITSU_29F016A_ADD("16l")
-	MCFG_FUJITSU_29F016A_ADD("16u")
-MACHINE_CONFIG_END
+void linear_flash_pccard_64mb_device::device_add_mconfig(machine_config &config)
+{
+	FUJITSU_29F016A(config, "1l");
+	FUJITSU_29F016A(config, "1u");
+	FUJITSU_29F016A(config, "2l");
+	FUJITSU_29F016A(config, "2u");
+	FUJITSU_29F016A(config, "3l");
+	FUJITSU_29F016A(config, "3u");
+	FUJITSU_29F016A(config, "4l");
+	FUJITSU_29F016A(config, "4u");
+	FUJITSU_29F016A(config, "5l");
+	FUJITSU_29F016A(config, "5u");
+	FUJITSU_29F016A(config, "6l");
+	FUJITSU_29F016A(config, "6u");
+	FUJITSU_29F016A(config, "7l");
+	FUJITSU_29F016A(config, "7u");
+	FUJITSU_29F016A(config, "8l");
+	FUJITSU_29F016A(config, "8u");
+	FUJITSU_29F016A(config, "9l");
+	FUJITSU_29F016A(config, "9u");
+	FUJITSU_29F016A(config, "10l");
+	FUJITSU_29F016A(config, "10u");
+	FUJITSU_29F016A(config, "11l");
+	FUJITSU_29F016A(config, "11u");
+	FUJITSU_29F016A(config, "12l");
+	FUJITSU_29F016A(config, "12u");
+	FUJITSU_29F016A(config, "13l");
+	FUJITSU_29F016A(config, "13u");
+	FUJITSU_29F016A(config, "14l");
+	FUJITSU_29F016A(config, "14u");
+	FUJITSU_29F016A(config, "15l");
+	FUJITSU_29F016A(config, "15u");
+	FUJITSU_29F016A(config, "16l");
+	FUJITSU_29F016A(config, "16u");
+}
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index fa4f81ff81b..c4768b8b300 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -432,7 +432,7 @@ MACHINE_CONFIG_START(_25pacman_state::_25pacman)
 	MCFG_DEVICE_PROGRAM_MAP(_25pacman_map)
 	MCFG_DEVICE_IO_MAP(_25pacman_io_map)
 
-	MCFG_AMD_29LV200T_ADD("flash")
+	AMD_29LV200T(config, "flash");
 MACHINE_CONFIG_END
 
 
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 6bd2117758f..0a6c2f17481 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -794,9 +794,9 @@ MACHINE_CONFIG_START(avigo_state::avigo)
 	MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, avigo_state, tc8521_alarm_int))
 
 	/* flash ROMs */
-	MCFG_AMD_29F080_ADD("flash0")
-	MCFG_AMD_29F080_ADD("flash1")
-	MCFG_AMD_29F080_ADD("flash2")
+	AMD_29F080(config, "flash0");
+	AMD_29F080(config, "flash1");
+	AMD_29F080(config, "flash2");
 
 	/* internal ram */
 	RAM(config, RAM_TAG).set_default_size("128K");
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index 94cf6b99993..b56168f70df 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -787,7 +787,7 @@ MACHINE_CONFIG_START(bingor_state::vip2000)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
 	// Other interrupts generated by internal timers
 
-	MCFG_ATMEL_49F4096_ADD("flash")
+	ATMEL_49F4096(config, "flash");
 
 	MCFG_DEVICE_ADD("slavecpu", I80C31, XTAL(11'059'200))
 	MCFG_DEVICE_PROGRAM_MAP(slave_map)
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index 2f553916f1a..8cd672a6c4f 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -2452,68 +2452,75 @@ SH2_DMA_KLUDGE_CB(cps3_state::dma_callback)
 }
 
 
-MACHINE_CONFIG_START(cps3_state::simm1_64mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm1.0")
-	MCFG_FUJITSU_29F016A_ADD("simm1.1")
-	MCFG_FUJITSU_29F016A_ADD("simm1.2")
-	MCFG_FUJITSU_29F016A_ADD("simm1.3")
-MACHINE_CONFIG_END
+void cps3_state::simm1_64mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm1.0");
+	FUJITSU_29F016A(config, "simm1.1");
+	FUJITSU_29F016A(config, "simm1.2");
+	FUJITSU_29F016A(config, "simm1.3");
+}
 
-MACHINE_CONFIG_START(cps3_state::simm2_64mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm2.0")
-	MCFG_FUJITSU_29F016A_ADD("simm2.1")
-	MCFG_FUJITSU_29F016A_ADD("simm2.2")
-	MCFG_FUJITSU_29F016A_ADD("simm2.3")
-MACHINE_CONFIG_END
+void cps3_state::simm2_64mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm2.0");
+	FUJITSU_29F016A(config, "simm2.1");
+	FUJITSU_29F016A(config, "simm2.2");
+	FUJITSU_29F016A(config, "simm2.3");
+}
 
-MACHINE_CONFIG_START(cps3_state::simm3_128mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm3.0")
-	MCFG_FUJITSU_29F016A_ADD("simm3.1")
-	MCFG_FUJITSU_29F016A_ADD("simm3.2")
-	MCFG_FUJITSU_29F016A_ADD("simm3.3")
-	MCFG_FUJITSU_29F016A_ADD("simm3.4")
-	MCFG_FUJITSU_29F016A_ADD("simm3.5")
-	MCFG_FUJITSU_29F016A_ADD("simm3.6")
-	MCFG_FUJITSU_29F016A_ADD("simm3.7")
-MACHINE_CONFIG_END
+void cps3_state::simm3_128mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm3.0");
+	FUJITSU_29F016A(config, "simm3.1");
+	FUJITSU_29F016A(config, "simm3.2");
+	FUJITSU_29F016A(config, "simm3.3");
+	FUJITSU_29F016A(config, "simm3.4");
+	FUJITSU_29F016A(config, "simm3.5");
+	FUJITSU_29F016A(config, "simm3.6");
+	FUJITSU_29F016A(config, "simm3.7");
+}
 
-MACHINE_CONFIG_START(cps3_state::simm4_128mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm4.0")
-	MCFG_FUJITSU_29F016A_ADD("simm4.1")
-	MCFG_FUJITSU_29F016A_ADD("simm4.2")
-	MCFG_FUJITSU_29F016A_ADD("simm4.3")
-	MCFG_FUJITSU_29F016A_ADD("simm4.4")
-	MCFG_FUJITSU_29F016A_ADD("simm4.5")
-	MCFG_FUJITSU_29F016A_ADD("simm4.6")
-	MCFG_FUJITSU_29F016A_ADD("simm4.7")
-MACHINE_CONFIG_END
+void cps3_state::simm4_128mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm4.0");
+	FUJITSU_29F016A(config, "simm4.1");
+	FUJITSU_29F016A(config, "simm4.2");
+	FUJITSU_29F016A(config, "simm4.3");
+	FUJITSU_29F016A(config, "simm4.4");
+	FUJITSU_29F016A(config, "simm4.5");
+	FUJITSU_29F016A(config, "simm4.6");
+	FUJITSU_29F016A(config, "simm4.7");
+}
 
-MACHINE_CONFIG_START(cps3_state::simm5_128mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm5.0")
-	MCFG_FUJITSU_29F016A_ADD("simm5.1")
-	MCFG_FUJITSU_29F016A_ADD("simm5.2")
-	MCFG_FUJITSU_29F016A_ADD("simm5.3")
-	MCFG_FUJITSU_29F016A_ADD("simm5.4")
-	MCFG_FUJITSU_29F016A_ADD("simm5.5")
-	MCFG_FUJITSU_29F016A_ADD("simm5.6")
-	MCFG_FUJITSU_29F016A_ADD("simm5.7")
-MACHINE_CONFIG_END
+void cps3_state::simm5_128mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm5.0");
+	FUJITSU_29F016A(config, "simm5.1");
+	FUJITSU_29F016A(config, "simm5.2");
+	FUJITSU_29F016A(config, "simm5.3");
+	FUJITSU_29F016A(config, "simm5.4");
+	FUJITSU_29F016A(config, "simm5.5");
+	FUJITSU_29F016A(config, "simm5.6");
+	FUJITSU_29F016A(config, "simm5.7");
+}
 
-MACHINE_CONFIG_START(cps3_state::simm5_32mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm5.0")
-	MCFG_FUJITSU_29F016A_ADD("simm5.1")
-MACHINE_CONFIG_END
+void cps3_state::simm5_32mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm5.0");
+	FUJITSU_29F016A(config, "simm5.1");
+}
 
-MACHINE_CONFIG_START(cps3_state::simm6_128mbit)
-	MCFG_FUJITSU_29F016A_ADD("simm6.0")
-	MCFG_FUJITSU_29F016A_ADD("simm6.1")
-	MCFG_FUJITSU_29F016A_ADD("simm6.2")
-	MCFG_FUJITSU_29F016A_ADD("simm6.3")
-	MCFG_FUJITSU_29F016A_ADD("simm6.4")
-	MCFG_FUJITSU_29F016A_ADD("simm6.5")
-	MCFG_FUJITSU_29F016A_ADD("simm6.6")
-	MCFG_FUJITSU_29F016A_ADD("simm6.7")
-MACHINE_CONFIG_END
+void cps3_state::simm6_128mbit(machine_config &config)
+{
+	FUJITSU_29F016A(config, "simm6.0");
+	FUJITSU_29F016A(config, "simm6.1");
+	FUJITSU_29F016A(config, "simm6.2");
+	FUJITSU_29F016A(config, "simm6.3");
+	FUJITSU_29F016A(config, "simm6.4");
+	FUJITSU_29F016A(config, "simm6.5");
+	FUJITSU_29F016A(config, "simm6.6");
+	FUJITSU_29F016A(config, "simm6.7");
+}
 
 MACHINE_CONFIG_START(cps3_state::cps3)
 	/* basic machine hardware */
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index d64bc10c2ec..62bb1a69693 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -1060,7 +1060,7 @@ MACHINE_CONFIG_START(cxhumax_state::cxhumax)
 	MCFG_DEVICE_PROGRAM_MAP(cxhumax_map)
 
 
-	MCFG_INTEL_28F320J3D_ADD("flash")
+	INTEL_28F320J3D(config, "flash");
 	I2CMEM(config, "eeprom", 0).set_data_size(0x2000);
 
 	/* video hardware */
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index fe538a8f76c..d05e76022f1 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -389,16 +389,14 @@ static DEVICE_INPUT_DEFAULTS_START( debug_serial ) // set up debug port to defau
 	DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
 DEVICE_INPUT_DEFAULTS_END
 
-MACHINE_CONFIG_START(cybiko_state::cybikov1)
-	// cpu
-	MCFG_DEVICE_ADD( "maincpu", H8S2241, XTAL(11'059'200) )
-	MCFG_DEVICE_PROGRAM_MAP( cybikov1_mem )
-	MCFG_DEVICE_IO_MAP( cybikov1_io )
-
-	MCFG_DEVICE_MODIFY("maincpu:sci1")
-	MCFG_H8_SCI_TX_CALLBACK(WRITELINE("flash1", at45db041_device, si_w))
-	MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("flash1", at45db041_device, sck_w))
+MACHINE_CONFIG_START(cybiko_state::cybikov1_debug_serial)
+	MCFG_DEVICE_MODIFY("debug_serial")
+	MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu:sci2", h8_sci_device, rx_w))
+	MCFG_DEVICE_MODIFY("maincpu:sci2")
+	MCFG_H8_SCI_TX_CALLBACK(WRITELINE("debug_serial", rs232_port_device, write_txd))
+MACHINE_CONFIG_END
 
+MACHINE_CONFIG_START(cybiko_state::cybikov1_base)
 	// screen
 	MCFG_SCREEN_ADD("screen", LCD)
 	MCFG_SCREEN_REFRESH_RATE( 60 )
@@ -415,8 +413,6 @@ MACHINE_CONFIG_START(cybiko_state::cybikov1)
 	// machine
 	/* rtc */
 	MCFG_PCF8593_ADD("rtc")
-	AT45DB041(config, m_flash1, 0);
-	m_flash1->so_callback().set("maincpu:sci1", FUNC(h8_sci_device::rx_w));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
@@ -429,19 +425,39 @@ MACHINE_CONFIG_START(cybiko_state::cybikov1)
 	MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", debug_serial)
 	MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("pty", debug_serial)
 
-	MCFG_DEVICE_MODIFY("debug_serial")
-	MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu:sci2", h8_sci_device, rx_w))
-	MCFG_DEVICE_MODIFY("maincpu:sci2")
-	MCFG_H8_SCI_TX_CALLBACK(WRITELINE("debug_serial", rs232_port_device, write_txd))
-
 	/* quickload */
 	MCFG_QUICKLOAD_ADD("quickload", cybiko_state, cybiko, "bin,nv", 0)
 MACHINE_CONFIG_END
 
-MACHINE_CONFIG_START(cybiko_state::cybikov2)
-	cybikov1(config);
+void cybiko_state::cybikov1_flash(machine_config &config)
+{
+	AT45DB041(config, m_flash1, 0);
+	m_flash1->so_callback().set("maincpu:sci1", FUNC(h8_sci_device::rx_w));
+}
+
+MACHINE_CONFIG_START(cybiko_state::cybikov1)
+	cybikov1_base(config);
+
 	// cpu
-	MCFG_DEVICE_REPLACE("maincpu", H8S2246, XTAL(11'059'200))
+	MCFG_DEVICE_ADD( "maincpu", H8S2241, XTAL(11'059'200) )
+	MCFG_DEVICE_PROGRAM_MAP( cybikov1_mem )
+	MCFG_DEVICE_IO_MAP( cybikov1_io )
+
+	MCFG_DEVICE_MODIFY("maincpu:sci1")
+	MCFG_H8_SCI_TX_CALLBACK(WRITELINE("flash1", at45db041_device, si_w))
+	MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("flash1", at45db041_device, sck_w))
+
+	// machine
+	cybikov1_flash(config);
+	cybikov1_debug_serial(config);
+MACHINE_CONFIG_END
+
+MACHINE_CONFIG_START(cybiko_state::cybikov2)
+	cybikov1_base(config);
+	cybikov1_flash(config);
+
+	// cpu
+	MCFG_DEVICE_ADD("maincpu", H8S2246, XTAL(11'059'200))
 	MCFG_DEVICE_PROGRAM_MAP(cybikov2_mem)
 	MCFG_DEVICE_IO_MAP(cybikov2_io)
 
@@ -450,7 +466,8 @@ MACHINE_CONFIG_START(cybiko_state::cybikov2)
 	MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("flash1", at45db041_device, sck_w))
 
 	// machine
-	MCFG_SST_39VF020_ADD("flash2")
+	SST_39VF020(config, "flash2");
+	cybikov1_debug_serial(config);
 
 	/* internal ram */
 	m_ram->set_default_size("256K").set_extra_options("512K,1M");
@@ -463,15 +480,15 @@ MACHINE_CONFIG_START(cybiko_state::cybikov2)
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(cybiko_state::cybikoxt)
-	cybikov1(config);
+	cybikov1_base(config);
+
 	// cpu
-	MCFG_DEVICE_REPLACE("maincpu", H8S2323, XTAL(18'432'000))
-	MCFG_DEVICE_PROGRAM_MAP(cybikoxt_mem )
-	MCFG_DEVICE_IO_MAP(cybikoxt_io )
+	MCFG_DEVICE_ADD("maincpu", H8S2323, XTAL(18'432'000))
+	MCFG_DEVICE_PROGRAM_MAP(cybikoxt_mem)
+	MCFG_DEVICE_IO_MAP(cybikoxt_io)
 
 	// machine
-	MCFG_DEVICE_REMOVE("flash1")
-	MCFG_SST_39VF400A_ADD("flashxt")
+	SST_39VF400A(config, "flashxt");
 
 	/* internal ram */
 	m_ram->set_default_size("2M");
diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp
index 98b6c22edf5..0959fe35e6e 100644
--- a/src/mame/drivers/dbox.cpp
+++ b/src/mame/drivers/dbox.cpp
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(dbox_state::dbox)
 	MCFG_RS232_RXD_HANDLER (WRITELINE ("maincpu:serial", mc68340_serial_module_device, rx_b_w))
 
 	/* Add the boot flash */
-	MCFG_AMD_29F800B_16BIT_ADD("flash")
+	AMD_29F800B_16BIT(config, "flash");
 
 	/* LED Matrix Display */
 	MCFG_SDA5708_ADD("display")
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index 0da87cd39f4..ecaf04deff5 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -604,7 +604,7 @@ MACHINE_CONFIG_START(dc_cons_state::dc)
 
 	MCFG_MACHINE_RESET_OVERRIDE(dc_cons_state,dc_console )
 
-//  MCFG_MACRONIX_29LV160TMC_ADD("dcflash")
+//  MACRONIX_29LV160TMC(config, "dcflash");
 
 	MCFG_MAPLE_DC_ADD( "maple_dc", "maincpu", dc_maple_irq )
 	MCFG_DC_CONTROLLER_ADD("dcctrl0", "maple_dc", 0, ":P1:0", ":P1:1", ":P1:A0", ":P1:A1", ":P1:A2", ":P1:A3", ":P1:A4", ":P1:A5")
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 407433be345..a4438701fc7 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -1187,9 +1187,9 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
 
 	MCFG_DEVICE_ADD("rtc", RTC65271, 0)
 
-	MCFG_FUJITSU_29F016A_ADD("flash_main")
-	MCFG_FUJITSU_29F016A_ADD("flash_snd1")
-	MCFG_FUJITSU_29F016A_ADD("flash_snd2")
+	FUJITSU_29F016A(config, "flash_main");
+	FUJITSU_29F016A(config, "flash_snd1");
+	FUJITSU_29F016A(config, "flash_snd2");
 
 	ATA_INTERFACE(config, m_ata).options(firebeat_ata_devices, "cdrom", "cdrom", true);
 	m_ata->irq_handler().set(FUNC(firebeat_state::ata_interrupt));
@@ -1245,9 +1245,9 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
 
 	MCFG_DEVICE_ADD("rtc", RTC65271, 0)
 
-	MCFG_FUJITSU_29F016A_ADD("flash_main")
-	MCFG_FUJITSU_29F016A_ADD("flash_snd1")
-	MCFG_FUJITSU_29F016A_ADD("flash_snd2")
+	FUJITSU_29F016A(config, "flash_main");
+	FUJITSU_29F016A(config, "flash_snd1");
+	FUJITSU_29F016A(config, "flash_snd2");
 
 	ATA_INTERFACE(config, m_ata).options(firebeat_ata_devices, "cdrom", "cdrom", true);
 	m_ata->irq_handler().set(FUNC(firebeat_state::ata_interrupt));
diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp
index b79ad37665c..a44fae46407 100644
--- a/src/mame/drivers/funkball.cpp
+++ b/src/mame/drivers/funkball.cpp
@@ -806,9 +806,9 @@ MACHINE_CONFIG_START(funkball_state::funkball)
 	rs232.dsr_handler().set("uart", FUNC(ns16550_device::dsr_w));
 	rs232.cts_handler().set("uart", FUNC(ns16550_device::cts_w));
 
-	MCFG_INTEL_28F320J5_ADD("u29")
-	MCFG_INTEL_28F320J5_ADD("u30")
-	MCFG_INTEL_28F320J5_ADD("u3")
+	INTEL_28F320J5(config, "u29");
+	INTEL_28F320J5(config, "u30");
+	INTEL_28F320J5(config, "u3");
 MACHINE_CONFIG_END
 
 ROM_START( funkball )
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index 972567befd0..9001e558c18 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -716,7 +716,7 @@ MACHINE_CONFIG_START(geniusiq_state::iq128)
 	MCFG_PALETTE_INIT_OWNER(geniusiq_state, geniusiq)
 
 	/* internal flash */
-	MCFG_AMD_29F010_ADD("flash")
+	AMD_29F010(config, "flash");
 
 	/* cartridge */
 	MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "iq128_cart")
@@ -727,12 +727,12 @@ MACHINE_CONFIG_START(geniusiq_state::iq128)
 	MCFG_SOFTWARE_LIST_ADD("cart_list", "iq128")
 MACHINE_CONFIG_END
 
-MACHINE_CONFIG_START(geniusiq_state::iqtv512)
+void geniusiq_state::iqtv512(machine_config &config)
+{
 	iq128(config);
 	/* internal flash */
-	MCFG_DEVICE_REMOVE("flash")
-	MCFG_AMD_29F040_ADD("flash")
-MACHINE_CONFIG_END
+	AMD_29F040(config.replace(), "flash");
+}
 
 /* ROM definition */
 
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index 80879683cec..349b845e2ca 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -621,18 +621,18 @@ MACHINE_CONFIG_START(joystand_state::joystand)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	// cart
-	MCFG_TMS_29F040_ADD("cart.u1")
-	MCFG_TMS_29F040_ADD("cart.u2")
-	MCFG_TMS_29F040_ADD("cart.u3")
-	MCFG_TMS_29F040_ADD("cart.u4")
-	MCFG_TMS_29F040_ADD("cart.u5")
-	MCFG_TMS_29F040_ADD("cart.u6")
-	MCFG_TMS_29F040_ADD("cart.u7")
-	MCFG_TMS_29F040_ADD("cart.u8")
-	MCFG_TMS_29F040_ADD("cart.u9")
-	MCFG_TMS_29F040_ADD("cart.u10")
-	MCFG_TMS_29F040_ADD("cart.u11")
-	MCFG_TMS_29F040_ADD("cart.u12")
+	TMS_29F040(config, "cart.u1");
+	TMS_29F040(config, "cart.u2");
+	TMS_29F040(config, "cart.u3");
+	TMS_29F040(config, "cart.u4");
+	TMS_29F040(config, "cart.u5");
+	TMS_29F040(config, "cart.u6");
+	TMS_29F040(config, "cart.u7");
+	TMS_29F040(config, "cart.u8");
+	TMS_29F040(config, "cart.u9");
+	TMS_29F040(config, "cart.u10");
+	TMS_29F040(config, "cart.u11");
+	TMS_29F040(config, "cart.u12");
 
 	// devices
 	EEPROM_93C46_16BIT(config, "eeprom");
diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp
index 741da37fca6..f6783885128 100644
--- a/src/mame/drivers/konamigv.cpp
+++ b/src/mame/drivers/konamigv.cpp
@@ -509,10 +509,10 @@ MACHINE_CONFIG_START(simpbowl_state::simpbowl)
 	MCFG_DEVICE_MODIFY( "maincpu" )
 	MCFG_DEVICE_PROGRAM_MAP( simpbowl_map )
 
-	MCFG_FUJITSU_29F016A_ADD("flash0")
-	MCFG_FUJITSU_29F016A_ADD("flash1")
-	MCFG_FUJITSU_29F016A_ADD("flash2")
-	MCFG_FUJITSU_29F016A_ADD("flash3")
+	FUJITSU_29F016A(config, "flash0");
+	FUJITSU_29F016A(config, "flash1");
+	FUJITSU_29F016A(config, "flash2");
+	FUJITSU_29F016A(config, "flash3");
 
 	MCFG_DEVICE_ADD("upd", UPD4701A, 0)
 	MCFG_UPD4701_PORTX("TRACK0_X")
@@ -549,7 +549,7 @@ MACHINE_CONFIG_START(konamigv_state::btchamp)
 	MCFG_DEVICE_MODIFY( "maincpu" )
 	MCFG_DEVICE_PROGRAM_MAP( btchamp_map )
 
-	MCFG_SHARP_LH28F400_ADD("flash")
+	SHARP_LH28F400(config, "flash");
 
 	MCFG_DEVICE_ADD("upd1", UPD4701A, 0)
 	MCFG_UPD4701_PORTX("TRACK0_X")
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(konamigv_state::kdeadeye)
 	MCFG_DEVICE_MODIFY( "maincpu" )
 	MCFG_DEVICE_PROGRAM_MAP( kdeadeye_map )
 
-	MCFG_SHARP_LH28F400_ADD("flash")
+	SHARP_LH28F400(config, "flash");
 MACHINE_CONFIG_END
 
 static INPUT_PORTS_START( kdeadeye )
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index dba46132a25..f90f802df5e 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -2112,14 +2112,14 @@ MACHINE_CONFIG_START(ksys573_state::konami573)
 	MCFG_KONAMI573_CASSETTE_DSR_HANDLER(WRITELINE( "maincpu:sio1", psxsio1_device, write_dsr ) )
 
 	// onboard flash
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.31m" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.27m" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.31l" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.27l" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.31j" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.27j" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.31h" )
-	MCFG_FUJITSU_29F016A_ADD( "29f016a.27h" )
+	FUJITSU_29F016A( config, "29f016a.31m" );
+	FUJITSU_29F016A( config, "29f016a.27m" );
+	FUJITSU_29F016A( config, "29f016a.31l" );
+	FUJITSU_29F016A( config, "29f016a.27l" );
+	FUJITSU_29F016A( config, "29f016a.31j" );
+	FUJITSU_29F016A( config, "29f016a.27j" );
+	FUJITSU_29F016A( config, "29f016a.31h" );
+	FUJITSU_29F016A( config, "29f016a.27h" );
 
 	MCFG_DEVICE_ADD( "pccard1", PCCARD_SLOT, 0 )
 	MCFG_DEVICE_ADD( "pccard2", PCCARD_SLOT, 0 )
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index 6112678a99f..669faff1dc5 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -462,8 +462,8 @@ MACHINE_CONFIG_START(mstation_state::mstation)
 	MCFG_PALETTE_ADD("palette", 2)
 	MCFG_PALETTE_INIT_OWNER(mstation_state, mstation)
 
-	MCFG_AMD_29F080_ADD("flash0")
-	MCFG_SST_28SF040_ADD("flash1")
+	AMD_29F080(config, "flash0");
+	SST_28SF040(config, "flash1");
 
 	// IRQ 4 is generated every second, used for auto power off
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("1hz_timer", mstation_state, mstation_1hz_timer, attotime::from_hz(1))
diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp
index ea3a61469b8..452ff7acbc0 100644
--- a/src/mame/drivers/mtouchxl.cpp
+++ b/src/mame/drivers/mtouchxl.cpp
@@ -259,7 +259,7 @@ MACHINE_CONFIG_START(mtxl_state::at486)
 	ADDRESS_MAP_BANK(config, "dbank").set_map(&mtxl_state::dbank_map).set_options(ENDIANNESS_LITTLE, 32, 32, 0x10000);
 
 	/* Flash ROM */
-	MCFG_AMD_29F040_ADD("flash")
+	AMD_29F040(config, "flash");
 
 	/* Security key */
 	MCFG_DS1205_ADD("multikey")
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index 9eeb95f534a..5811b51e213 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -3088,7 +3088,7 @@ MACHINE_CONFIG_START(atomiswave_state::aw_base)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(aw_map)
 	MCFG_DEVICE_IO_MAP(aw_port)
-	MCFG_MACRONIX_29L001MC_ADD("awflash")
+	MACRONIX_29L001MC(config, "awflash");
 	MCFG_AW_ROM_BOARD_ADD("rom_board", "rom_key", WRITE8(*this, dc_state, g1_irq))
 
 	MCFG_MACHINE_RESET_OVERRIDE(dc_state,dc_console)
diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp
index a464f769249..a4046499fb5 100644
--- a/src/mame/drivers/nokia_3310.cpp
+++ b/src/mame/drivers/nokia_3310.cpp
@@ -720,15 +720,14 @@ MACHINE_CONFIG_START(noki3310_state::noki3310)
 	MCFG_PCD8544_ADD("pcd8544")
 	MCFG_PCD8544_SCREEN_UPDATE_CALLBACK(noki3310_state, pcd8544_screen_update)
 
-	MCFG_INTEL_TE28F160_ADD("flash")
+	INTEL_TE28F160(config, "flash");
 
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(noki3310_state::noki3330)
 	noki3310(config);
 
-	MCFG_DEVICE_REMOVE("flash")
-	MCFG_INTEL_TE28F320_ADD("flash")
+	INTEL_TE28F320(config.replace(), "flash");
 
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index b2d963db4e0..822c9dfb5e6 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -1073,8 +1073,8 @@ MACHINE_CONFIG_START(pcw16_state::pcw16)
 	/* internal ram */
 	RAM(config, RAM_TAG).set_default_size("2M");
 
-	MCFG_INTEL_E28F008SA_ADD("flash0")
-	MCFG_INTEL_E28F008SA_ADD("flash1")
+	INTEL_E28F008SA(config, "flash0");
+	INTEL_E28F008SA(config, "flash1");
 
 	MCFG_AT_KEYB_ADD("at_keyboard", 3, WRITELINE(*this, pcw16_state, pcw16_keyboard_callback))
 
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 94686d8a17c..92973c5e49b 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -941,16 +941,16 @@ MACHINE_CONFIG_START(rex6000_state::rex6000)
 	MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, rex6000_state, alarm_irq))
 
 	/*
-	Fujitsu 29DL16X have feature which is capability of reading data from one
+	Fujitsu 29DL16X has a feature which is capable of reading data from one
 	bank of memory while a program or erase operation is in progress in the
 	other bank of memory (simultaneous operation). This is not supported yet
-	by the flash emulation and I have splitted every bank into a separate
-	device for have a similar behavior.
+	by the flash emulation and I have split every bank into a separate
+	device in order to have similar behavior.
 	*/
-	MCFG_FUJITSU_29DL16X_ADD(m_flash0a) //bank 0 of first flash
-	MCFG_FUJITSU_29DL16X_ADD(m_flash0b) //bank 1 of first flash
-	MCFG_FUJITSU_29DL16X_ADD(m_flash1a) //bank 0 of second flash
-	MCFG_FUJITSU_29DL16X_ADD(m_flash1b) //bank 1 of second flash
+	FUJITSU_29DL16X(config, m_flash0a); //bank 0 of first flash
+	FUJITSU_29DL16X(config, m_flash0b); //bank 1 of first flash
+	FUJITSU_29DL16X(config, m_flash1a); //bank 0 of second flash
+	FUJITSU_29DL16X(config, m_flash1b); //bank 1 of second flash
 
 	/* internal ram */
 	RAM(config, RAM_TAG).set_default_size("32K");
@@ -1005,8 +1005,8 @@ MACHINE_CONFIG_START(oz750_state::oz750)
 	MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL(32'768))
 	MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, rex6000_state, alarm_irq))
 
-	MCFG_SHARP_LH28F016S_ADD(m_flash0a)
-	MCFG_SHARP_LH28F016S_ADD(m_flash1a)
+	SHARP_LH28F016S(config, m_flash0a);
+	SHARP_LH28F016S(config, m_flash1a);
 
 	/* internal ram */
 	RAM(config, RAM_TAG).set_default_size("512K");
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index 5d7e02879d6..9290d6d2514 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -1880,8 +1880,8 @@ MACHINE_CONFIG_START(seibuspi_state::spi)
 	rtc.ref_month(1);
 	rtc.ref_day(1);
 
-	MCFG_INTEL_E28F008SA_ADD("soundflash1") // Sharp LH28F008 on newer mainboard revision
-	MCFG_INTEL_E28F008SA_ADD("soundflash2") // "
+	INTEL_E28F008SA(config, "soundflash1"); // Sharp LH28F008 on newer mainboard revision
+	INTEL_E28F008SA(config, "soundflash2"); // "
 
 	FIFO7200(config, m_soundfifo[0], 0x200); // LH5496D, but on single board hw it's one CY7C421
 	FIFO7200(config, m_soundfifo[1], 0x200); // "
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index d460b8925a6..85a79c951e9 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -2733,7 +2733,7 @@ MACHINE_CONFIG_START(staraudi_state::staraudi)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(staraudi_map)
 
-	MCFG_SHARP_LH28F016S_16BIT_ADD("flash")
+	SHARP_LH28F016S_16BIT(config, "flash");
 	MCFG_UPD4992_ADD("rtc")
 
 	// video hardware
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index 2ba3bea9fbb..529ba3743e5 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -338,7 +338,7 @@ MACHINE_CONFIG_START(svmu_state::svmu)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* devices */
-	MCFG_ATMEL_29C010_ADD("flash")
+	ATMEL_29C010(config, "flash");
 	MCFG_QUICKLOAD_ADD("quickload", svmu_state, svmu, "vms,bin", 0)
 	MCFG_QUICKLOAD_INTERFACE("svmu_quik")
 
diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp
index 6b62c9de90a..86415c7faa9 100644
--- a/src/mame/drivers/taitogn.cpp
+++ b/src/mame/drivers/taitogn.cpp
@@ -722,11 +722,11 @@ MACHINE_CONFIG_START(taitogn_state::coh3002t)
 
 	MCFG_MB3773_ADD("mb3773")
 
-	MCFG_INTEL_TE28F160_ADD("biosflash")
-	MCFG_INTEL_E28F400B_ADD("pgmflash")
-	MCFG_INTEL_TE28F160_ADD("sndflash0")
-	MCFG_INTEL_TE28F160_ADD("sndflash1")
-	MCFG_INTEL_TE28F160_ADD("sndflash2")
+	INTEL_TE28F160(config, "biosflash");
+	INTEL_E28F400B(config, "pgmflash");
+	INTEL_TE28F160(config, "sndflash0");
+	INTEL_TE28F160(config, "sndflash1");
+	INTEL_TE28F160(config, "sndflash2");
 
 	ADDRESS_MAP_BANK(config, "flashbank").set_map(&taitogn_state::flashbank_map).set_options(ENDIANNESS_LITTLE, 16, 32, 0x8000000);
 
diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp
index b5220820ce2..8c9af0dd245 100644
--- a/src/mame/drivers/ti85.cpp
+++ b/src/mame/drivers/ti85.cpp
@@ -711,7 +711,7 @@ MACHINE_CONFIG_START(ti85_state::ti83p)
 
 	MCFG_DEVICE_ADD("linkport", TI8X_LINK_PORT, default_ti8x_link_devices, nullptr)
 
-	MCFG_AMD_29F400T_ADD("flash")
+	AMD_29F400T(config, "flash");
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(ti85_state::ti83pse)
diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp
index b393233f79f..0efc12cc639 100644
--- a/src/mame/drivers/ti89.cpp
+++ b/src/mame/drivers/ti89.cpp
@@ -538,7 +538,7 @@ MACHINE_CONFIG_START(ti68k_state::ti89)
 	MCFG_PALETTE_ADD("palette", 2)
 	MCFG_PALETTE_INIT_OWNER(ti68k_state, ti68k)
 
-	MCFG_SHARP_UNK128MBIT_ADD("flash")  //should be LH28F320 for ti89t and v200 and LH28F160S3T for other models
+	SHARP_UNK128MBIT(config, "flash");  //should be LH28F320 for ti89t and v200 and LH28F160S3T for other models
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("ti68k_timer", ti68k_state, ti68k_timer_callback, attotime::from_hz(1<<14))
 MACHINE_CONFIG_END
diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h
index 3606cd53f30..5e0b1f1f556 100644
--- a/src/mame/includes/cybiko.h
+++ b/src/mame/includes/cybiko.h
@@ -80,9 +80,14 @@ public:
 	virtual void machine_reset() override;
 	DECLARE_QUICKLOAD_LOAD_MEMBER( cybiko );
 	DECLARE_QUICKLOAD_LOAD_MEMBER( cybikoxt );
-	void cybikoxt(machine_config &config);
-	void cybikov2(machine_config &config);
+
+	void cybikov1_base(machine_config &config);
+	void cybikov1_flash(machine_config &config);
+	void cybikov1_debug_serial(machine_config &config);
 	void cybikov1(machine_config &config);
+	void cybikov2(machine_config &config);
+	void cybikoxt(machine_config &config);
+
 	void cybikov1_io(address_map &map);
 	void cybikov1_mem(address_map &map);
 	void cybikov2_io(address_map &map);