[coreboot-gerrit] [M] Change in coreboot[main]: mb/compulab: Use temporary macros to facilitate reworking verb table

[Nicholas Sudsgaard (Code Review)]

Nicholas Sudsgaard has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84462?usp=email )

Change subject: mb/compulab: Use temporary macros to facilitate reworking verb table
......................................................................

mb/compulab: Use temporary macros to facilitate reworking verb table

TEST=Timeless build produces identical binaries for all mainboards.

Change-Id: Ib0ae0c8fba7316dbd8ace56783939949933e7eb0
Signed-off-by: Nicholas Sudsgaard 
---
M src/mainboard/compulab/intense_pc/hda_verb.c
1 file changed, 34 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/84462/1

diff --git a/src/mainboard/compulab/intense_pc/hda_verb.c b/src/mainboard/compulab/intense_pc/hda_verb.c
index c16f73b..bdcaae5 100644
--- a/src/mainboard/compulab/intense_pc/hda_verb.c
+++ b/src/mainboard/compulab/intense_pc/hda_verb.c
@@ -2,34 +2,40 @@

#include <device/azalia_device.h>

-const u32 cim_verb_data[] = {
-	0x10ec0888,	/* Codec Vendor / Device ID: Realtek */
-	0x10ec0888,	/* Subsystem ID */
-	15,		/* Number of 4 dword sets */
-	AZALIA_SUBVENDOR(0, 0x10ec0888),
-	AZALIA_PIN_CFG(0, 0x11, 0x411110f0),
-	AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x14, 0x01214120),
-	AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x18, 0x01a19131),
-	AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x1a, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x1b, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x1d, AZALIA_PIN_CFG_NC(0)),
-	AZALIA_PIN_CFG(0, 0x1e, 0x014421f0),
-	AZALIA_PIN_CFG(0, 0x1f, 0x01c421f0),
-
-	0x80862806,	/* Codec Vendor / Device ID: Intel */
-	0x80860101,	/* Subsystem ID */
-	4,		/* Number of 4 dword sets */
-	AZALIA_SUBVENDOR(3, 0x80860101),
-	AZALIA_PIN_CFG(3, 0x05, 0x58560010),
-	AZALIA_PIN_CFG(3, 0x06, 0x18560020),
-	AZALIA_PIN_CFG(3, 0x07, 0x18560030),
-};
+CIM_VERB_DATA_2(\
+	realtek,\
+	0x10ec0888,	/* Codec Vendor / Device ID: Realtek */\
+	0x10ec0888,	/* Subsystem ID */\
+	15,		/* Number of 4 dword sets */\
+	VERB_DATA(\
+	AZALIA_SUBVENDOR(0, 0x10ec0888),\
+	AZALIA_PIN_CFG(0, 0x11, 0x411110f0),\
+	AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x14, 0x01214120),\
+	AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x18, 0x01a19131),\
+	AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x1a, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x1b, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x1d, AZALIA_PIN_CFG_NC(0)),\
+	AZALIA_PIN_CFG(0, 0x1e, 0x014421f0),\
+	AZALIA_PIN_CFG(0, 0x1f, 0x01c421f0)\
+),\
+\
+	intel_hdmi,\
+	0x80862806,	/* Codec Vendor / Device ID: Intel */\
+	0x80860101,	/* Subsystem ID */\
+	4,		/* Number of 4 dword sets */\
+	VERB_DATA(\
+	AZALIA_SUBVENDOR(3, 0x80860101),\
+	AZALIA_PIN_CFG(3, 0x05, 0x58560010),\
+	AZALIA_PIN_CFG(3, 0x06, 0x18560020),\
+	AZALIA_PIN_CFG(3, 0x07, 0x18560030)\
+)\
+);

const u32 pc_beep_verbs[0] = {};