From 53486a0be0f4c8a9647158b91fb82cb951b07297 Mon Sep 17 00:00:00 2001
From: Aamir Bohra <aamir.bohra@intel.com>
Date: Fri, 29 Nov 2019 14:42:33 +0530
Subject: mb/intel/icelake_rvp: Remove nested variant header references

Change-Id: I11b2d75dc0d4ff180b03324e5ce3d5590c8169a5
Signed-off-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37356
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
---
 src/mainboard/intel/icelake_rvp/Makefile.inc       |   1 -
 src/mainboard/intel/icelake_rvp/bootblock.c        |   2 +-
 src/mainboard/intel/icelake_rvp/chromeos.c         |   3 +-
 src/mainboard/intel/icelake_rvp/dsdt.asl           |   4 +-
 src/mainboard/intel/icelake_rvp/hda_verb.c         |   3 +-
 src/mainboard/intel/icelake_rvp/mainboard.c        |   2 +-
 .../variants/baseboard/include/baseboard/ec.h      |   4 +-
 .../baseboard/include/baseboard/hda_verb.h         | 700 +++++++++++++++++++++
 .../baseboard/include/baseboard/variants.h         |   1 -
 .../variants/icl_u/include/variant/ec.h            |  21 -
 .../variants/icl_u/include/variant/gpio.h          |  21 -
 .../variants/icl_u/include/variant/hda_verb.h      | 700 ---------------------
 .../variants/icl_y/include/variant/ec.h            |  21 -
 .../variants/icl_y/include/variant/gpio.h          |  21 -
 .../variants/icl_y/include/variant/hda_verb.h      | 700 ---------------------
 15 files changed, 707 insertions(+), 1497 deletions(-)
 create mode 100644 src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/hda_verb.h
 delete mode 100644 src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/ec.h
 delete mode 100644 src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/gpio.h
 delete mode 100644 src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/hda_verb.h
 delete mode 100644 src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/ec.h
 delete mode 100644 src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/gpio.h
 delete mode 100644 src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/hda_verb.h

(limited to 'src/mainboard/intel/icelake_rvp')

diff --git a/src/mainboard/intel/icelake_rvp/Makefile.inc b/src/mainboard/intel/icelake_rvp/Makefile.inc
index 7e74f09beb..74d02cb293 100644
--- a/src/mainboard/intel/icelake_rvp/Makefile.inc
+++ b/src/mainboard/intel/icelake_rvp/Makefile.inc
@@ -33,4 +33,3 @@ subdirs-y += variants/baseboard
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
 
 subdirs-y += variants/$(VARIANT_DIR)
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/intel/icelake_rvp/bootblock.c b/src/mainboard/intel/icelake_rvp/bootblock.c
index 86559474da..300488f9a0 100644
--- a/src/mainboard/intel/icelake_rvp/bootblock.c
+++ b/src/mainboard/intel/icelake_rvp/bootblock.c
@@ -13,10 +13,10 @@
  * GNU General Public License for more details.
  */
 
+#include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <bootblock_common.h>
 #include <soc/gpio.h>
-#include <variant/gpio.h>
 
 void bootblock_mainboard_init(void)
 {
diff --git a/src/mainboard/intel/icelake_rvp/chromeos.c b/src/mainboard/intel/icelake_rvp/chromeos.c
index 785fe4a862..da3f1d442d 100644
--- a/src/mainboard/intel/icelake_rvp/chromeos.c
+++ b/src/mainboard/intel/icelake_rvp/chromeos.c
@@ -14,11 +14,10 @@
  */
 
 #include <arch/acpi.h>
+#include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
-#include <variant/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl
index 152f038fc6..f8fcd4d88c 100644
--- a/src/mainboard/intel/icelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/icelake_rvp/dsdt.asl
@@ -14,8 +14,8 @@
  */
 
 #include <arch/acpi.h>
-#include "variant/ec.h"
-#include "variant/gpio.h"
+#include <baseboard/ec.h>
+#include <baseboard/gpio.h>
 
 DefinitionBlock(
 	"dsdt.aml",
diff --git a/src/mainboard/intel/icelake_rvp/hda_verb.c b/src/mainboard/intel/icelake_rvp/hda_verb.c
index c87392d3c0..f6ae630c98 100644
--- a/src/mainboard/intel/icelake_rvp/hda_verb.c
+++ b/src/mainboard/intel/icelake_rvp/hda_verb.c
@@ -12,5 +12,4 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-
-#include "variant/hda_verb.h"
+#include <baseboard/hda_verb.h>
diff --git a/src/mainboard/intel/icelake_rvp/mainboard.c b/src/mainboard/intel/icelake_rvp/mainboard.c
index 8e51e453d3..67695fa827 100644
--- a/src/mainboard/intel/icelake_rvp/mainboard.c
+++ b/src/mainboard/intel/icelake_rvp/mainboard.c
@@ -14,11 +14,11 @@
  */
 
 #include <arch/acpi.h>
+#include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <device/device.h>
 #include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <variant/gpio.h>
 
 static void mainboard_init(void *chip_info)
 {
diff --git a/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/ec.h b/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/ec.h
index 03096ac777..ed335472e7 100644
--- a/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/ec.h
@@ -18,9 +18,7 @@
 
 #include <ec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
-
-#include <variant/gpio.h>
-
+#include <baseboard/gpio.h>
 
 #define MAINBOARD_EC_SCI_EVENTS \
 	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)        |\
diff --git a/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/hda_verb.h b/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/hda_verb.h
new file mode 100644
index 0000000000..d821a26531
--- /dev/null
+++ b/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/hda_verb.h
@@ -0,0 +1,700 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef HDA_VERB_H
+#define HDA_VERB_H
+
+#include <device/azalia_device.h>
+
+const u32 cim_verb_data[] = {
+	/* ALC 700 */
+	0x10EC0700,
+	0xFFFFFFFF,
+	0x00000023,
+
+	AZALIA_SUBVENDOR(0, 0x10EC10F2),
+	AZALIA_PIN_CFG(0, 0x01, 0x00000000),
+	AZALIA_PIN_CFG(0, 0x12, 0x40000000),
+	AZALIA_PIN_CFG(0, 0x13, 0x40000000),
+	AZALIA_PIN_CFG(0, 0x14, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x15, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x16, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x17, 0x90170110),
+	AZALIA_PIN_CFG(0, 0x18, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x19, 0x04A11030),
+	AZALIA_PIN_CFG(0, 0x1A, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x1B, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x1D, 0x40622005),
+	AZALIA_PIN_CFG(0, 0x1E, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x1F, 0x411111F0),
+	AZALIA_PIN_CFG(0, 0x21, 0x04211020),
+	AZALIA_PIN_CFG(0, 0x29, 0x411111F0),
+
+	/* Widget node 0x20 */
+	0x02050045,
+	0x02045289,
+	0x0205004A,
+	0x0204201B,
+	/* Widget node 0x20 - 1 */
+	0x05850000,
+	0x05843888,
+	0x0205006F,
+	0x02042C0B,
+
+	//Widget node 0X20 for ALC1305   20160603 update
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040000,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040004,
+	0x02050028,
+	0x02040600,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204003C,
+	0x02050028,
+	0x0204FFD0,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040080,
+	0x02050028,
+	0x02040080,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040080,
+	0x02050028,
+	0x02040880,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204003A,
+	0x02050028,
+	0x02040DFE,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006A,
+	0x02050028,
+	0x0204005D,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006C,
+	0x02050028,
+	0x02040442,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040005,
+	0x02050028,
+	0x02040880,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040006,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040008,
+	0x02050028,
+	0x0204B000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204002E,
+	0x02050028,
+	0x02040800,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006A,
+	0x02050028,
+	0x020400C3,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006C,
+	0x02050028,
+	0x0204D4A0,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006A,
+	0x02050028,
+	0x020400CC,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006C,
+	0x02050028,
+	0x0204400A,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006A,
+	0x02050028,
+	0x020400C1,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006C,
+	0x02050028,
+	0x02040320,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040039,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204003B,
+	0x02050028,
+	0x0204FFFF,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204003C,
+	0x02050028,
+	0x0204FC20,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204003A,
+	0x02050028,
+	0x02041DFE,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C0,
+	0x02050028,
+	0x020401FA,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C1,
+	0x02050028,
+	0x0204DE23,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C2,
+	0x02050028,
+	0x02041C00,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C3,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C4,
+	0x02050028,
+	0x02040200,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C5,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C6,
+	0x02050028,
+	0x020403F5,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C7,
+	0x02050028,
+	0x0204AF1B,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C8,
+	0x02050028,
+	0x02041E0A,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400C9,
+	0x02050028,
+	0x0204368E,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400CA,
+	0x02050028,
+	0x020401FA,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400CB,
+	0x02050028,
+	0x0204DE23,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400CC,
+	0x02050028,
+	0x02041C00,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400CD,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400CE,
+	0x02050028,
+	0x02040200,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400CF,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400D0,
+	0x02050028,
+	0x020403F5,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400D1,
+	0x02050028,
+	0x0204AF1B,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400D2,
+	0x02050028,
+	0x02041E0A,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x020400D3,
+	0x02050028,
+	0x0204368E,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040040,
+	0x02050028,
+	0x0204800F,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040062,
+	0x02050028,
+	0x02048000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040063,
+	0x02050028,
+	0x02044848,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040064,
+	0x02050028,
+	0x02040800,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040065,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040066,
+	0x02050028,
+	0x02044004,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040067,
+	0x02050028,
+	0x02040802,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040068,
+	0x02050028,
+	0x0204890F,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040069,
+	0x02050028,
+	0x0204E021,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040070,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040071,
+	0x02050000,
+	0x02043330,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040072,
+	0x02050000,
+	0x02043333,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040073,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040074,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040075,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040076,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040050,
+	0x02050028,
+	0x020402EC,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040051,
+	0x02050028,
+	0x02044909,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040052,
+	0x02050028,
+	0x020440B0,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040046,
+	0x02050028,
+	0x0204C22E,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040047,
+	0x02050028,
+	0x02040C00,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040048,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040049,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204004A,
+	0x02050028,
+	0x02040000,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204004B,
+	0x02050028,
+	0x02041C00,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006A,
+	0x02050028,
+	0x02040090,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204006C,
+	0x02050028,
+	0x0204721F,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x0204009E,
+	0x02050028,
+	0x02040001,
+	0x02050029,
+	0x0204B024,
+
+	0x02050024,
+	0x02040010,
+	0x02050026,
+	0x02040004,
+	0x02050028,
+	0x02040500,
+	0x02050029,
+	0x0204B024
+};
+
+const u32 pc_beep_verbs[] = {
+};
+AZALIA_ARRAY_SIZES;
+#endif
diff --git a/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/variants.h b/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/variants.h
index 12d16bc72c..a00b3441d2 100644
--- a/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/variants.h
@@ -25,7 +25,6 @@
 
 const struct pad_config *variant_gpio_table(size_t *num);
 const struct pad_config *variant_early_gpio_table(size_t *num);
-
 const struct cros_gpio *variant_cros_gpios(size_t *num);
 
 #endif /*__BASEBOARD_VARIANTS_H__ */
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/ec.h b/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/ec.h
deleted file mode 100644
index af41bf4008..0000000000
--- a/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/ec.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2018 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __MAINBOARD_EC_H__
-#define __MAINBOARD_EC_H__
-
-#include <baseboard/ec.h>
-
-#endif /* __MAINBOARD_EC_H__ */
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/gpio.h b/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/gpio.h
deleted file mode 100644
index c34a9b3cd9..0000000000
--- a/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/gpio.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2018 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
- */
-
-#ifndef __MAINBOARD_GPIO_H__
-#define __MAINBOARD_GPIO_H__
-
-#include <baseboard/gpio.h>
-
-#endif /* __MAINBOARD_GPIO_H__ */
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/hda_verb.h b/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/hda_verb.h
deleted file mode 100644
index d821a26531..0000000000
--- a/src/mainboard/intel/icelake_rvp/variants/icl_u/include/variant/hda_verb.h
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2018 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef HDA_VERB_H
-#define HDA_VERB_H
-
-#include <device/azalia_device.h>
-
-const u32 cim_verb_data[] = {
-	/* ALC 700 */
-	0x10EC0700,
-	0xFFFFFFFF,
-	0x00000023,
-
-	AZALIA_SUBVENDOR(0, 0x10EC10F2),
-	AZALIA_PIN_CFG(0, 0x01, 0x00000000),
-	AZALIA_PIN_CFG(0, 0x12, 0x40000000),
-	AZALIA_PIN_CFG(0, 0x13, 0x40000000),
-	AZALIA_PIN_CFG(0, 0x14, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x15, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x16, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x17, 0x90170110),
-	AZALIA_PIN_CFG(0, 0x18, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x19, 0x04A11030),
-	AZALIA_PIN_CFG(0, 0x1A, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x1B, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x1D, 0x40622005),
-	AZALIA_PIN_CFG(0, 0x1E, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x1F, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x21, 0x04211020),
-	AZALIA_PIN_CFG(0, 0x29, 0x411111F0),
-
-	/* Widget node 0x20 */
-	0x02050045,
-	0x02045289,
-	0x0205004A,
-	0x0204201B,
-	/* Widget node 0x20 - 1 */
-	0x05850000,
-	0x05843888,
-	0x0205006F,
-	0x02042C0B,
-
-	//Widget node 0X20 for ALC1305   20160603 update
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040000,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040004,
-	0x02050028,
-	0x02040600,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003C,
-	0x02050028,
-	0x0204FFD0,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040080,
-	0x02050028,
-	0x02040080,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040080,
-	0x02050028,
-	0x02040880,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003A,
-	0x02050028,
-	0x02040DFE,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x0204005D,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x02040442,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040005,
-	0x02050028,
-	0x02040880,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040006,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040008,
-	0x02050028,
-	0x0204B000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204002E,
-	0x02050028,
-	0x02040800,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x020400C3,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x0204D4A0,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x020400CC,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x0204400A,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x020400C1,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x02040320,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040039,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003B,
-	0x02050028,
-	0x0204FFFF,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003C,
-	0x02050028,
-	0x0204FC20,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003A,
-	0x02050028,
-	0x02041DFE,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C0,
-	0x02050028,
-	0x020401FA,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C1,
-	0x02050028,
-	0x0204DE23,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C2,
-	0x02050028,
-	0x02041C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C3,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C4,
-	0x02050028,
-	0x02040200,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C5,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C6,
-	0x02050028,
-	0x020403F5,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C7,
-	0x02050028,
-	0x0204AF1B,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C8,
-	0x02050028,
-	0x02041E0A,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C9,
-	0x02050028,
-	0x0204368E,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CA,
-	0x02050028,
-	0x020401FA,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CB,
-	0x02050028,
-	0x0204DE23,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CC,
-	0x02050028,
-	0x02041C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CD,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CE,
-	0x02050028,
-	0x02040200,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CF,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D0,
-	0x02050028,
-	0x020403F5,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D1,
-	0x02050028,
-	0x0204AF1B,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D2,
-	0x02050028,
-	0x02041E0A,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D3,
-	0x02050028,
-	0x0204368E,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040040,
-	0x02050028,
-	0x0204800F,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040062,
-	0x02050028,
-	0x02048000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040063,
-	0x02050028,
-	0x02044848,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040064,
-	0x02050028,
-	0x02040800,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040065,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040066,
-	0x02050028,
-	0x02044004,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040067,
-	0x02050028,
-	0x02040802,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040068,
-	0x02050028,
-	0x0204890F,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040069,
-	0x02050028,
-	0x0204E021,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040070,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040071,
-	0x02050000,
-	0x02043330,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040072,
-	0x02050000,
-	0x02043333,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040073,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040074,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040075,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040076,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040050,
-	0x02050028,
-	0x020402EC,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040051,
-	0x02050028,
-	0x02044909,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040052,
-	0x02050028,
-	0x020440B0,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040046,
-	0x02050028,
-	0x0204C22E,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040047,
-	0x02050028,
-	0x02040C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040048,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040049,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204004A,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204004B,
-	0x02050028,
-	0x02041C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x02040090,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x0204721F,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204009E,
-	0x02050028,
-	0x02040001,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040004,
-	0x02050028,
-	0x02040500,
-	0x02050029,
-	0x0204B024
-};
-
-const u32 pc_beep_verbs[] = {
-};
-AZALIA_ARRAY_SIZES;
-#endif
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/ec.h b/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/ec.h
deleted file mode 100644
index af41bf4008..0000000000
--- a/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/ec.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2018 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __MAINBOARD_EC_H__
-#define __MAINBOARD_EC_H__
-
-#include <baseboard/ec.h>
-
-#endif /* __MAINBOARD_EC_H__ */
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/gpio.h b/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/gpio.h
deleted file mode 100644
index c34a9b3cd9..0000000000
--- a/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/gpio.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2018 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
- */
-
-#ifndef __MAINBOARD_GPIO_H__
-#define __MAINBOARD_GPIO_H__
-
-#include <baseboard/gpio.h>
-
-#endif /* __MAINBOARD_GPIO_H__ */
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/hda_verb.h b/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/hda_verb.h
deleted file mode 100644
index d821a26531..0000000000
--- a/src/mainboard/intel/icelake_rvp/variants/icl_y/include/variant/hda_verb.h
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2018 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef HDA_VERB_H
-#define HDA_VERB_H
-
-#include <device/azalia_device.h>
-
-const u32 cim_verb_data[] = {
-	/* ALC 700 */
-	0x10EC0700,
-	0xFFFFFFFF,
-	0x00000023,
-
-	AZALIA_SUBVENDOR(0, 0x10EC10F2),
-	AZALIA_PIN_CFG(0, 0x01, 0x00000000),
-	AZALIA_PIN_CFG(0, 0x12, 0x40000000),
-	AZALIA_PIN_CFG(0, 0x13, 0x40000000),
-	AZALIA_PIN_CFG(0, 0x14, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x15, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x16, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x17, 0x90170110),
-	AZALIA_PIN_CFG(0, 0x18, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x19, 0x04A11030),
-	AZALIA_PIN_CFG(0, 0x1A, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x1B, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x1D, 0x40622005),
-	AZALIA_PIN_CFG(0, 0x1E, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x1F, 0x411111F0),
-	AZALIA_PIN_CFG(0, 0x21, 0x04211020),
-	AZALIA_PIN_CFG(0, 0x29, 0x411111F0),
-
-	/* Widget node 0x20 */
-	0x02050045,
-	0x02045289,
-	0x0205004A,
-	0x0204201B,
-	/* Widget node 0x20 - 1 */
-	0x05850000,
-	0x05843888,
-	0x0205006F,
-	0x02042C0B,
-
-	//Widget node 0X20 for ALC1305   20160603 update
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040000,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040004,
-	0x02050028,
-	0x02040600,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003C,
-	0x02050028,
-	0x0204FFD0,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040080,
-	0x02050028,
-	0x02040080,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040080,
-	0x02050028,
-	0x02040880,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003A,
-	0x02050028,
-	0x02040DFE,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x0204005D,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x02040442,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040005,
-	0x02050028,
-	0x02040880,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040006,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040008,
-	0x02050028,
-	0x0204B000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204002E,
-	0x02050028,
-	0x02040800,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x020400C3,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x0204D4A0,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x020400CC,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x0204400A,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x020400C1,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x02040320,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040039,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003B,
-	0x02050028,
-	0x0204FFFF,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003C,
-	0x02050028,
-	0x0204FC20,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204003A,
-	0x02050028,
-	0x02041DFE,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C0,
-	0x02050028,
-	0x020401FA,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C1,
-	0x02050028,
-	0x0204DE23,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C2,
-	0x02050028,
-	0x02041C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C3,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C4,
-	0x02050028,
-	0x02040200,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C5,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C6,
-	0x02050028,
-	0x020403F5,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C7,
-	0x02050028,
-	0x0204AF1B,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C8,
-	0x02050028,
-	0x02041E0A,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400C9,
-	0x02050028,
-	0x0204368E,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CA,
-	0x02050028,
-	0x020401FA,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CB,
-	0x02050028,
-	0x0204DE23,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CC,
-	0x02050028,
-	0x02041C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CD,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CE,
-	0x02050028,
-	0x02040200,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400CF,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D0,
-	0x02050028,
-	0x020403F5,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D1,
-	0x02050028,
-	0x0204AF1B,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D2,
-	0x02050028,
-	0x02041E0A,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x020400D3,
-	0x02050028,
-	0x0204368E,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040040,
-	0x02050028,
-	0x0204800F,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040062,
-	0x02050028,
-	0x02048000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040063,
-	0x02050028,
-	0x02044848,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040064,
-	0x02050028,
-	0x02040800,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040065,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040066,
-	0x02050028,
-	0x02044004,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040067,
-	0x02050028,
-	0x02040802,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040068,
-	0x02050028,
-	0x0204890F,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040069,
-	0x02050028,
-	0x0204E021,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040070,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040071,
-	0x02050000,
-	0x02043330,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040072,
-	0x02050000,
-	0x02043333,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040073,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040074,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040075,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040076,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040050,
-	0x02050028,
-	0x020402EC,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040051,
-	0x02050028,
-	0x02044909,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040052,
-	0x02050028,
-	0x020440B0,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040046,
-	0x02050028,
-	0x0204C22E,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040047,
-	0x02050028,
-	0x02040C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040048,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040049,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204004A,
-	0x02050028,
-	0x02040000,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204004B,
-	0x02050028,
-	0x02041C00,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006A,
-	0x02050028,
-	0x02040090,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204006C,
-	0x02050028,
-	0x0204721F,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x0204009E,
-	0x02050028,
-	0x02040001,
-	0x02050029,
-	0x0204B024,
-
-	0x02050024,
-	0x02040010,
-	0x02050026,
-	0x02040004,
-	0x02050028,
-	0x02040500,
-	0x02050029,
-	0x0204B024
-};
-
-const u32 pc_beep_verbs[] = {
-};
-AZALIA_ARRAY_SIZES;
-#endif
-- 
cgit v1.2.3