Change in coreboot[master]: mb/amd/bettong: Switch away from ROMCC_BOOTBLOCK

[Mike Banon (Code Review)]

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

Change subject: mb/amd/bettong: Switch away from ROMCC_BOOTBLOCK
......................................................................

mb/amd/bettong: Switch away from ROMCC_BOOTBLOCK

Warning: not tested on hardware.

Signed-off-by: Mike Banon 
Change-Id: If06ba85f5f917f5e39492df204464dfbf35a747b
---
M src/mainboard/amd/bettong/Kconfig
M src/mainboard/amd/bettong/Kconfig.name
M src/mainboard/amd/bettong/Makefile.inc
A src/mainboard/amd/bettong/bootblock.c
D src/mainboard/amd/bettong/romstage.c
5 files changed, 31 insertions(+), 57 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/37982/1

diff --git a/src/mainboard/amd/bettong/Kconfig b/src/mainboard/amd/bettong/Kconfig
index 4617360..250e955 100644
--- a/src/mainboard/amd/bettong/Kconfig
+++ b/src/mainboard/amd/bettong/Kconfig
@@ -13,15 +13,11 @@
 # GNU General Public License for more details.
 #

-config BOARD_AMD_BETTONG
-	def_bool n
-
 if BOARD_AMD_BETTONG

config BOARD_SPECIFIC_OPTIONS
    def_bool y
    #select BINARYPI_LEGACY_WRAPPER
-	#select ROMCC_BOOTBLOCK
    select CPU_AMD_PI_00660F01
    select NORTHBRIDGE_AMD_PI_00660F01
    select SOUTHBRIDGE_AMD_PI_KERN
diff --git a/src/mainboard/amd/bettong/Kconfig.name b/src/mainboard/amd/bettong/Kconfig.name
index 4bd1329..09201b5 100644
--- a/src/mainboard/amd/bettong/Kconfig.name
+++ b/src/mainboard/amd/bettong/Kconfig.name
@@ -1,3 +1,2 @@
-# Disabled
-#config BOARD_AMD_BETTONG
-#	bool "Bettong"
+config BOARD_AMD_BETTONG
+	bool "Bettong"
diff --git a/src/mainboard/amd/bettong/Makefile.inc b/src/mainboard/amd/bettong/Makefile.inc
index cfcc9c0..2668c97 100644
--- a/src/mainboard/amd/bettong/Makefile.inc
+++ b/src/mainboard/amd/bettong/Makefile.inc
@@ -13,6 +13,8 @@
 # GNU General Public License for more details.
 #

+bootblock-y += bootblock.c
+
 romstage-y += BiosCallOuts.c
 romstage-y += OemCustomize.c
 romstage-y += boardid.c
diff --git a/src/mainboard/amd/bettong/bootblock.c b/src/mainboard/amd/bettong/bootblock.c
new file mode 100644
index 0000000..378231d
--- /dev/null
+++ b/src/mainboard/amd/bettong/bootblock.c
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#include <arch/acpi.h>
+#include <amdblocks/acpimmio.h>
+#include <bootblock_common.h>
+
+/* Mask BIST bit 31. One result of Silicon Observation
+ * report_bist_failure(bist & 0x7FFFFFFF);
+ */
+
+void bootblock_mainboard_early_init(void)
+{
+	if (acpi_is_wakeup_s4()) {
+		pm_write8(0xee, 0x8);
+	}
+}
diff --git a/src/mainboard/amd/bettong/romstage.c b/src/mainboard/amd/bettong/romstage.c
deleted file mode 100644
index 0f41f71..0000000
--- a/src/mainboard/amd/bettong/romstage.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 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.
- *
- * 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.
- */
-
-#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/io.h>
-#include <arch/cpu.h>
-#include <cpu/x86/lapic.h>
-#include <northbridge/amd/agesa/state_machine.h>
-#include <southbridge/amd/pi/hudson/hudson.h>
-
-/* Mask BIST bit 31. One result of Silicon Observation
- * report_bist_failure(bist & 0x7FFFFFFF);
- */
-
-static void romstage_main_template(void)
-{
-	u32 val;
-
-	if (!cpu_init_detectedx && boot_cpu()) {
-		post_code(0x30);
-
-#if CONFIG(HUDSON_UART)
-		configure_hudson_uart();
-#endif
-		post_code(0x31);
-		console_init();
-	}
-}
-
-void agesa_postcar(struct sysinfo *cb)
-{
-	/* After AMD_INIT_ENV -> move to ramstage ? */
-	if (acpi_is_wakeup_s4()) {
-		outb(0xEE, PM_INDEX);
-		outb(0x8, PM_DATA);
-	}
-}

[Mike Banon (Code Review)]

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

Change subject: mb/amd/bettong: Switch away from ROMCC_BOOTBLOCK
......................................................................

Abandoned

These remaining-with-ROMCC rare boards seem to be broken: even if switched away from ROMCC_BOOTBLOCK, their builds are failing because of the other reasons (unrelated to new bootblock.c file). I am abandoning their "switch away from ROMCC_BOOTBLOCK" changes (CB:37975 - CB:37982), but if anyone cares about these boards - they can restore these changes and advance. Read more at CB:37750.

[Mike Banon (Code Review)]

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

Change subject: mb/amd/bettong: Switch away from ROMCC_BOOTBLOCK
......................................................................

Restored

[Mike Banon (Code Review)]

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

Change subject: mb/amd/bettong: Switch away from ROMCC_BOOTBLOCK
......................................................................

Abandoned

Seems to be really broken as well...