mb/*/*: Remove BROADWELL_DE boards

Relocatable ramstage, postcar stage and C_ENVIRONMENT_BOOTBLOCK are
now mandatory features, which this platform lacks.

Change-Id: I3d9b6bb48bfd15c0182448f774e9af1e0c944fd5
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36983
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>

17 files changed, 0 insertions, 597 deletions

diff --git a/src/mainboard/facebook/watson/Kconfig b/src/mainboard/facebook/watson/Kconfig
deleted file mode 100644
index 3235b6cc99..0000000000
--- a/src/mainboard/facebook/watson/Kconfig
+++ /dev/null
@@ -1,57 +0,0 @@
-if BOARD_FACEBOOK_WATSON
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select SOC_INTEL_FSP_BROADWELL_DE
-	select BOARD_ROMSIZE_KB_16384
-	select HAVE_ACPI_TABLES
-	select HAVE_OPTION_TABLE
-	select INTEGRATED_UART
-	select SERIRQ_CONTINUOUS_MODE
-	select MAINBOARD_USES_IFD_GBE_REGION
-	select MAINBOARD_HAS_LPC_TPM
-	select MAINBOARD_HAS_TPM1
-	select NO_UART_ON_SUPERIO
-
-config VBOOT
-	select VBOOT_VBNV_CMOS
-	select VBOOT_NO_BOARD_SUPPORT
-	select GBB_FLAG_DISABLE_LID_SHUTDOWN
-	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
-	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
-	select GBB_FLAG_DISABLE_FWMP
-
-config MAINBOARD_DIR
-	string
-	default "facebook/watson"
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "Watson"
-
-config IRQ_SLOT_COUNT
-	int
-	default 18
-
-config CBFS_SIZE
-	hex
-	default 0x00800000
-
-config VIRTUAL_ROM_SIZE
-	hex
-	# Set to CONFIG_ROM_SIZE*2 if using concatenated flash chips.
-	# See FSP's Kconfig for details.
-	default ROM_SIZE
-
-config DRIVERS_UART_8250IO
-	def_bool n
-
-config FMDFILE
-	string
-	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
-
-config ENABLE_TURBO
-	bool "Enable turbo frequency"
-	default n
-
-endif # BOARD_FACEBOOK_WATSON
diff --git a/src/mainboard/facebook/watson/Kconfig.name b/src/mainboard/facebook/watson/Kconfig.name
deleted file mode 100644
index ea6c344791..0000000000
--- a/src/mainboard/facebook/watson/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_FACEBOOK_WATSON
-	bool "Watson"
diff --git a/src/mainboard/facebook/watson/Makefile.inc b/src/mainboard/facebook/watson/Makefile.inc
deleted file mode 100644
index 1606476d80..0000000000
--- a/src/mainboard/facebook/watson/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2012 Google Inc.
-##
-## 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.
-##
-
-ramstage-y += irqroute.c
diff --git a/src/mainboard/facebook/watson/acpi/mainboard.asl b/src/mainboard/facebook/watson/acpi/mainboard.asl
deleted file mode 100644
index 62944ef353..0000000000
--- a/src/mainboard/facebook/watson/acpi/mainboard.asl
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Google Inc.
- *
- * 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.
- */
-
-Device (PWRB)
-{
-	Name(_HID, EisaId("PNP0C0C"))
-}
diff --git a/src/mainboard/facebook/watson/acpi/platform.asl b/src/mainboard/facebook/watson/acpi/platform.asl
deleted file mode 100644
index 7ffae2e6e0..0000000000
--- a/src/mainboard/facebook/watson/acpi/platform.asl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- * Copyright (C) 2012 Google Inc.
- *
- * 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.
- */
-
-/* The APM port can be used for generating software SMIs */
-
-OperationRegion (APMP, SystemIO, 0xb2, 2)
-Field (APMP, ByteAcc, NoLock, Preserve)
-{
-	APMC, 8,	// APM command
-	APMS, 8		// APM status
-}
-
-/* Port 80 POST */
-
-OperationRegion (POST, SystemIO, 0x80, 1)
-Field (POST, ByteAcc, Lock, Preserve)
-{
-	DBG0, 8
-}
-
-Name(\APC1, Zero) // IIO IOAPIC
-
-Name(\PICM, Zero) // IOAPIC/8259
-
-Method(_PIC, 1)
-{
-	Store(Arg0, PICM)
-}
-
-/* The _PTS method (Prepare To Sleep) is called before the OS is
- * entering a sleep state. The sleep state number is passed in Arg0
- */
-
-Method(_PTS,1)
-{
-}
-
-/* The _WAK method is called on system wakeup */
-
-Method(_WAK,1)
-{
-	Return(Package(){0,0})
-}
diff --git a/src/mainboard/facebook/watson/acpi_tables.c b/src/mainboard/facebook/watson/acpi_tables.c
deleted file mode 100644
index 250ff58b36..0000000000
--- a/src/mainboard/facebook/watson/acpi_tables.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Google Inc.
- * Copyright (C) 2015-2016 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; 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.
- */
-
-#include <arch/ioapic.h>
-#include <soc/acpi.h>
-#include <soc/iomap.h>
-
-unsigned long acpi_fill_madt(unsigned long current)
-{
-	u32 i;
-
-	current = acpi_create_madt_lapics(current);
-
-	current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, 8,
-		IOXAPIC1_BASE_ADDRESS, 0);
-	set_ioapic_id((u8 *)IOXAPIC1_BASE_ADDRESS, 8);
-
-	current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, 9,
-		IOXAPIC2_BASE_ADDRESS, 24);
-	set_ioapic_id((u8 *)IOXAPIC2_BASE_ADDRESS, 9);
-
-	current = acpi_madt_irq_overrides(current);
-
-	for (i = 0; i < 16; i++)
-		current += acpi_create_madt_lapic_nmi(
-			(acpi_madt_lapic_nmi_t *)current, i, 0xD, 1);
-
-	return current;
-}
diff --git a/src/mainboard/facebook/watson/board.fmd b/src/mainboard/facebook/watson/board.fmd
deleted file mode 100644
index feeb799a8e..0000000000
--- a/src/mainboard/facebook/watson/board.fmd
+++ /dev/null
@@ -1,26 +0,0 @@
-FLASH@0xff000000 0x1000000 {
-	SI_DESC@0x0 0x1000
-	UNUSED_1@0x1000 0x1000
-	IDPROM@0x2000 0x400
-	UNUSED_2@0x2400 0x1ec00
-	SI_ME@0x21000 0x3de000
-	UNUSED_3@0x400000 0x200000
-	SI_BIOS@0x600000 0xA00000 {
-		FMAP@0x0 0x1000
-		RW_MISC@0x1000 0xe000 {
-			RW_ELOG@0x0 0x4000
-			RW_VPD@0x4000 0x2000
-			RW_MISC_UNUSED@0x6000 0x5000
-			RW_NVRAM@0xc000 0x2000
-		}
-		UNIFIED_MRC_CACHE@0x10000 0x20000 {
-			RECOVERY_MRC_CACHE@0x0 0x10000
-			RW_MRC_CACHE@0x10000 0x10000
-		}
-		# This only exists to satisfy tools that specifically
-		# look for RO_VPD.
-		RO_VPD@0x30000 0x1000
-		UNUSED_4@0x31000 0x1cf000
-		COREBOOT(CBFS)@0x200000 0x800000
-	}
-}
diff --git a/src/mainboard/facebook/watson/board_info.txt b/src/mainboard/facebook/watson/board_info.txt
deleted file mode 100644
index 3278401533..0000000000
--- a/src/mainboard/facebook/watson/board_info.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Board name: Watson
-Category: server
-ROM protocol: SPI
-ROM socketed: yes
diff --git a/src/mainboard/facebook/watson/cmos.layout b/src/mainboard/facebook/watson/cmos.layout
deleted file mode 100644
index 675370df70..0000000000
--- a/src/mainboard/facebook/watson/cmos.layout
+++ /dev/null
@@ -1,106 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-2008 coresystems GmbH
-##
-## 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.
-##
-
-# -----------------------------------------------------------------
-entries
-
-#start-bit length  config config-ID    name
-#0            8       r       0        seconds
-#8            8       r       0        alarm_seconds
-#16           8       r       0        minutes
-#24           8       r       0        alarm_minutes
-#32           8       r       0        hours
-#40           8       r       0        alarm_hours
-#48           8       r       0        day_of_week
-#56           8       r       0        day_of_month
-#64           8       r       0        month
-#72           8       r       0        year
-# -----------------------------------------------------------------
-# Status Register A
-#80           4       r       0        rate_select
-#84           3       r       0        REF_Clock
-#87           1       r       0        UIP
-# -----------------------------------------------------------------
-# Status Register B
-#88           1       r       0        auto_switch_DST
-#89           1       r       0        24_hour_mode
-#90           1       r       0        binary_values_enable
-#91           1       r       0        square-wave_out_enable
-#92           1       r       0        update_finished_enable
-#93           1       r       0        alarm_interrupt_enable
-#94           1       r       0        periodic_interrupt_enable
-#95           1       r       0        disable_clock_updates
-# -----------------------------------------------------------------
-# Status Register C
-#96           4       r       0        status_c_rsvd
-#100          1       r       0        uf_flag
-#101          1       r       0        af_flag
-#102          1       r       0        pf_flag
-#103          1       r       0        irqf_flag
-# -----------------------------------------------------------------
-# Status Register D
-#104          7       r       0        status_d_rsvd
-#111          1       r       0        valid_cmos_ram
-# -----------------------------------------------------------------
-# Diagnostic Status Register
-#112          8       r       0        diag_rsvd1
-
-# -----------------------------------------------------------------
-0          120       r       0        reserved_memory
-120        264       r       0        unused
-
-# -----------------------------------------------------------------
-# RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
-#390          2       r       0        unused?
-
-# -----------------------------------------------------------------
-# coreboot config options: console
-#392          3       r       0        unused
-395          4       e       6        debug_level
-#399          1       r       0        unused
-416          128      r      0        vbnv
-
-# coreboot config options: check sums
-984         16       h       0        check_sum
-
-# -----------------------------------------------------------------
-
-enumerations
-
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     1     Emergency
-6     2     Alert
-6     3     Critical
-6     4     Error
-6     5     Warning
-6     6     Notice
-6     7     Info
-6     8     Debug
-6     9     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-# -----------------------------------------------------------------
-checksums
-
-checksum 392 415 984
diff --git a/src/mainboard/facebook/watson/devicetree.cb b/src/mainboard/facebook/watson/devicetree.cb
deleted file mode 100644
index 92fe9c3000..0000000000
--- a/src/mainboard/facebook/watson/devicetree.cb
+++ /dev/null
@@ -1,19 +0,0 @@
-chip soc/intel/fsp_broadwell_de
-	device cpu_cluster 0 on
-		device lapic 0 on end
-	end
-	device domain 0 on
-		device pci 00.0 on end # SoC router
-		device pci 14.0 on end # xHCI Controller
-		device pci 19.0 on end # Gigabit LAN Controller
-		device pci 1d.0 on end # EHCI Controller
-		device pci 1f.0 on # LPC Bridge
-			chip drivers/pc80/tpm
-				device pnp 0c31.0 on end
-			end
-		end
-		device pci 1f.2 on end # SATA Controller
-		device pci 1f.3 on end # SMBus Controller
-		device pci 1f.5 on end # SATA Controller
-	end
-end
diff --git a/src/mainboard/facebook/watson/dsdt.asl b/src/mainboard/facebook/watson/dsdt.asl
deleted file mode 100644
index 0d9e90dab3..0000000000
--- a/src/mainboard/facebook/watson/dsdt.asl
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- * Copyright (C) 2011 Google Inc.
- * Copyright (C) 2015-2016 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; 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.
- */
-
-#include <arch/acpi.h>
-DefinitionBlock(
-	"dsdt.aml",
-	"DSDT",
-	0x02,		// DSDT revision: ACPI v2.0 and up
-	OEM_ID,
-	ACPI_TABLE_CREATOR,
-	0x20110725	// OEM revision
-)
-{
-	#include "acpi/platform.asl"
-
-	Name(_S0, Package() { 0x00, 0x00, 0x00, 0x00 })
-	Name(_S5, Package() { 0x07, 0x00, 0x00, 0x00 })
-
-	Scope (\_SB)
-	{
-		Device (PCI0)
-		{
-			#include <acpi/southcluster.asl>
-			#include <acpi/pcie1.asl>
-		}
-
-		#include <acpi/uncore.asl>
-	}
-
-	#include "acpi/mainboard.asl"
-}
diff --git a/src/mainboard/facebook/watson/fadt.c b/src/mainboard/facebook/watson/fadt.c
deleted file mode 100644
index 5af6056b49..0000000000
--- a/src/mainboard/facebook/watson/fadt.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * 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.
- */
-
-#include <soc/acpi.h>
-
-void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
-{
-	acpi_header_t *header = &(fadt->header);
-
-	acpi_fill_in_fadt(fadt, facs, dsdt);
-
-	/* Platform specific customizations go here */
-
-	header->checksum = acpi_checksum((void *) fadt, sizeof(acpi_fadt_t));
-}
diff --git a/src/mainboard/facebook/watson/irqroute.c b/src/mainboard/facebook/watson/irqroute.c
deleted file mode 100644
index f91cf0d5b3..0000000000
--- a/src/mainboard/facebook/watson/irqroute.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Google Inc.
- *
- * 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.
- */
-
-#include "irqroute.h"
-
-DEFINE_IRQ_ROUTES;
diff --git a/src/mainboard/facebook/watson/irqroute.h b/src/mainboard/facebook/watson/irqroute.h
deleted file mode 100644
index c3911be75b..0000000000
--- a/src/mainboard/facebook/watson/irqroute.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Google Inc.
- * Copyright (C) 2015-2016 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; 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 IRQROUTE_H
-#define IRQROUTE_H
-
-#include <soc/irq.h>
-#include <soc/pci_devs.h>
-
-#define PCI_DEV_PIRQ_ROUTES \
-	PCI_DEV_PIRQ_ROUTE(XHCI_DEV,  A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(ME_DEV,    A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(GBE_DEV,   A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(EHCI2_DEV, A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(HDA_DEV,   A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(PCIE_DEV,  A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(EHCI1_DEV, A, B, C, D), \
-	PCI_DEV_PIRQ_ROUTE(SATA_DEV,  A, B, C, D)
-
-/*
- * Route each PIRQ[A-H] to a PIC IRQ[0-15]
- * Reserved: 0, 1, 2, 8, 13
- * ACPI/SCI: 9
- */
-#define PIRQ_PIC_ROUTES \
-	PIRQ_PIC(A,  5), \
-	PIRQ_PIC(B,  6), \
-	PIRQ_PIC(C,  7), \
-	PIRQ_PIC(D, 10), \
-	PIRQ_PIC(E, 11), \
-	PIRQ_PIC(F, 12), \
-	PIRQ_PIC(G, 14), \
-	PIRQ_PIC(H, 15)
-
-#endif /* IRQROUTE_H */
diff --git a/src/mainboard/facebook/watson/mainboard.c b/src/mainboard/facebook/watson/mainboard.c
deleted file mode 100644
index 403090a06f..0000000000
--- a/src/mainboard/facebook/watson/mainboard.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- * Copyright (C) 2011 Google Inc.
- * Copyright (C) Facebook, Inc. and its affiliates
- *
- * 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.
- */
-
-#include <cpu/intel/turbo.h>
-#include <device/device.h>
-
-/*
- * mainboard_enable is executed as first thing after enumerate_buses().
- * This is the earliest point to add customization.
- */
-static void mainboard_enable(struct device *dev)
-{
-
-}
-
-static void mainboard_init(void *chip_info)
-{
-#if !CONFIG(ENABLE_TURBO)
-	disable_turbo();
-#endif
-}
-
-struct chip_operations mainboard_ops = {
-	.enable_dev = mainboard_enable,
-	.init = mainboard_init,
-};
diff --git a/src/mainboard/facebook/watson/romstage.c b/src/mainboard/facebook/watson/romstage.c
deleted file mode 100644
index cf52c01f04..0000000000
--- a/src/mainboard/facebook/watson/romstage.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 Google Inc.
- * Copyright (C) 2015 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; 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.
- */
-
-#include <stddef.h>
-#include <soc/romstage.h>
-#include <drivers/intel/fsp1_0/fsp_util.h>
-
-/**
- * /brief mainboard call for setup that needs to be done before fsp init
- *
- */
-void early_mainboard_romstage_entry(void)
-{
-
-}
-
-/**
- * /brief mainboard call for setup that needs to be done after fsp init
- *
- */
-void late_mainboard_romstage_entry(void)
-{
-
-}
-
-/**
- * /brief customize fsp parameters here if needed
- */
-void romstage_fsp_rt_buffer_callback(FSP_INIT_RT_BUFFER *FspRtBuffer)
-{
-
-}
diff --git a/src/mainboard/facebook/watson/vboot-ro.fmd b/src/mainboard/facebook/watson/vboot-ro.fmd
deleted file mode 100644
index cc6a7c57a8..0000000000
--- a/src/mainboard/facebook/watson/vboot-ro.fmd
+++ /dev/null
@@ -1,26 +0,0 @@
-FLASH 16M {
-	SI_ALL@0x0 0x600000 {
-		SI_DESC@0x0 0x1000
-		UNUSED_1@0x1000 0x1000
-		IDPROM@0x2000 0x400
-		UNUSED_2@0x2400 0x1ec00
-		SI_ME@0x21000 0x3de000
-		UNUSED_3@0x400000 0x200000
-        }
-	SI_BIOS@0x600000 0xA00000 {
-		MISC_RW@0x0 0x20000 {
-			RW_MRC_CACHE@0x0 0x10000
-			RW_VPD(PRESERVE)@0x010000 0x4000
-		}
-		WP_RO@0x20000 0x9e0000 {
-			RO_VPD(PRESERVE)@0x0 0x4000
-			RO_SECTION@0x4000 0x9dc000 {
-				FMAP@0x0 0x800
-				RO_FRID@0x800 0x40
-				RO_FRID_PAD@0x840 0x7c0
-				GBB@0x1000 0x4000
-				COREBOOT(CBFS)@0x5000 0x9d7000
-			}
-		}
-	}
-}