nb/intel: Deduplicate vbt header

Move header and delete duplicates.

Change-Id: I0e1f5d9082626062f95afe718f6ec62a68f0d828
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/18903
Tested-by: build bot (Jenkins)
Tested-by: coreboot org <coreboot.org@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

3 files changed, 2 insertions, 250 deletions

diff --git a/src/soc/intel/common/gma.h b/src/soc/intel/common/gma.h
deleted file mode 100644
index 3f943805fb..0000000000
--- a/src/soc/intel/common/gma.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2016 Intel Corp.
- * (Written by Abhay Kumar <abhay.kumar@intel.com> for Intel Corp.)
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 _COMMON_GMA_H_
-#define _COMMON_GMA_H_
-
-#include <types.h>
-#include <commonlib/helpers.h>
-
-/* IGD PCI Configuration register */
-#define ASLS           0xfc            /* OpRegion Base */
-#define SWSCI          0xe8            /* SWSCI Register */
-#define GSSCIE         (1 << 0)        /* SCI Event trigger */
-#define SMISCISEL      (1 << 15)       /* Select SMI or SCI event source */
-
-/* mailbox 0: header */
-typedef struct {
-	u8	signature[16];	    /* Offset 0    OpRegion signature */
-	u32	size;		    /* Offset 16   OpRegion size */
-	u32	version;	    /* Offset 20   OpRegion structure version */
-	u8	sbios_version[32];  /* Offset 24   System BIOS build version */
-	u8	vbios_version[16];  /* Offset 56   Video BIOS build version */
-	u8	driver_version[16]; /* Offset 72   Graphic drvr build version */
-	u32	mailboxes;	    /* Offset 88   Mailboxes supported */
-	u32	dmod;		    /* Offset 92   Driver Model */
-	u32	pcon;		    /* Offset 96   Platform Capabilities */
-	u16	dver[16];	    /* Offset 100  GOP Version */
-	u8	reserved[124];	    /* Offset 132  Reserved */
-} __attribute__((packed)) opregion_header_t;
-
-#define IGD_OPREGION_SIGNATURE "IntelGraphicsMem"
-#define IGD_OPREGION_VERSION  2
-
-#define IGD_MBOX1	(1 << 0)
-#define IGD_MBOX2	(1 << 1)
-#define IGD_MBOX3	(1 << 2)
-#define IGD_MBOX4	(1 << 3)
-#define IGD_MBOX5	(1 << 4)
-
-#define MAILBOXES_MOBILE  (IGD_MBOX1 | IGD_MBOX2 | IGD_MBOX3 | \
-			   IGD_MBOX4 | IGD_MBOX5)
-#define MAILBOXES_DESKTOP (IGD_MBOX2 | IGD_MBOX4)
-
-#define SBIOS_VERSION_SIZE 32
-
-/* mailbox 1: public ACPI methods */
-typedef struct {
-	u32	drdy;	/* Offset 0    Driver readiness */
-	u32	csts;	/* Offset 4    Status */
-	u32	cevt;	/* Offset 8    Current event */
-	u8	reserved[20];	/* Offset 12   Reserved */
-	u32	didl;	/* Offset 32   Supported display device 1 */
-	u32	ddl2;	/* Offset 36   Supported display device 2 */
-	u32	ddl3;	/* Offset 40   Supported display device 3 */
-	u32	ddl4;	/* Offset 44   Supported display device 4 */
-	u32	ddl5;	/* Offset 48   Supported display device 5 */
-	u32	ddl6;	/* Offset 52   Supported display device 6 */
-	u32	ddl7;	/* Offset 56   Supported display device 7 */
-	u32	ddl8;	/* Offset 60   Supported display device 8 */
-	u32	cpdl;	/* Offset 64   Currently present display device 1 */
-	u32	cpl2;	/* Offset 68   Currently present display device 2 */
-	u32	cpl3;	/* Offset 72   Currently present display device 3 */
-	u32	cpl4;	/* Offset 76   Currently present display device 4 */
-	u32	cpl5;	/* Offset 80   Currently present display device 5 */
-	u32	cpl6;	/* Offset 84   Currently present display device 6 */
-	u32	cpl7;	/* Offset 88   Currently present display device 7 */
-	u32	cpl8;	/* Offset 92   Currently present display device 8 */
-	u32	cadl;	/* Offset 96   Currently active display device 1 */
-	u32	cal2;	/* Offset 100  Currently active display device 2 */
-	u32	cal3;	/* Offset 104  Currently active display device 3 */
-	u32	cal4;	/* Offset 108  Currently active display device 4 */
-	u32	cal5;	/* Offset 112  Currently active display device 5 */
-	u32	cal6;	/* Offset 116  Currently active display device 6 */
-	u32	cal7;	/* Offset 120  Currently active display device 7 */
-	u32	cal8;	/* Offset 124  Currently active display device 8 */
-	u32	nadl;	/* Offset 128  Next active device 1 */
-	u32	ndl2;	/* Offset 132  Next active device 2 */
-	u32	ndl3;	/* Offset 136  Next active device 3 */
-	u32	ndl4;	/* Offset 140  Next active device 4 */
-	u32	ndl5;	/* Offset 144  Next active device 5 */
-	u32	ndl6;	/* Offset 148  Next active device 6 */
-	u32	ndl7;	/* Offset 152  Next active device 7 */
-	u32	ndl8;	/* Offset 156  Next active device 8 */
-	u32	aslp;	/* Offset 160  ASL sleep timeout */
-	u32	tidx;	/* Offset 164  Toggle table index */
-	u32	chpd;	/* Offset 168  Current hot plug enable indicator */
-	u32	clid;	/* Offset 172  Current lid state indicator */
-	u32	cdck;	/* Offset 176  Current docking state indicator */
-	u32	sxsw;	/* Offset 180  Display Switch notification on Sx State
-			 * resume
-			 */
-	u32	evts;	/* Offset 184  Events supported by ASL */
-	u32	cnot;	/* Offset 188  Current OS Notification */
-	u32	nrdy;	/* Offset 192  Reasons for DRDY = 0 */
-	u32	ddl9;	/* Offset 196  Extended Supported display device 1 */
-	u32	dd10;	/* Offset 200  Extended Supported display device 2 */
-	u32	dd11;	/* Offset 204  Extended Supported display device 3 */
-	u32	dd12;	/* Offset 208  Extended Supported display device 4 */
-	u32	dd13;	/* Offset 212  Extended Supported display device 5 */
-	u32	dd14;	/* Offset 216  Extended Supported display device 6 */
-	u32	dd15;	/* Offset 220  Extended Supported display device 7 */
-	u32	cpl9;	/* Offset 224  Extended Currently present device 1 */
-	u32	cp10;	/* Offset 228  Extended Currently present device 2 */
-	u32	cp11;	/* Offset 232  Extended Currently present device 3 */
-	u32	cp12;	/* Offset 236  Extended Currently present device 4 */
-	u32	cp13;	/* Offset 240  Extended Currently present device 5 */
-	u32	cp14;	/* Offset 244  Extended Currently present device 6 */
-	u32	cp15;	/* Offset 248  Extended Currently present device 7 */
-	u8	reserved2[4];	/* Offset 252  Reserved 4 bytes */
-} __attribute__((packed)) opregion_mailbox1_t;
-
-/* mailbox 2: software sci interface */
-typedef struct {
-	u32	scic;	/* Offset 0  Software SCI function number parameters */
-	u32	parm;	/* Offset 4  Software SCI function number parameters */
-	u32	dslp;	/* Offset 8  Driver sleep timeout */
-	u8	reserved[244];	/* Offset 12   Reserved */
-} __attribute__((packed)) opregion_mailbox2_t;
-
-/* mailbox 3: power conservation */
-typedef struct {
-	u32	ardy;		/* Offset 0   Driver readiness */
-	u32	aslc;		/* Offset 4   ASLE interrupt command / status */
-	u32	tche;		/* Offset 8   Technology enabled indicator */
-	u32	alsi;		/* Offset 12  Current ALS illuminance reading */
-	u32	bclp;		/* Offset 16  Backlight britness to set */
-	u32	pfit;		/* Offset 20  Panel fitting Request */
-	u32	cblv;		/* Offset 24  Brightness Current State */
-	u16	bclm[20];	/* Offset 28  Backlight Brightness Level Duty
-				 *            Cycle Mapping Table
-				 */
-	u32	cpfm;		/* Offset 68  Panel Fitting Current Mode */
-	u32	epfm;		/* Offset 72  Enabled Panel Fitting Modes */
-	u8	plut[74];	/* Offset 76  Panel Look Up Table */
-	u32	pfmb;		/* Offset 150 PWM Frequency and Minimum
-				 *            Brightness
-				 */
-	u32	ccdv;		/* Offset 154 Color Correction Default Values */
-	u32	pcft;		/* Offset 158 Power Conservation Features */
-	u32	srot;		/* Offset 162 Supported Rotation angle */
-	u32	iuer;		/* Offset 166 Intel Ultrabook Event Register */
-	u64	fdsp;		/* Offset 170 FFS Display Physical address */
-	u32	fdss;		/* Offset 178 FFS Display Size */
-	u32	stat;		/* Offset 182 State Indicator */
-	u64	rvda;		/* Offset 186 (Igd opregion offset 0x3BAh)
-				 *            Physical address of Raw VBT data
-				 */
-	u32	rvds;		/* Offset 194 (Igd opregion offset 0x3C2h)
-				 *            Size of Raw VBT data
-				 */
-	u8	reserved[58];	/* Offset 198 Reserved */
-} __attribute__((packed)) opregion_mailbox3_t;
-
-#define IGD_BACKLIGHT_BRIGHTNESS 0xff
-#define IGD_INITIAL_BRIGHTNESS 0x64
-
-#define IGD_FIELD_VALID	(1 << 31)
-#define IGD_WORD_FIELD_VALID (1 << 15)
-#define IGD_PFIT_STRETCH 6
-
-/* mailbox 4: vbt */
-typedef struct {
-	u8 gvd1[6*KiB];
-} __attribute__((packed)) opregion_vbt_t;
-
-/* Mailbox 5: BIOS to Driver Notification Extension */
-typedef struct {
-	u32	phed;		/* Offset 7168 Panel Header */
-	u8	bddc[256];	/* Offset 7172 Panel EDID */
-	u8	reserved[764];	/* Offset 7428 764 bytes */
-} __attribute__((packed)) opregion_mailbox5_t;
-
-/* IGD OpRegion */
-typedef struct {
-	opregion_header_t	header;
-	opregion_mailbox1_t	mailbox1;
-	opregion_mailbox2_t	mailbox2;
-	opregion_mailbox3_t	mailbox3;
-	opregion_vbt_t vbt;
-	opregion_mailbox5_t	mailbox5;
-
-} __attribute__((packed)) igd_opregion_t;
-
-/* Intel Video BIOS (Option ROM) */
-typedef struct {
-	u16	signature;
-	u8	size;
-	u8	reserved[21];
-	u16	pcir_offset;
-	u16	vbt_offset;
-} __attribute__((packed)) optionrom_header_t;
-
-#define OPROM_SIGNATURE 0xaa55
-
-typedef struct {
-	u32	signature;
-	u16	vendor;
-	u16	device;
-	u16	reserved1;
-	u16	length;
-	u8	revision;
-	u8	classcode[3];
-	u16	imagelength;
-	u16	coderevision;
-	u8	codetype;
-	u8	indicator;
-	u16	reserved2;
-} __attribute__((packed)) optionrom_pcir_t;
-
-typedef struct {
-	u8	hdr_signature[20];
-	u16	hdr_version;
-	u16	hdr_size;
-	u16	hdr_vbt_size;
-	u8	hdr_vbt_checksum;
-	u8	hdr_reserved;
-	u32	hdr_vbt_datablock;
-	u32	hdr_aim[4];
-	u8	datahdr_signature[16];
-	u16	datahdr_version;
-	u16	datahdr_size;
-	u16	datahdr_datablocksize;
-	u8	coreblock_id;
-	u16	coreblock_size;
-	u16	coreblock_biossize;
-	u8	coreblock_biostype;
-	u8	coreblock_releasestatus;
-	u8	coreblock_hwsupported;
-	u8	coreblock_integratedhw;
-	u8	coreblock_biosbuild[4];
-	u8	coreblock_biossignon[155];
-} __attribute__((packed)) optionrom_vbt_t;
-
-#endif /* _COMMON_GMA_H_ */
diff --git a/src/soc/intel/common/opregion.c b/src/soc/intel/common/opregion.c
index fe85d3d263..25c0a58c6f 100644
--- a/src/soc/intel/common/opregion.c
+++ b/src/soc/intel/common/opregion.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <cbmem.h>
 
-#include "gma.h"
+#include <drivers/intel/gma/opregion.h>
 #include "opregion.h"
 #include "vbt.h"
 
diff --git a/src/soc/intel/common/opregion.h b/src/soc/intel/common/opregion.h
index 228aca2d94..bcffe6e5f6 100644
--- a/src/soc/intel/common/opregion.h
+++ b/src/soc/intel/common/opregion.h
@@ -16,7 +16,7 @@
 #ifndef _COMMON_OPREGION_H_
 #define _COMMON_OPREGION_H_
 
-#include "gma.h"
+#include <drivers/intel/gma/opregion.h>
 
 /* Loads vbt and initializes opregion. Returns non-zero on success */
 int init_igd_opregion(igd_opregion_t *opregion);