intel/bakersport_fsp: Move into bayleybay_fsp as a variant

The separate directory was the old way of handling variant boards.
Update bakersport_fsp to the new method.  All of the other pieces
were already moved into bayleybay_fsp.

Change-Id: I5712c1b399570bd7ab7fc9e42af25fbf15a0ba78
Signed-off-by: Martin Roth <gaumless@gmail.com>
Reviewed-on: https://review.coreboot.org/19077
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Martin Roth 2017-04-02 21:13:29 -06:00 committed by Martin Roth
parent cfbb815efd
commit 41807626e2
5 changed files with 7 additions and 79 deletions

View File

@ -1,70 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2013-2014 Sage Electronic Engineering, LLC.
##
## 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.
##
if BOARD_INTEL_BAKERSPORT_FSP
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select SOC_INTEL_FSP_BAYTRAIL
select BOARD_ROMSIZE_KB_2048
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
select ENABLE_BUILTIN_COM1 if FSP_PACKAGE_DEFAULT
select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT
select TSC_MONOTONIC_TIMER
config MAINBOARD_DIR
string
default "intel/bayleybay_fsp"
config MAINBOARD_PART_NUMBER
string
default "Bakersport CRB (FSP)"
config MAX_CPUS
int
default 16
config CACHE_ROM_SIZE_OVERRIDE
hex
default 0x800000
config FSP_FILE
string
default "../intel/fsp/baytrail/BAYTRAIL_FSP_ECC.fd" if BOARD_INTEL_BAKERSPORT_FSP
config CBFS_SIZE
hex
default 0x00200000
config ENABLE_FSP_FAST_BOOT
bool
depends on HAVE_FSP_BIN
default y
config VIRTUAL_ROM_SIZE
hex
depends on ENABLE_FSP_FAST_BOOT
default 0x800000
config FSP_PACKAGE_DEFAULT
bool "Configure defaults for the Intel FSP package"
default n
config VGA_BIOS
bool
default y if FSP_PACKAGE_DEFAULT
endif # BOARD_INTEL_BAKERSPORT_FSP

View File

@ -1,2 +0,0 @@
config BOARD_INTEL_BAKERSPORT_FSP
bool "Bakersport FSP-based CRB"

View File

@ -1,5 +0,0 @@
Board name: Bakersport
Category: eval
ROM protocol: SPI
ROM socketed: n
Release year: 2014

View File

@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
if BOARD_INTEL_BAYLEYBAY_FSP
if BOARD_INTEL_BAYLEYBAY_FSP || BOARD_INTEL_BAKERSPORT_FSP
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
@ -31,6 +31,7 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
default "Bakersport CRB (FSP)" if BOARD_INTEL_BAKERSPORT_FSP
default "Bayley Bay CRB (FSP)"
config MAX_CPUS
@ -43,6 +44,7 @@ config CACHE_ROM_SIZE_OVERRIDE
config FSP_FILE
string
default "../intel/fsp/baytrail/BAYTRAIL_FSP_ECC.fd" if BOARD_INTEL_BAKERSPORT_FSP
default "../intel/fsp/baytrail/BAYTRAIL_FSP.fd"
config CBFS_SIZE
@ -67,4 +69,4 @@ config VGA_BIOS
bool
default y if FSP_PACKAGE_DEFAULT
endif # BOARD_INTEL_BAYLEYBAY_FSP
endif # BOARD_INTEL_BAYLEYBAY_FSP || BOARD_INTEL_BAKERSPORT_FSP

View File

@ -1,2 +1,5 @@
config BOARD_INTEL_BAKERSPORT_FSP
bool "Bakersport FSP-based CRB"
config BOARD_INTEL_BAYLEYBAY_FSP
bool "Bayley Bay FSP-based CRB"