asus/p2b-f: Transform into variant

TEST=build with BUILD_TIMELESS=1, binary does not change

Change-Id: I56983cabfad574b970aba098a178e691c6b354d1
Signed-off-by: Keith Hui <buurin@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39902
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Keith Hui 2020-02-02 19:23:47 -05:00 committed by Patrick Georgi
parent bf7d6f1a82
commit 7e269ad06c
8 changed files with 12 additions and 58 deletions

View File

@ -1,37 +0,0 @@
##
## This file is part of the coreboot project.
##
##
## 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_ASUS_P2B_F
config BOARD_SPECIFIC_OPTIONS
def_bool y
select CPU_INTEL_SLOT_1
select NORTHBRIDGE_INTEL_I440BX
select SOUTHBRIDGE_INTEL_I82371EB
select SUPERIO_WINBOND_W83977TF
select HAVE_PIRQ_TABLE
select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR
string
default "asus/p2b-f"
config MAINBOARD_PART_NUMBER
string
default "P2B-F"
config IRQ_SLOT_COUNT
int
default 7
endif # BOARD_ASUS_P2B_F

View File

@ -1,2 +0,0 @@
config BOARD_ASUS_P2B_F
bool "P2B-F"

View File

@ -1,17 +0,0 @@
/*
* This file is part of the coreboot project.
*
*
* 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.
*/
/* Shares romstage with the better supported P2B-LS sibling. */
#include "../p2b-ls/romstage.c"

View File

@ -11,7 +11,7 @@
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
if BOARD_ASUS_P2B
if BOARD_ASUS_P2B || BOARD_ASUS_P2B_F
config BOARD_SPECIFIC_OPTIONS
def_bool y
@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
select SUPERIO_WINBOND_W83977TF
select HAVE_PIRQ_TABLE
select BOARD_ROMSIZE_KB_256
select HAVE_ACPI_TABLES
select HAVE_ACPI_TABLES if BOARD_ASUS_P2B
config MAINBOARD_DIR
string
@ -30,13 +30,20 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
default "P2B" if BOARD_ASUS_P2B
default "P2B-F" if BOARD_ASUS_P2B_F
config VARIANT_DIR
string
default "p2b" if BOARD_ASUS_P2B
default "p2b-f" if BOARD_ASUS_P2B_F
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" if ! BOARD_ASUS_P2B
config IRQ_SLOT_COUNT
int
default 7 if BOARD_ASUS_P2B_F
default 6
endif

View File

@ -1,2 +1,5 @@
config BOARD_ASUS_P2B
bool "P2B"
config BOARD_ASUS_P2B_F
bool "P2B-F"