[coreboot-gerrit] Change in coreboot[master]: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37872 )

Change subject: biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK
......................................................................

biostar/a68n_5200: Switch away from ROMCC_BOOTBLOCK

Following the example of change CB:37737 (ee8f969).
Switching was done by moving a SIO configuration and
the clocks setup from 'romstage.c' to 'bootblock.c'.

Tested-by: Damien Zammit 
Signed-off-by: Mike Banon 
Signed-off-by: Damien Zammit 
Change-Id: I2e710ac61843c09a055523c7971e4c05bae56a37
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37872
Tested-by: build bot (Jenkins) 
Reviewed-by: HAOUAS Elyes 
Reviewed-by: Kyösti Mälkki 
---
M src/mainboard/biostar/a68n_5200/Kconfig
M src/mainboard/biostar/a68n_5200/Kconfig.name
M src/mainboard/biostar/a68n_5200/Makefile.inc
R src/mainboard/biostar/a68n_5200/bootblock.c
M src/mainboard/biostar/a68n_5200/irq_tables.c
5 files changed, 14 insertions(+), 15 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  HAOUAS Elyes: Looks good to me, approved

diff --git a/src/mainboard/biostar/a68n_5200/Kconfig b/src/mainboard/biostar/a68n_5200/Kconfig
index f608513..e4271d3 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig
+++ b/src/mainboard/biostar/a68n_5200/Kconfig
@@ -15,14 +15,10 @@
 # GNU General Public License for more details.
 #

-config BOARD_BIOSTAR_A68N5200
-	def_bool n
-
 if BOARD_BIOSTAR_A68N5200

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	#select ROMCC_BOOTBLOCK
    select CPU_AMD_AGESA_FAMILY16_KB
    select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
    select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig.name b/src/mainboard/biostar/a68n_5200/Kconfig.name
index 6d765d2..52a7f15 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig.name
+++ b/src/mainboard/biostar/a68n_5200/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_BIOSTAR_A68N5200
-#	bool"A68N-5200"
+config BOARD_BIOSTAR_A68N5200
+	bool "A68N-5200"
diff --git a/src/mainboard/biostar/a68n_5200/Makefile.inc b/src/mainboard/biostar/a68n_5200/Makefile.inc
index f8895fa..4dde2cf 100644
--- a/src/mainboard/biostar/a68n_5200/Makefile.inc
+++ b/src/mainboard/biostar/a68n_5200/Makefile.inc
@@ -13,6 +13,8 @@
 # GNU General Public License for more details.
 #

+bootblock-y += bootblock.c
+
 romstage-y += buildOpts.c
 romstage-y += BiosCallOuts.c
 romstage-y += OemCustomize.c
diff --git a/src/mainboard/biostar/a68n_5200/romstage.c b/src/mainboard/biostar/a68n_5200/bootblock.c
similarity index 86%
rename from src/mainboard/biostar/a68n_5200/romstage.c
rename to src/mainboard/biostar/a68n_5200/bootblock.c
index 5e0cd7c..395419b 100644
--- a/src/mainboard/biostar/a68n_5200/romstage.c
+++ b/src/mainboard/biostar/a68n_5200/bootblock.c
@@ -15,14 +15,10 @@
  * GNU General Public License for more details.
  */

+#include <amdblocks/acpimmio.h>
+#include <bootblock_common.h>
 #include <stdint.h>
-#include <amdblocks/acpimmio.h>
-#include <device/pci_def.h>
-#include <arch/io.h>
 #include <device/pci_ops.h>
-#include <northbridge/amd/agesa/state_machine.h>
-#include <southbridge/amd/agesa/hudson/hudson.h>
-#include <amdblocks/acpimmio.h>
 #include <superio/ite/common/ite.h>
 #include <superio/ite/it8728f/it8728f.h>

@@ -32,18 +28,20 @@

static void sbxxx_enable_48mhzout(void)
 {
-	/* most likely programming to 48MHz out signal */
    u32 reg32;
+
+	/* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */
    reg32 = misc_read32(0x28);
    reg32 &= 0xfff8ffff;
    misc_write32(0x28, reg32);

+	/* Enable Auxiliary Clock1, disable FCH 14 MHz OscClk */
    reg32 = misc_read32(0x40);
    reg32 &= 0xffffbffb;
    misc_write32(0x40, reg32);
 }

-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
    u8 byte;

@@ -64,8 +62,10 @@
    byte |= (1 << 6);  /* 0x3f8 */
    pci_write_config8(dev, 0x44, byte);

-	/* run ite */
+	/* enable SIO clock */
    sbxxx_enable_48mhzout();
+
+	/* Enable serial output on it8728f */
    ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_48);
    ite_kill_watchdog(GPIO_DEV);
    ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/biostar/a68n_5200/irq_tables.c b/src/mainboard/biostar/a68n_5200/irq_tables.c
index 530c132..ab26cba 100644
--- a/src/mainboard/biostar/a68n_5200/irq_tables.c
+++ b/src/mainboard/biostar/a68n_5200/irq_tables.c
@@ -16,6 +16,7 @@
 #include <console/console.h>
 #include <string.h>
 #include <stdint.h>
+#include <device/pci_def.h>
 #include <arch/pirq_routing.h>

static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,