diff --git a/src/soc/intel/baytrail/bootblock/bootblock.c b/src/soc/intel/baytrail/bootblock/bootblock.c
index 62f42cd4d6..46f12e7646 100644
--- a/src/soc/intel/baytrail/bootblock/bootblock.c
+++ b/src/soc/intel/baytrail/bootblock/bootblock.c
@@ -9,25 +9,6 @@
 #include <soc/spi.h>
 #include <soc/pm.h>
 
-static void setup_mmconfig(void)
-{
-	uint32_t reg;
-
-	/*
-	 * Set up the MMCONF range. The register lives in the BUNIT. The IO variant of the
-	 * config access needs to be used initially to properly configure as the IOSF access
-	 * registers live in PCI config space.
-	 */
-	reg = 0;
-	/* Clear the extended register. */
-	pci_io_write_config32(IOSF_PCI_DEV, MCRX_REG, reg);
-	reg = CONFIG_MMCONF_BASE_ADDRESS | 1;
-	pci_io_write_config32(IOSF_PCI_DEV, MDR_REG, reg);
-	reg = IOSF_OPCODE(IOSF_OP_WRITE_BUNIT) | IOSF_PORT(IOSF_PORT_BUNIT) |
-	      IOSF_REG(BUNIT_MMCONF_REG) | IOSF_BYTE_EN;
-	pci_io_write_config32(IOSF_PCI_DEV, MCR_REG, reg);
-}
-
 static void program_base_addresses(void)
 {
 	uint32_t reg;
@@ -56,6 +37,15 @@ static void program_base_addresses(void)
 	pci_write_config32(lpc_dev, GBASE, reg);
 }
 
+static void tco_disable(void)
+{
+	uint32_t reg;
+
+	reg = inl(ACPI_BASE_ADDRESS + TCO1_CNT);
+	reg |= TCO_TMR_HALT;
+	outl(reg, ACPI_BASE_ADDRESS + TCO1_CNT);
+}
+
 static void spi_init(void)
 {
 	void *scs = (void *)(SPI_BASE_ADDRESS + SCS);
@@ -73,15 +63,6 @@ static void spi_init(void)
 	write32(bcr, reg);
 }
 
-static void tco_disable(void)
-{
-	uint32_t reg;
-
-	reg = inl(ACPI_BASE_ADDRESS + TCO1_CNT);
-	reg |= TCO_TMR_HALT;
-	outl(reg, ACPI_BASE_ADDRESS + TCO1_CNT);
-}
-
 static void byt_config_com1_and_enable(void)
 {
 	uint32_t reg;
@@ -95,6 +76,25 @@ static void byt_config_com1_and_enable(void)
 	score_select_func(UART_TXD_PAD, 1);
 }
 
+static void setup_mmconfig(void)
+{
+	uint32_t reg;
+
+	/*
+	 * Set up the MMCONF range. The register lives in the BUNIT. The IO variant of the
+	 * config access needs to be used initially to properly configure as the IOSF access
+	 * registers live in PCI config space.
+	 */
+	reg = 0;
+	/* Clear the extended register. */
+	pci_io_write_config32(IOSF_PCI_DEV, MCRX_REG, reg);
+	reg = CONFIG_MMCONF_BASE_ADDRESS | 1;
+	pci_io_write_config32(IOSF_PCI_DEV, MDR_REG, reg);
+	reg = IOSF_OPCODE(IOSF_OP_WRITE_BUNIT) | IOSF_PORT(IOSF_PORT_BUNIT) |
+	      IOSF_REG(BUNIT_MMCONF_REG) | IOSF_BYTE_EN;
+	pci_io_write_config32(IOSF_PCI_DEV, MCR_REG, reg);
+}
+
 /* The distinction between nb/sb/cpu is not applicable here so
    just pick the one that is called first. */
 void bootblock_early_northbridge_init(void)