diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig
index 5f880e01e6..a9d18074eb 100644
--- a/src/mainboard/51nb/x210/Kconfig
+++ b/src/mainboard/51nb/x210/Kconfig
@@ -4,7 +4,6 @@ if BOARD_51NB_X210
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select AZALIA_USE_LEGACY_VERB_TABLE
 	select BOARD_ROMSIZE_KB_8192
 	select EC_51NB_NPCE985LA0DX
 	select HAVE_ACPI_RESUME
diff --git a/src/mainboard/51nb/x210/hda_verb.c b/src/mainboard/51nb/x210/hda_verb.c
index 730cc443a7..d689487582 100644
--- a/src/mainboard/51nb/x210/hda_verb.c
+++ b/src/mainboard/51nb/x210/hda_verb.c
@@ -2,12 +2,7 @@
 
 #include <device/azalia_device.h>
 
-const u32 cim_verb_data[] = {
-	/* coreboot specific header */
-	0x14f15069,	/* Codec Vendor / Device ID: Conexant CX20585 */
-	0x17aa2155,	/* Subsystem ID */
-	12,		/* Number of jacks (NID entries) */
-
+static const u32 conexant_cx20585_verbs[] = {
 	0x0017ff00,	/* Function Reset */
 	0x0017ff00,	/* Double Function Reset */
 	0x0017ff00,
@@ -36,4 +31,17 @@ const u32 cim_verb_data[] = {
 
 const u32 pc_beep_verbs[] = {
 };
+
+struct azalia_codec mainboard_azalia_codecs[] = {
+	{
+		.name         = "Conexant CX20585",
+		.vendor_id    = 0x14f15069,
+		.subsystem_id = 0x17aa2155,
+		.address      = 0,
+		.verbs        = conexant_cx20585_verbs,
+		.verb_count   = ARRAY_SIZE(conexant_cx20585_verbs),
+	},
+	{ /* terminator */ }
+};
+
 AZALIA_ARRAY_SIZES;