[coreboot-gerrit] Patch set updated for coreboot: soc/intel/quark: Remove use of PDAT.bin file

[Leroy P Leahy (leroy.p.leahy@intel.com)]

Leroy P Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15205

-gerrit

commit 7527cf169a0dc6df58a79be879a352d17f6ae678
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Wed Jun 15 12:29:51 2016 -0700

    soc/intel/quark: Remove use of PDAT.bin file
    
    Remove the unused Kconfig values which specify the PDAT file, its
    location and inclusion into the coreboot file system.  Remove the code
    in romstage which locates the pdat.bin file.
    
    TEST=Build and run on Galileo Gen2
    
    Change-Id: I397aa22ada6c073c60485a735d6e2cb42bfd40ab
    Signed-off-by: Lee Leahy <leroy.p.leahy at intel.com>
---
 src/soc/intel/quark/Kconfig             | 32 --------------------------------
 src/soc/intel/quark/Makefile.inc        |  6 ------
 src/soc/intel/quark/romstage/romstage.c | 11 -----------
 3 files changed, 49 deletions(-)

diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 37b669d..6669d81 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -204,38 +204,6 @@ config RELOCATE_FSP_INTO_DRAM
 	  Relocate the FSP binary into DRAM before the call to SiliconInit.
 
 #####
-# FSP PDAT binary
-#     The following options control the FSP platform data binary
-#     file placement in the flash image.
-#####
-
-config ADD_FSP_PDAT_FILE
-	bool "Should the PDAT binary be added to the flash image?"
-	default n
-	depends on PLATFORM_USES_FSP1_1
-	help
-	  The PDAT file is required for the FSP 1.1 binary
-
-config FSP_PDAT_FILE
-	string
-	default "3rdparty/blobs/soc/intel/quark/pdat.bin"
-	depends on PLATFORM_USES_FSP1_1
-	depends on ADD_FSP_PDAT_FILE
-	help
-	  The path and filename of the Intel Galileo platform-data-patch (PDAT)
-	  binary. This binary file is generated by the platform-data-patch.py
-	  script released with the Quark BSP and contains the Ethernet address.
-
-config FSP_PDAT_LOC
-	hex
-	default 0xfff10000
-	depends on PLATFORM_USES_FSP1_1
-	depends on ADD_FSP_PDAT_FILE
-	help
-	  The location in CBFS that the PDAT is located. It must match the
-	  PCD PcdPlatformDataBaseAddress of Quark SoC FSP.
-
-#####
 # RMU binary
 #     The following options control the Quark chipset microcode file
 #     placement in the flash image.  This file is required to bring
diff --git a/src/soc/intel/quark/Makefile.inc b/src/soc/intel/quark/Makefile.inc
index edbb8be..f5b9746 100644
--- a/src/soc/intel/quark/Makefile.inc
+++ b/src/soc/intel/quark/Makefile.inc
@@ -56,12 +56,6 @@ fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE))
 fsp.bin-position := $(CONFIG_FSP_LOC)
 fsp.bin-type := raw
 
-# Add the platform data file to the CBFS image
-cbfs-files-$(CONFIG_ADD_FSP_PDAT_FILE) += pdat.bin
-pdat.bin-file := $(call strip_quotes,$(CONFIG_FSP_PDAT_FILE))
-pdat.bin-position := $(CONFIG_FSP_PDAT_LOC)
-pdat.bin-type := raw
-
 # Add the chipset microcode file to the CBFS image
 cbfs-files-$(CONFIG_ADD_RMU_FILE) += rmu.bin
 rmu.bin-file := $(call strip_quotes,$(CONFIG_RMU_FILE))
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index c14acb7..b99ad54 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -127,20 +127,9 @@ void soc_memory_init_params(struct romstage_params *params,
 			    MEMORY_INIT_UPD *upd)
 {
 	const struct device *dev;
-	char *pdat_file;
-	size_t pdat_file_len;
 	const struct soc_intel_quark_config *config;
 	struct chipset_power_state *ps = car_get_var_ptr(&power_state);
 
-	/* Locate the pdat.bin file */
-	pdat_file = cbfs_boot_map_with_leak("pdat.bin", CBFS_TYPE_RAW,
-		&pdat_file_len);
-	if (!pdat_file) {
-		printk(BIOS_DEBUG,
-			"Platform configuration file (pdat.bin) not found.");
-		pdat_file_len = 0;
-	}
-
 	/* Locate the configuration data from devicetree.cb */
 	dev = dev_find_slot(0, LPC_DEV_FUNC);
 	if (!dev) {