FrontRunner/Toucan-AF: drop unnecessary compile time CPU model selection
The first reason for selecting the CPU model at compile time was a
multi-second pause if booting a single core Fusion T40R with MAX_CPUS=2.
Recent tests show the pause has disappeared, someone must have fixed it.
The second reason was me not knowing how to make a single vgabios image
work with two different PCI IDs. Many thanks to Martin Roth for educating
me! Quote:
"The way to make coreboot use the same vbios for different video device IDs
is through the map_oprom_vendev function. In family 14 it's in
northbridge/amd/agesa/family14/amdfam14_conf.c You would name your video
bios 1002,9802 in the config and all the other device/vendor IDs for the
family 14h processors will fall through the initial check for the video
bios and will get remapped to use that vbios. This only works if you're
initializing the vbios inside coreboot. I don't know if you're using
SeaBios as a payload, but if you are you can add the vbios to cbfs as
vgaroms/vbios.rom and the rom will always be initialized."
I'd like to add the vgabios is added as type 'optionrom' when Coreboot make
adds it, however to work with SeaBios it has to be added manually with
cbfstool and with type 'raw', or it will hang.
Change-Id: I8190d0c3202a60dfccb77dde232f9ba7ce5ce318
Signed-off-by: Jens Rottmann <JRottmann@LiPPERTembedded.de>
Reviewed-on: http://review.coreboot.org/2584
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/src/mainboard/lippert/Kconfig b/src/mainboard/lippert/Kconfig
index cf5288e..1765460 100644
--- a/src/mainboard/lippert/Kconfig
+++ b/src/mainboard/lippert/Kconfig
@@ -20,37 +20,6 @@
endchoice
-if BOARD_LIPPERT_FRONTRUNNER_AF || BOARD_LIPPERT_TOUCAN_AF
-# No code, but two Kconfig options need to know this ...
-choice
- prompt "AMD Fusion CPU model"
- default FUSION_G_T56N
- help
- The actual CPU model the board is fitted with:
-
- G-T40R: 1 GHz, single core
- G-T56N: 1.65 GHz, dual core
-
- If unsure check with "grep model /proc/cpuinfo".
-config FUSION_G_T40R
- bool "G-T40R"
- help
- The actual CPU model the board is fitted with:
-
- G-T40R: 1 GHz, single core
-
- If unsure check with "grep model /proc/cpuinfo".
-config FUSION_G_T56N
- bool "G-T56N"
- help
- The actual CPU model the board is fitted with:
-
- G-T56N: 1.65 GHz, dual core
-
- If unsure check with "grep model /proc/cpuinfo".
-endchoice
-endif # BOARD_LIPPERT_FRONTRUNNER_AF || BOARD_LIPPERT_TOUCAN_AF
-
source "src/mainboard/lippert/frontrunner/Kconfig"
source "src/mainboard/lippert/frontrunner-af/Kconfig"
source "src/mainboard/lippert/hurricane-lx/Kconfig"
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 0cdf365..f56c048 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -62,8 +62,7 @@
config MAX_CPUS
int
- default 1 if FUSION_G_T40R
- default 2 if FUSION_G_T56N
+ default 2
config MAX_PHYSICAL_CPUS
int
@@ -116,8 +115,7 @@
config VGA_BIOS_ID
string
- default "1002,9804" if FUSION_G_T40R
- default "1002,9806" if FUSION_G_T56N
+ default "1002,9802"
config SB800_AHCI_ROM
bool
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 72e6a3b..6696ca6 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -64,8 +64,7 @@
config MAX_CPUS
int
- default 1 if FUSION_G_T40R
- default 2 if FUSION_G_T56N
+ default 2
config MAX_PHYSICAL_CPUS
int
@@ -118,8 +117,7 @@
config VGA_BIOS_ID
string
- default "1002,9804" if FUSION_G_T40R
- default "1002,9806" if FUSION_G_T56N
+ default "1002,9802"
config SB800_AHCI_ROM
bool