Change in coreboot[master]: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK

[Mike Banon (Code Review)]

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37974 )

Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK
......................................................................

mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK

Warning: Not tested on hardware.

Signed-off-by: Mike Banon 
Change-Id: Ia849f30328f1a8a8a708d25e538f768eb8b8a34a
---
M src/mainboard/lippert/toucan-af/Kconfig
M src/mainboard/lippert/toucan-af/Kconfig.name
M src/mainboard/lippert/toucan-af/Makefile.inc
R src/mainboard/lippert/toucan-af/bootblock.c
4 files changed, 6 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/37974/1

diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index b62da2e..739c796 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -20,7 +20,6 @@

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 6eceb51..3481f92 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 1080c64..7e4f280 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-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
similarity index 78%
rename from src/mainboard/lippert/toucan-af/romstage.c
rename to src/mainboard/lippert/toucan-af/bootblock.c
index ebbe4fc..b939591 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/bootblock.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2011 Advanced Micro Devices, 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.
@@ -13,15 +11,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);
 }

[Mike Banon (Code Review)]

Mike Banon has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37974 )

Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK
......................................................................

Patch Set 1:

This has been already done by you at CB:37746 , accidentally I've done the same. But I don't understand why " #!!!!! Error: BOARD_LIPPERT_TOUCAN_AF entry at src/mainboard/lippert/toucan-af/Kconfig:16 has already been created outside a choice block at src/mainboard/lippert/toucan-af/Kconfig.name:1.
# 1 errors " at Jenkins

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37974 )

Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK
......................................................................

Patch Set 1:
> Patch Set 1:
>
> This has been already done by you at CB:37746 , accidentally I've done the same. But I don't understand why " #!!!!! Error: BOARD_LIPPERT_TOUCAN_AF entry at src/mainboard/lippert/toucan-af/Kconfig:16 has already been created outside a choice block at src/mainboard/lippert/toucan-af/Kconfig.name:1.
> # 1 errors " at Jenkins

Remove "config BOARD_LIPPERT_TOUCAN_AF
    def_bool n" 
from Kconfig file

[Mike Banon (Code Review)]

Mike Banon has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37974 )

Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK
......................................................................

Abandoned

Already done at CB:37746