summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/lippert/toucan-af/Kconfig4
-rw-r--r--src/mainboard/lippert/toucan-af/Kconfig.name4
-rw-r--r--src/mainboard/lippert/toucan-af/Makefile.inc2
-rw-r--r--src/mainboard/lippert/toucan-af/bootblock.c (renamed from src/mainboard/lippert/toucan-af/romstage.c)6
-rw-r--r--src/mainboard/lippert/toucan-af/dsdt.asl1
5 files changed, 6 insertions, 11 deletions
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index b62da2e333..74b335a9fa 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -13,14 +13,10 @@
# GNU General Public License for more details.
#
-config BOARD_LIPPERT_TOUCAN_AF
- def_bool n
-
if BOARD_LIPPERT_TOUCAN_AF
config BOARD_SPECIFIC_OPTIONS
def_bool y
- #select ROMCC_BOOTBLOCK
select CPU_AMD_AGESA_FAMILY14
select NORTHBRIDGE_AMD_AGESA_FAMILY14
select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/lippert/toucan-af/Kconfig.name b/src/mainboard/lippert/toucan-af/Kconfig.name
index 6eceb51f0c..3481f92fba 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig.name
+++ b/src/mainboard/lippert/toucan-af/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_LIPPERT_TOUCAN_AF
-# bool"Toucan-AF aka cExpress-GFR (+W83627DHG SIO)"
+config BOARD_LIPPERT_TOUCAN_AF
+ bool "Toucan-AF aka cExpress-GFR (+W83627DHG SIO)"
diff --git a/src/mainboard/lippert/toucan-af/Makefile.inc b/src/mainboard/lippert/toucan-af/Makefile.inc
index 1080c64ded..7e4f2804bb 100644
--- a/src/mainboard/lippert/toucan-af/Makefile.inc
+++ b/src/mainboard/lippert/toucan-af/Makefile.inc
@@ -20,6 +20,8 @@ pci$(stripped_ahcibios_id).rom-file := $(call strip_quotes,$(CONFIG_AHCI_BIOS_FI
pci$(stripped_ahcibios_id).rom-type := optionrom
endif
+bootblock-y += bootblock.c
+
romstage-y += buildOpts.c
romstage-y += BiosCallOuts.c
romstage-y += OemCustomize.c
diff --git a/src/mainboard/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/bootblock.c
index ebbe4fc0df..39b108e6dc 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/bootblock.c
@@ -13,15 +13,13 @@
* GNU General Public License for more details.
*/
-#include <northbridge/amd/agesa/state_machine.h>
+#include <bootblock_common.h>
#include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83627dhg/w83627dhg.h>
-#include <sb_cimx.h>
#define SERIAL_DEV PNP_DEV(0x4e, W83627DHG_SP1)
-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
{
- sb_Poweron_Init();
winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
}
diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl
index 347f1a1a02..4e36c2b152 100644
--- a/src/mainboard/lippert/toucan-af/dsdt.asl
+++ b/src/mainboard/lippert/toucan-af/dsdt.asl
@@ -1123,7 +1123,6 @@ DefinitionBlock (
External (TOM2)
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
- Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */
/* Operating System Capabilities Method */
Method (_OSC, 4)