Nicholas Sudsgaard has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84464?usp=email )
Change subject: mb/foxconn: Use temporary macros to facilitate reworking verb table ......................................................................
mb/foxconn: Use temporary macros to facilitate reworking verb table
TEST=Timeless build produces identical binaries for all mainboards.
Change-Id: I68cae967ab7a748de2daef50fd7880627787b9cc Signed-off-by: Nicholas Sudsgaard devel+coreboot@nsudsgaard.com --- M src/mainboard/foxconn/d41s/hda_verb.c M src/mainboard/foxconn/g41s-k/hda_verb.c 2 files changed, 73 insertions(+), 64 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/84464/1
diff --git a/src/mainboard/foxconn/d41s/hda_verb.c b/src/mainboard/foxconn/d41s/hda_verb.c index 7a752e3..bc7e8f6 100644 --- a/src/mainboard/foxconn/d41s/hda_verb.c +++ b/src/mainboard/foxconn/d41s/hda_verb.c @@ -2,24 +2,27 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0662, - 0x105b0d55, // Subsystem ID - 0x0000000a, // Number of entries - - /* Pin Widget Verb Table */ - AZALIA_PIN_CFG(0, 0x14, 0x01014c10), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19c30), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c31), - AZALIA_PIN_CFG(0, 0x1a, 0x0181343f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c1f), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005c603), - AZALIA_PIN_CFG(0, 0x1e, 0x99430120), -}; +CIM_VERB_DATA_1(\ + /* coreboot specific header */\ + realtek,\ + 0x10ec0662,\ + 0x105b0d55, /* Subsystem ID */\ + 0x0000000a, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ + AZALIA_PIN_CFG(0, 0x14, 0x01014c10),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19c30),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c31),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181343f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c1f),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005c603),\ + AZALIA_PIN_CFG(0, 0x1e, 0x99430120)\ +)\ +);
const u32 pc_beep_verbs[] = { }; diff --git a/src/mainboard/foxconn/g41s-k/hda_verb.c b/src/mainboard/foxconn/g41s-k/hda_verb.c index 40ab35d..0bd1e9f 100644 --- a/src/mainboard/foxconn/g41s-k/hda_verb.c +++ b/src/mainboard/foxconn/g41s-k/hda_verb.c @@ -3,53 +3,59 @@ #include <device/azalia_device.h>
#if CONFIG(BOARD_FOXCONN_G41S_K) -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0888, /* Vendor ID */ - 0x105b0dda, /* Subsystem ID */ - 0x0000000e, /* Number of entries */ - - /* Pin Widget Verb Table */ - - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014410), - 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, 0x01a19c50), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181345f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(0, 0x1e, 0x01441130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + /* coreboot specific header */\ + realtek,\ + 0x10ec0888, /* Vendor ID */\ + 0x105b0dda, /* Subsystem ID */\ + 0x0000000e, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ +\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014410),\ + 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, 0x01a19c50),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181345f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01441130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +); #else /* CONFIG_BOARD_FOXCONN_G41M */ -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0888, /* Vendor ID */ - 0x105b0dc0, /* Subsystem ID */ - 0x0000000e, /* Number of entries */ - - /* Pin Widget Verb Table */ - - AZALIA_PIN_CFG(2, 0x11, 0x01441140), - AZALIA_PIN_CFG(2, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x14, 0x01014410), - AZALIA_PIN_CFG(2, 0x15, 0x01011412), - AZALIA_PIN_CFG(2, 0x16, 0x01016411), - AZALIA_PIN_CFG(2, 0x17, 0x01012414), - AZALIA_PIN_CFG(2, 0x18, 0x01a19c50), - AZALIA_PIN_CFG(2, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(2, 0x1a, 0x0181345f), - AZALIA_PIN_CFG(2, 0x1b, 0x02014c20), - AZALIA_PIN_CFG(2, 0x1c, 0x593301f0), - AZALIA_PIN_CFG(2, 0x1d, 0x4007f603), - AZALIA_PIN_CFG(2, 0x1e, 0x99430130), - AZALIA_PIN_CFG(2, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + /* coreboot specific header */\ + realtek,\ + 0x10ec0888, /* Vendor ID */\ + 0x105b0dc0, /* Subsystem ID */\ + 0x0000000e, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ +\ + AZALIA_PIN_CFG(2, 0x11, 0x01441140),\ + AZALIA_PIN_CFG(2, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x14, 0x01014410),\ + AZALIA_PIN_CFG(2, 0x15, 0x01011412),\ + AZALIA_PIN_CFG(2, 0x16, 0x01016411),\ + AZALIA_PIN_CFG(2, 0x17, 0x01012414),\ + AZALIA_PIN_CFG(2, 0x18, 0x01a19c50),\ + AZALIA_PIN_CFG(2, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(2, 0x1a, 0x0181345f),\ + AZALIA_PIN_CFG(2, 0x1b, 0x02014c20),\ + AZALIA_PIN_CFG(2, 0x1c, 0x593301f0),\ + AZALIA_PIN_CFG(2, 0x1d, 0x4007f603),\ + AZALIA_PIN_CFG(2, 0x1e, 0x99430130),\ + AZALIA_PIN_CFG(2, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +); #endif
const u32 pc_beep_verbs[0] = {};