mb/msi/ms7721: Switch away from ROMCC_BOOTBLOCK

Renze Nicolai tested it on hardware: boots into Linux without problems.

Change-Id: I17e09c366ae0c9c99d5c65dd1f00672697a7c709
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37737
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

5 files changed, 103 insertions, 113 deletions

diff --git a/src/mainboard/msi/ms7721/Kconfig b/src/mainboard/msi/ms7721/Kconfig
index 5f68e750d5..1fee74790e 100644
--- a/src/mainboard/msi/ms7721/Kconfig
+++ b/src/mainboard/msi/ms7721/Kconfig
@@ -16,14 +16,10 @@
 # GNU General Public License for more details.
 #
 
-config BOARD_MSI_MS7721
-	def_bool n
-
 if BOARD_MSI_MS7721
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/msi/ms7721/Kconfig.name b/src/mainboard/msi/ms7721/Kconfig.name
index 9ed5473acf..bce5b99d43 100644
--- a/src/mainboard/msi/ms7721/Kconfig.name
+++ b/src/mainboard/msi/ms7721/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_MSI_MS7721
-#	bool"MS-7721 (FM2-A75MA-E35)"
+config BOARD_MSI_MS7721
+	bool "MS-7721 (FM2-A75MA-E35)"
diff --git a/src/mainboard/msi/ms7721/Makefile.inc b/src/mainboard/msi/ms7721/Makefile.inc
index f8895faa92..4dde2cfd1e 100644
--- a/src/mainboard/msi/ms7721/Makefile.inc
+++ b/src/mainboard/msi/ms7721/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/msi/ms7721/bootblock.c b/src/mainboard/msi/ms7721/bootblock.c
new file mode 100644
index 0000000000..9ee7a37d00
--- /dev/null
+++ b/src/mainboard/msi/ms7721/bootblock.c
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2012 Advanced Micro Devices, Inc.
+ * Copyright (C) 2012 Rudolf Marek <r.marek@assembler.cz>
+ * Copyright (C) 2016 Renze Nicolai <renze@rnplus.nl>
+ *
+ * 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 <bootblock_common.h>
+#include <device/pnp_ops.h>
+#include <device/pnp_type.h>
+#include <stdint.h>
+#include <southbridge/amd/common/amd_defs.h>
+#include <superio/fintek/common/fintek.h>
+#include <superio/fintek/f71869ad/f71869ad.h>
+
+#define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x))
+
+/* Ensure Super I/O config address (i.e., 0x2e or 0x4e) matches that of devicetree.cb */
+#define SUPERIO_ADDRESS 0x4e
+
+#define SERIAL_DEV PNP_DEV(SUPERIO_ADDRESS, F71869AD_SP1)
+#define GPIO_DEV PNP_DEV(SUPERIO_ADDRESS, F71869AD_GPIO)
+
+/* GPIO configuration */
+static void gpio_init(pnp_devfn_t dev)
+{
+	pnp_enter_conf_state(dev);
+	pnp_set_logical_device(dev);
+	pnp_set_enable(dev, 0);
+	pnp_write_config(dev, 0x60, 0x0a); //Base addr high
+	pnp_write_config(dev, 0x61, 0x00); //Base addr low
+	pnp_write_config(dev, 0xe0, 0x04); //GPIO1 output enable
+	pnp_write_config(dev, 0xe1, 0xff); //GPIO1 output data
+	pnp_write_config(dev, 0xe3, 0x04); //GPIO1 drive enable
+	pnp_write_config(dev, 0xe4, 0x00); //GPIO1 PME enable
+	pnp_write_config(dev, 0xe5, 0x00); //GPIO1 input detect select
+	pnp_write_config(dev, 0xe6, 0x40); //GPIO1 event status
+	pnp_write_config(dev, 0xd0, 0x00); //GPIO2 output enable
+	pnp_write_config(dev, 0xd1, 0xff); //GPIO2 output data
+	pnp_write_config(dev, 0xd3, 0x00); //GPIO2 drive enable
+	pnp_write_config(dev, 0xc0, 0x00); //GPIO3 output enable
+	pnp_write_config(dev, 0xc1, 0xff); //GPIO3 output data
+	pnp_write_config(dev, 0xb0, 0x04); //GPIO4 output enable
+	pnp_write_config(dev, 0xb1, 0x04); //GPIO4 output data
+	pnp_write_config(dev, 0xb3, 0x04); //GPIO4 drive enable
+	pnp_write_config(dev, 0xb4, 0x00); //GPIO4 PME enable
+	pnp_write_config(dev, 0xb5, 0x00); //GPIO4 input detect select
+	pnp_write_config(dev, 0xb6, 0x00); //GPIO4 event status
+	pnp_write_config(dev, 0xa0, 0x00); //GPIO5 output enable
+	pnp_write_config(dev, 0xa1, 0x1f); //GPIO5 output data
+	pnp_write_config(dev, 0xa3, 0x00); //GPIO5 drive enable
+	pnp_write_config(dev, 0xa4, 0x00); //GPIO5 PME enable
+	pnp_write_config(dev, 0xa5, 0xff); //GPIO5 input detect select
+	pnp_write_config(dev, 0xa6, 0xe0); //GPIO5 event status
+	pnp_write_config(dev, 0x90, 0x00); //GPIO6 output enable
+	pnp_write_config(dev, 0x91, 0xff); //GPIO6 output data
+	pnp_write_config(dev, 0x93, 0x00); //GPIO6 drive enable
+	pnp_write_config(dev, 0x80, 0x00); //GPIO7 output enable
+	pnp_write_config(dev, 0x81, 0xff); //GPIO7 output data
+	pnp_write_config(dev, 0x83, 0x00); //GPIO7 drive enable
+	pnp_set_enable(dev, 1);
+	pnp_exit_conf_state(dev);
+}
+
+static void sbxxx_enable_48mhzout(void)
+{
+	/* most likely programming to 48MHz out signal */
+	u32 reg32;
+	reg32 = SB_MMIO_MISC32(0x28);
+	reg32 &= 0xffc7ffff;
+	reg32 |= 0x00100000;
+	SB_MMIO_MISC32(0x28) = reg32;
+
+	reg32 = SB_MMIO_MISC32(0x40);
+	reg32 &= ~0x80u;
+	SB_MMIO_MISC32(0x40) = reg32;
+}
+
+void bootblock_mainboard_early_init(void)
+{
+	/* enable SIO clock */
+	sbxxx_enable_48mhzout();
+
+	/* Initialize GPIO registers */
+	gpio_init(GPIO_DEV);
+
+	/* Enable serial console */
+	fintek_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
+}
diff --git a/src/mainboard/msi/ms7721/romstage.c b/src/mainboard/msi/ms7721/romstage.c
index bec2f40bbb..cb87615424 100644
--- a/src/mainboard/msi/ms7721/romstage.c
+++ b/src/mainboard/msi/ms7721/romstage.c
@@ -15,116 +15,9 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
-#include <device/pnp_ops.h>
-#include <device/pci_ops.h>
-#include <device/pnp.h>
-#include <stdint.h>
-
 #include <northbridge/amd/agesa/state_machine.h>
-#include <southbridge/amd/common/amd_defs.h>
-#include <southbridge/amd/agesa/hudson/hudson.h>
-
-#include <superio/fintek/common/fintek.h>
-#include <superio/fintek/f71869ad/f71869ad.h>
-
-
-#define MMIO_NON_POSTED_START 0xfed00000
-#define MMIO_NON_POSTED_END   0xfedfffff
-#define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x))
-
-/* Ensure Super I/O config address (i.e., 0x2e or 0x4e) matches that of devicetree.cb */
-#define SUPERIO_ADDRESS 0x4e
-
-#define SERIAL_DEV PNP_DEV(SUPERIO_ADDRESS, F71869AD_SP1)
-#define GPIO_DEV PNP_DEV(SUPERIO_ADDRESS, F71869AD_GPIO)
-
-
-/* GPIO configuration */
-static void gpio_init(pnp_devfn_t dev)
-{
-	pnp_enter_conf_state(dev);
-	pnp_set_logical_device(dev);
-	pnp_set_enable(dev, 0);
-	pnp_write_config(dev, 0x60, 0x0a); //Base addr high
-	pnp_write_config(dev, 0x61, 0x00); //Base addr low
-	pnp_write_config(dev, 0xe0, 0x04); //GPIO1 output enable
-	pnp_write_config(dev, 0xe1, 0xff); //GPIO1 output data
-	pnp_write_config(dev, 0xe3, 0x04); //GPIO1 drive enable
-	pnp_write_config(dev, 0xe4, 0x00); //GPIO1 PME enable
-	pnp_write_config(dev, 0xe5, 0x00); //GPIO1 input detect select
-	pnp_write_config(dev, 0xe6, 0x40); //GPIO1 event status
-	pnp_write_config(dev, 0xd0, 0x00); //GPIO2 output enable
-	pnp_write_config(dev, 0xd1, 0xff); //GPIO2 output data
-	pnp_write_config(dev, 0xd3, 0x00); //GPIO2 drive enable
-	pnp_write_config(dev, 0xc0, 0x00); //GPIO3 output enable
-	pnp_write_config(dev, 0xc1, 0xff); //GPIO3 output data
-	pnp_write_config(dev, 0xb0, 0x04); //GPIO4 output enable
-	pnp_write_config(dev, 0xb1, 0x04); //GPIO4 output data
-	pnp_write_config(dev, 0xb3, 0x04); //GPIO4 drive enable
-	pnp_write_config(dev, 0xb4, 0x00); //GPIO4 PME enable
-	pnp_write_config(dev, 0xb5, 0x00); //GPIO4 input detect select
-	pnp_write_config(dev, 0xb6, 0x00); //GPIO4 event status
-	pnp_write_config(dev, 0xa0, 0x00); //GPIO5 output enable
-	pnp_write_config(dev, 0xa1, 0x1f); //GPIO5 output data
-	pnp_write_config(dev, 0xa3, 0x00); //GPIO5 drive enable
-	pnp_write_config(dev, 0xa4, 0x00); //GPIO5 PME enable
-	pnp_write_config(dev, 0xa5, 0xff); //GPIO5 input detect select
-	pnp_write_config(dev, 0xa6, 0xe0); //GPIO5 event status
-	pnp_write_config(dev, 0x90, 0x00); //GPIO6 output enable
-	pnp_write_config(dev, 0x91, 0xff); //GPIO6 output data
-	pnp_write_config(dev, 0x93, 0x00); //GPIO6 drive enable
-	pnp_write_config(dev, 0x80, 0x00); //GPIO7 output enable
-	pnp_write_config(dev, 0x81, 0xff); //GPIO7 output data
-	pnp_write_config(dev, 0x83, 0x00); //GPIO7 drive enable
-	pnp_set_enable(dev, 1);
-	pnp_exit_conf_state(dev);
-}
-
-
-static void sbxxx_enable_48mhzout(void)
-{
-	/* most likely programming to 48MHz out signal */
-	u32 reg32;
-	reg32 = SB_MMIO_MISC32(0x28);
-	reg32 &= 0xffc7ffff;
-	reg32 |= 0x00100000;
-	SB_MMIO_MISC32(0x28) = reg32;
-
-	reg32 = SB_MMIO_MISC32(0x40);
-	reg32 &= ~0x80u;
-	SB_MMIO_MISC32(0x40) = reg32;
-}
-
 
 void board_BeforeAgesa(struct sysinfo *cb)
 {
-	u8 byte;
-	pci_devfn_t dev;
-
-	/* enable SIO LPC decode */
-	dev = PCI_DEV(0, 0x14, 3);
-	byte = pci_read_config8(dev, 0x48);
-	byte |= 3;		/* 2e, 2f */
-	pci_write_config8(dev, 0x48, byte);
-
-	/* enable serial decode */
-	byte = pci_read_config8(dev, 0x44);
-	byte |= (1 << 6);  /* 0x3f8 */
-	pci_write_config8(dev, 0x44, byte);
-
 	post_code(0x30);
-
-	/* enable SB MMIO space */
-	outb(0x24, 0xcd6);
-	outb(0x1, 0xcd7);
-
-	/* enable SIO clock */
-	sbxxx_enable_48mhzout();
-
-	/* Initialize GPIO registers */
-	gpio_init(GPIO_DEV);
-
-	/* Enable serial console */
-	fintek_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }