From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 1 Feb 2016 09:40:39 +0000 (-0800)
Subject: x86: tnc: Drop unprotect_spi_flash()
X-Git-Tag: v2016.03-rc2~124
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=efd633ccdd06361f63f9b8918eee647ceb65283d;p=oweals%2Fu-boot.git

x86: tnc: Drop unprotect_spi_flash()

Unprotecting SPI flash is now handled in the SPI controller driver,
via a call to the PCH driver. Drop the ad-hoc version.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 75f7adb74c..f9fddc1ba7 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -14,15 +14,6 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/processor.h>
 
-static void unprotect_spi_flash(void)
-{
-	u32 bc;
-
-	bc = x86_pci_read_config32(TNC_LPC, 0xd8);
-	bc |= 0x1;	/* unprotect the flash */
-	x86_pci_write_config32(TNC_LPC, 0xd8, bc);
-}
-
 static void __maybe_unused disable_igd(void)
 {
 	/*
@@ -68,10 +59,3 @@ int arch_early_init_r(void)
 
 	return 0;
 }
-
-int arch_misc_init(void)
-{
-	unprotect_spi_flash();
-
-	return 0;
-}
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index ffd65d5439..fc1a8baf89 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_MONITOR_LEN		(1 << 20)
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_EARLY_INIT_R
-#define CONFIG_ARCH_MISC_INIT
 
 #define CONFIG_SMSC_LPC47M