soc/intel: Remove Quark blobs

Quark was removed from the coreboot repo several months ago. The
submodule pointer for the 4.20 branch will still contain these blobs,
so they can be removed from ToT.

(cherry picked from commit ba6e8a48cee66c2a5093d9f76a6786feba90a761)

Original-Signed-off-by: Martin Roth <gaumless@gmail.com>
Original-Change-Id: Id13ce993f6d0e397ad0b8f84de7773129f2de2f0
GitOrigin-RevId: ba6e8a48cee66c2a5093d9f76a6786feba90a761
Change-Id: I2d93874460593639224a04da1bfb22687c73708d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/blobs/+/4809164
Reviewed-by: Kapil Porwal <kapilporwal@chromium.org>
Commit-Queue: Kapil Porwal <kapilporwal@chromium.org>
Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
diff --git a/soc/intel/quark/Fsp2_0/DEBUG/FSP_M.fd b/soc/intel/quark/Fsp2_0/DEBUG/FSP_M.fd
deleted file mode 100644
index 2b11d66..0000000
--- a/soc/intel/quark/Fsp2_0/DEBUG/FSP_M.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/DEBUG/FSP_S.fd b/soc/intel/quark/Fsp2_0/DEBUG/FSP_S.fd
deleted file mode 100644
index a82fd95..0000000
--- a/soc/intel/quark/Fsp2_0/DEBUG/FSP_S.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/DEBUG/FSP_T.fd b/soc/intel/quark/Fsp2_0/DEBUG/FSP_T.fd
deleted file mode 100644
index 4ebae94..0000000
--- a/soc/intel/quark/Fsp2_0/DEBUG/FSP_T.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/DEBUG/QUARK.fd b/soc/intel/quark/Fsp2_0/DEBUG/QUARK.fd
deleted file mode 100644
index fcb140a..0000000
--- a/soc/intel/quark/Fsp2_0/DEBUG/QUARK.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/Fsp.bsf b/soc/intel/quark/Fsp2_0/Fsp.bsf
deleted file mode 100644
index 47fc070..0000000
--- a/soc/intel/quark/Fsp2_0/Fsp.bsf
+++ /dev/null
@@ -1,181 +0,0 @@
-/** @file
-
-  Boot Setting File for Platform Configuration.
-
-  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-
-
-GlobalDataDef
-    SKUID = 0, "DEFAULT"
-EndGlobalData
-
-
-StructDef
-
-    Find "QRKUPD_T"
-        $gPlatformFspPkgTokenSpaceGuid_Revision                        1 bytes    $_DEFAULT_ = 0x01
-
-    Find "QRKUPD_M"
-        $gPlatformFspPkgTokenSpaceGuid_Revision                        1 bytes    $_DEFAULT_ = 0x01
-        Skip 31 bytes
-        $gQuarkFspTokenSpaceGuid_StackBase                             4 bytes    $_DEFAULT_ = 0xFEF16000
-        $gQuarkFspTokenSpaceGuid_StackSize                             4 bytes    $_DEFAULT_ = 0x0002A000
-        $gQuarkFspTokenSpaceGuid_BootLoaderTolumSize                   4 bytes    $_DEFAULT_ = 0x00000000
-        $gQuarkFspTokenSpaceGuid_Bootmode                              4 bytes    $_DEFAULT_ = 0x00000000
-        Skip 8 bytes
-        $gQuarkFspTokenSpaceGuid_RmuBaseAddress                        4 bytes    $_DEFAULT_ = 0xFFF00000
-        $gQuarkFspTokenSpaceGuid_RmuLength                             4 bytes    $_DEFAULT_ = 0x02000
-        $gQuarkFspTokenSpaceGuid_Reserved_48                           4 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_tRAS                                  4 bytes    $_DEFAULT_ = 37500
-        $gQuarkFspTokenSpaceGuid_tWTR                                  4 bytes    $_DEFAULT_ = 10000
-        $gQuarkFspTokenSpaceGuid_tRRD                                  4 bytes    $_DEFAULT_ = 10000
-        $gQuarkFspTokenSpaceGuid_tFAW                                  4 bytes    $_DEFAULT_ = 40000
-        $gQuarkFspTokenSpaceGuid_Flags                                 4 bytes    $_DEFAULT_ = 0x00000002
-        $gQuarkFspTokenSpaceGuid_DramWidth                             1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramSpeed                             1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramType                              1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_RankMask                              1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_ChanMask                              1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_ChanWidth                             1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_AddrMode                              1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_SrInt                                 1 bytes    $_DEFAULT_ = 3
-        $gQuarkFspTokenSpaceGuid_SrTemp                                1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramRonVal                            1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramRttNomVal                         1 bytes    $_DEFAULT_ = 2
-        $gQuarkFspTokenSpaceGuid_DramRttWrVal                          1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_SocRdOdtVal                           1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_SocWrRonVal                           1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_SocWrSlewRate                         1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_DramDensity                           1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_tCL                                   1 bytes    $_DEFAULT_ = 6
-        $gQuarkFspTokenSpaceGuid_EccScrubInterval                      1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_EccScrubBlkSize                       1 bytes    $_DEFAULT_ = 2
-        $gQuarkFspTokenSpaceGuid_SmmTsegSize                           1 bytes    $_DEFAULT_ = 2
-        $gQuarkFspTokenSpaceGuid_FspReservedMemoryLength               4 bytes    $_DEFAULT_ = 0x00100000
-        $gQuarkFspTokenSpaceGuid_MrcDataPtr                            4 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_MrcDataLength                         4 bytes    $_DEFAULT_ = 0
-
-    Find "QRKUPD_S"
-        $gPlatformFspPkgTokenSpaceGuid_Revision                        1 bytes    $_DEFAULT_ = 0x01
-
-EndStruct
-
-
-List &EN_DIS
-    Selection 0x1 , "Enabled"
-    Selection 0x0 , "Disabled"
-EndList
-
-BeginInfoBlock
-    PPVer       "0.1"
-    Description "Quark FSP"
-EndInfoBlock
-
-Page "FSP MemoryInit Settings"
-    EditNum $gQuarkFspTokenSpaceGuid_RmuLength, "RmuLength", HEX,
-        Help "RMU microcode binary length in bytes"
-             "Valid range: 0x00000000 ~ 0x00010000"
-    EditNum $gQuarkFspTokenSpaceGuid_Reserved_48, "SerialPortBaseAddress", HEX,
-        Help "Debug serial port base address set by BIOS. Zero disables debug serial output."
-             "Valid range: 0x00000000 ~ 0x00010000"
-    EditNum $gQuarkFspTokenSpaceGuid_tRAS, "tRAS", HEX,
-        Help "ACT to PRE command period in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_tWTR, "tWTR", HEX,
-        Help "Delay from start of internal write transaction to internal read command in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_tRRD, "tRRD", HEX,
-        Help "ACT to ACT command period (JESD79 specific to page size 1K/2K) in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_tFAW, "tFAW", HEX,
-        Help "Four activate window (JESD79 specific to page size 1K/2K) in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_Flags, "Flags", HEX,
-        Help "Bitmap of MRC_FLAG_XXX: ECC_EN            BIT0, SCRAMBLE_EN       BIT1, MEMTEST_EN        BIT2, TOP_TREE_EN       BIT3  0b DDR "fly-by" topology else 1b DDR "tree" topology, WR_ODT_EN         BIT4  If set ODR signal is asserted to DRAM devices on writes."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_DramWidth, "DramWidth", HEX,
-        Help "0=x8, 1=x16, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramSpeed, "DramSpeed", HEX,
-        Help "0=DDRFREQ_800, 1=DDRFREQ_1066, others=RESERVED. Only 533MHz SKU support 1066 memory."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramType, "DramType", HEX,
-        Help "0=DDR3, 1=DDR3L, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_RankMask, "RankMask", HEX,
-        Help "bit[0] RANK0_EN, bit[1] RANK1_EN, others=RESERVED."
-             "Valid range: 0x0 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_ChanMask, "ChanMask", HEX,
-        Help "bit[0] CHAN0_EN, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_ChanWidth, "ChanWidth", HEX,
-        Help "1=x16, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_AddrMode, "AddrMode", HEX,
-        Help "0, 1, 2 (mode 2 forced if ecc enabled), others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_SrInt, "SrInt", HEX,
-        Help "1=1.95us, 2=3.9us, 3=7.8us, others=RESERVED. REFRESH_RATE."
-             "Valid range: 0x1 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_SrTemp, "SrTemp", HEX,
-        Help "0=normal, 1=extended, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramRonVal, "DramRonVal", HEX,
-        Help "0=34ohm, 1=40ohm, others=RESERVED. RON_VALUE Select MRS1.DIC driver impedance control."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramRttNomVal, "DramRttNomVal", HEX,
-        Help "0=40ohm, 1=60ohm, 2=120ohm, others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_DramRttWrVal, "DramRttWrVal", HEX,
-        Help "0=off others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_SocRdOdtVal, "SocRdOdtVal", HEX,
-        Help "0=off, 1=60ohm, 2=120ohm, 3=180ohm, others=RESERVED."
-             "Valid range: 0x0 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_SocWrRonVal, "SocWrRonVal", HEX,
-        Help "0=27ohm, 1=32ohm, 2=40ohm, others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_SocWrSlewRate, "SocWrSlewRate", HEX,
-        Help "0=2.5V/ns, 1=4V/ns, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramDensity, "DramDensity", HEX,
-        Help "0=512Mb, 1=1Gb, 2=2Gb, 3=4Gb, others=RESERVED."
-             "Valid range: 0x0 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_tCL, "tCL", HEX,
-        Help "DRAM CAS Latency in clocks"
-             "Valid range: 0x00 ~ 0xFF"
-    EditNum $gQuarkFspTokenSpaceGuid_EccScrubInterval, "EccScrubInterval", HEX,
-        Help "ECC scrub interval in miliseconds 1..255 (0 works as feature disable"
-             "Valid range: 0x00 ~ 0xFF"
-    EditNum $gQuarkFspTokenSpaceGuid_EccScrubBlkSize, "EccScrubBlkSize", HEX,
-        Help "Number of 32B blocks read for ECC scrub 2..16"
-             "Valid range: 0x2 ~ 0x10"
-    EditNum $gQuarkFspTokenSpaceGuid_SmmTsegSize, "SmmTsegSize", HEX,
-        Help "Size of the SMM region in 1 MiB chunks"
-             "Valid range: 0x0 ~ 0x8"
-    EditNum $gQuarkFspTokenSpaceGuid_FspReservedMemoryLength, "FspReservedMemoryLength", HEX,
-        Help "FSP reserved memory length in bytes"
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_MrcDataPtr, "MrcDataPtr", HEX,
-        Help "Pointer to saved MRC data"
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_MrcDataLength, "MrcDataLength", HEX,
-        Help "Length of saved MRC data"
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-EndPage
-
-Page "FSP SiliconInit Settings"
-EndPage
-
diff --git a/soc/intel/quark/Fsp2_0/Include/FspUpd.h b/soc/intel/quark/Fsp2_0/Include/FspUpd.h
deleted file mode 100644
index 2410d7e..0000000
--- a/soc/intel/quark/Fsp2_0/Include/FspUpd.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPUPD_H__
-#define __FSPUPD_H__
-
-#include <FspEas.h>
-
-#pragma pack(1)
-
-#define FSPT_UPD_SIGNATURE               0x545F4450554B5251        /* 'QRKUPD_T' */
-
-#define FSPM_UPD_SIGNATURE               0x4D5F4450554B5251        /* 'QRKUPD_M' */
-
-#define FSPS_UPD_SIGNATURE               0x535F4450554B5251        /* 'QRKUPD_S' */
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0/Include/FspmUpd.h b/soc/intel/quark/Fsp2_0/Include/FspmUpd.h
deleted file mode 100644
index ee83589..0000000
--- a/soc/intel/quark/Fsp2_0/Include/FspmUpd.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPMUPD_H__
-#define __FSPMUPD_H__
-
-#include <FspUpd.h>
-
-#pragma pack(1)
-
-
-/** Fsp M Configuration
-**/
-typedef struct {
-
-/** Offset 0x0040 - RmuBaseAddress
-  RMU microcode binary base address in SPI flash'
-**/
-  UINT32                      RmuBaseAddress;
-
-/** Offset 0x0044 - RmuLength
-  RMU microcode binary length in bytes
-**/
-  UINT32                      RmuLength;
-
-/** Offset 0x0048 - SerialPortBaseAddress
-  Debug serial port base address set by BIOS. Zero disables debug serial output.
-**/
-  UINT32                      Reserved_48;
-
-/** Offset 0x004C - tRAS
-  ACT to PRE command period in picoseconds.
-**/
-  UINT32                      tRAS;
-
-/** Offset 0x0050 - tWTR
-  Delay from start of internal write transaction to internal read command in picoseconds.
-**/
-  UINT32                      tWTR;
-
-/** Offset 0x0054 - tRRD
-  ACT to ACT command period (JESD79 specific to page size 1K/2K) in picoseconds.
-**/
-  UINT32                      tRRD;
-
-/** Offset 0x0058 - tFAW
-  Four activate window (JESD79 specific to page size 1K/2K) in picoseconds.
-**/
-  UINT32                      tFAW;
-
-/** Offset 0x005C - Flags
-  Bitmap of MRC_FLAG_XXX: ECC_EN            BIT0, SCRAMBLE_EN       BIT1, MEMTEST_EN
-  BIT2, TOP_TREE_EN       BIT3  0b DDR "fly-by" topology else 1b DDR "tree"
-  topology, WR_ODT_EN         BIT4  If set ODR signal is asserted to DRAM devices
-  on writes.
-**/
-  UINT32                      Flags;
-
-/** Offset 0x0060 - DramWidth
-  0=x8, 1=x16, others=RESERVED.
-**/
-  UINT8                       DramWidth;
-
-/** Offset 0x0061 - DramSpeed
-  0=DDRFREQ_800, 1=DDRFREQ_1066, others=RESERVED. Only 533MHz SKU support 1066 memory.
-**/
-  UINT8                       DramSpeed;
-
-/** Offset 0x0062 - DramType
-  0=DDR3, 1=DDR3L, others=RESERVED.
-**/
-  UINT8                       DramType;
-
-/** Offset 0x0063 - RankMask
-  bit[0] RANK0_EN, bit[1] RANK1_EN, others=RESERVED.
-**/
-  UINT8                       RankMask;
-
-/** Offset 0x0064 - ChanMask
-  bit[0] CHAN0_EN, others=RESERVED.
-**/
-  UINT8                       ChanMask;
-
-/** Offset 0x0065 - ChanWidth
-  1=x16, others=RESERVED.
-**/
-  UINT8                       ChanWidth;
-
-/** Offset 0x0066 - AddrMode
-  0, 1, 2 (mode 2 forced if ecc enabled), others=RESERVED.
-**/
-  UINT8                       AddrMode;
-
-/** Offset 0x0067 - SrInt
-  1=1.95us, 2=3.9us, 3=7.8us, others=RESERVED. REFRESH_RATE.
-**/
-  UINT8                       SrInt;
-
-/** Offset 0x0068 - SrTemp
-  0=normal, 1=extended, others=RESERVED.
-**/
-  UINT8                       SrTemp;
-
-/** Offset 0x0069 - DramRonVal
-  0=34ohm, 1=40ohm, others=RESERVED. RON_VALUE Select MRS1.DIC driver impedance control.
-**/
-  UINT8                       DramRonVal;
-
-/** Offset 0x006A - DramRttNomVal
-  0=40ohm, 1=60ohm, 2=120ohm, others=RESERVED.
-**/
-  UINT8                       DramRttNomVal;
-
-/** Offset 0x006B - DramRttWrVal
-  0=off others=RESERVED.
-**/
-  UINT8                       DramRttWrVal;
-
-/** Offset 0x006C - SocRdOdtVal
-  0=off, 1=60ohm, 2=120ohm, 3=180ohm, others=RESERVED.
-**/
-  UINT8                       SocRdOdtVal;
-
-/** Offset 0x006D - SocWrRonVal
-  0=27ohm, 1=32ohm, 2=40ohm, others=RESERVED.
-**/
-  UINT8                       SocWrRonVal;
-
-/** Offset 0x006E - SocWrSlewRate
-  0=2.5V/ns, 1=4V/ns, others=RESERVED.
-**/
-  UINT8                       SocWrSlewRate;
-
-/** Offset 0x006F - DramDensity
-  0=512Mb, 1=1Gb, 2=2Gb, 3=4Gb, others=RESERVED.
-**/
-  UINT8                       DramDensity;
-
-/** Offset 0x0070 - tCL
-  DRAM CAS Latency in clocks
-**/
-  UINT8                       tCL;
-
-/** Offset 0x0071 - EccScrubInterval
-  ECC scrub interval in miliseconds 1..255 (0 works as feature disable
-**/
-  UINT8                       EccScrubInterval;
-
-/** Offset 0x0072 - EccScrubBlkSize
-  Number of 32B blocks read for ECC scrub 2..16
-**/
-  UINT8                       EccScrubBlkSize;
-
-/** Offset 0x0073 - SmmTsegSize
-  Size of the SMM region in 1 MiB chunks
-**/
-  UINT8                       SmmTsegSize;
-
-/** Offset 0x0074 - FspReservedMemoryLength
-  FSP reserved memory length in bytes
-**/
-  UINT32                      FspReservedMemoryLength;
-
-/** Offset 0x0078 - MrcDataPtr
-  Pointer to saved MRC data
-**/
-  UINT32                      MrcDataPtr;
-
-/** Offset 0x007C - MrcDataLength
-  Length of saved MRC data
-**/
-  UINT32                      MrcDataLength;
-
-/** Offset 0x0080
-**/
-  UINT32                      SerialPortPollForChar;
-
-/** Offset 0x0084
-**/
-  UINT32                      SerialPortReadChar;
-
-/** Offset 0x0088
-**/
-  UINT32                      SerialPortWriteChar;
-
-/** Offset 0x008C
-**/
-  UINT16                      UpdTerminator;
-} FSP_M_CONFIG;
-
-/** Fsp M UPD Configuration
-**/
-typedef struct {
-
-/** Offset 0x0000
-**/
-  FSP_UPD_HEADER              FspUpdHeader;
-
-/** Offset 0x0020
-**/
-  FSPM_ARCH_UPD               FspmArchUpd;
-
-/** Offset 0x0040
-**/
-  FSP_M_CONFIG                FspmConfig;
-} FSPM_UPD;
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0/Include/FspsUpd.h b/soc/intel/quark/Fsp2_0/Include/FspsUpd.h
deleted file mode 100644
index 125df14..0000000
--- a/soc/intel/quark/Fsp2_0/Include/FspsUpd.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPSUPD_H__
-#define __FSPSUPD_H__
-
-#include <FspUpd.h>
-
-#pragma pack(1)
-
-
-/** Fsp S UPD Configuration
-**/
-typedef struct {
-
-/** Offset 0x0000
-**/
-  FSP_UPD_HEADER              FspUpdHeader;
-
-/** Offset 0x0020
-**/
-  UINT16                      UpdTerminator;
-} FSPS_UPD;
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0/Include/FsptUpd.h b/soc/intel/quark/Fsp2_0/Include/FsptUpd.h
deleted file mode 100644
index 1790dbc..0000000
--- a/soc/intel/quark/Fsp2_0/Include/FsptUpd.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPTUPD_H__
-#define __FSPTUPD_H__
-
-#include <FspUpd.h>
-
-#pragma pack(1)
-
-
-/** Fsp T Common UPD
-**/
-typedef struct {
-
-/** Offset 0x0020
-**/
-  UINT8                       Revision;
-
-/** Offset 0x0021
-**/
-  UINT8                       Reserved[3];
-
-/** Offset 0x0024
-**/
-  UINT32                      MicrocodeRegionBase;
-
-/** Offset 0x0028
-**/
-  UINT32                      MicrocodeRegionLength;
-
-/** Offset 0x002C
-**/
-  UINT32                      CodeRegionBase;
-
-/** Offset 0x0030
-**/
-  UINT32                      CodeRegionLength;
-
-/** Offset 0x0034
-**/
-  UINT8                       Reserved1[12];
-} FSPT_COMMON_UPD;
-
-/** Fsp T UPD Configuration
-**/
-typedef struct {
-
-/** Offset 0x0000
-**/
-  FSP_UPD_HEADER              FspUpdHeader;
-
-/** Offset 0x0020
-**/
-  FSPT_COMMON_UPD             FsptCommonUpd;
-
-/** Offset 0x0040
-**/
-  UINT16                      UpdTerminator;
-} FSPT_UPD;
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0/RELEASE/FSP_M.fd b/soc/intel/quark/Fsp2_0/RELEASE/FSP_M.fd
deleted file mode 100644
index 9a85e85..0000000
--- a/soc/intel/quark/Fsp2_0/RELEASE/FSP_M.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/RELEASE/FSP_S.fd b/soc/intel/quark/Fsp2_0/RELEASE/FSP_S.fd
deleted file mode 100644
index 90d9791..0000000
--- a/soc/intel/quark/Fsp2_0/RELEASE/FSP_S.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/RELEASE/FSP_T.fd b/soc/intel/quark/Fsp2_0/RELEASE/FSP_T.fd
deleted file mode 100644
index 2b607d6..0000000
--- a/soc/intel/quark/Fsp2_0/RELEASE/FSP_T.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0/RELEASE/QUARK.fd b/soc/intel/quark/Fsp2_0/RELEASE/QUARK.fd
deleted file mode 100644
index 026a517..0000000
--- a/soc/intel/quark/Fsp2_0/RELEASE/QUARK.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_M.fd b/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_M.fd
deleted file mode 100644
index a046acb..0000000
--- a/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_M.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_S.fd b/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_S.fd
deleted file mode 100644
index e8e48fa..0000000
--- a/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_S.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_T.fd b/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_T.fd
deleted file mode 100644
index d9f14f5..0000000
--- a/soc/intel/quark/Fsp2_0Pei/DEBUG/FSP_T.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/DEBUG/QUARK.fd b/soc/intel/quark/Fsp2_0Pei/DEBUG/QUARK.fd
deleted file mode 100644
index 90d0223..0000000
--- a/soc/intel/quark/Fsp2_0Pei/DEBUG/QUARK.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/Fsp.bsf b/soc/intel/quark/Fsp2_0Pei/Fsp.bsf
deleted file mode 100644
index 47fc070..0000000
--- a/soc/intel/quark/Fsp2_0Pei/Fsp.bsf
+++ /dev/null
@@ -1,181 +0,0 @@
-/** @file
-
-  Boot Setting File for Platform Configuration.
-
-  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-
-
-GlobalDataDef
-    SKUID = 0, "DEFAULT"
-EndGlobalData
-
-
-StructDef
-
-    Find "QRKUPD_T"
-        $gPlatformFspPkgTokenSpaceGuid_Revision                        1 bytes    $_DEFAULT_ = 0x01
-
-    Find "QRKUPD_M"
-        $gPlatformFspPkgTokenSpaceGuid_Revision                        1 bytes    $_DEFAULT_ = 0x01
-        Skip 31 bytes
-        $gQuarkFspTokenSpaceGuid_StackBase                             4 bytes    $_DEFAULT_ = 0xFEF16000
-        $gQuarkFspTokenSpaceGuid_StackSize                             4 bytes    $_DEFAULT_ = 0x0002A000
-        $gQuarkFspTokenSpaceGuid_BootLoaderTolumSize                   4 bytes    $_DEFAULT_ = 0x00000000
-        $gQuarkFspTokenSpaceGuid_Bootmode                              4 bytes    $_DEFAULT_ = 0x00000000
-        Skip 8 bytes
-        $gQuarkFspTokenSpaceGuid_RmuBaseAddress                        4 bytes    $_DEFAULT_ = 0xFFF00000
-        $gQuarkFspTokenSpaceGuid_RmuLength                             4 bytes    $_DEFAULT_ = 0x02000
-        $gQuarkFspTokenSpaceGuid_Reserved_48                           4 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_tRAS                                  4 bytes    $_DEFAULT_ = 37500
-        $gQuarkFspTokenSpaceGuid_tWTR                                  4 bytes    $_DEFAULT_ = 10000
-        $gQuarkFspTokenSpaceGuid_tRRD                                  4 bytes    $_DEFAULT_ = 10000
-        $gQuarkFspTokenSpaceGuid_tFAW                                  4 bytes    $_DEFAULT_ = 40000
-        $gQuarkFspTokenSpaceGuid_Flags                                 4 bytes    $_DEFAULT_ = 0x00000002
-        $gQuarkFspTokenSpaceGuid_DramWidth                             1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramSpeed                             1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramType                              1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_RankMask                              1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_ChanMask                              1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_ChanWidth                             1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_AddrMode                              1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_SrInt                                 1 bytes    $_DEFAULT_ = 3
-        $gQuarkFspTokenSpaceGuid_SrTemp                                1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramRonVal                            1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_DramRttNomVal                         1 bytes    $_DEFAULT_ = 2
-        $gQuarkFspTokenSpaceGuid_DramRttWrVal                          1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_SocRdOdtVal                           1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_SocWrRonVal                           1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_SocWrSlewRate                         1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_DramDensity                           1 bytes    $_DEFAULT_ = 1
-        $gQuarkFspTokenSpaceGuid_tCL                                   1 bytes    $_DEFAULT_ = 6
-        $gQuarkFspTokenSpaceGuid_EccScrubInterval                      1 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_EccScrubBlkSize                       1 bytes    $_DEFAULT_ = 2
-        $gQuarkFspTokenSpaceGuid_SmmTsegSize                           1 bytes    $_DEFAULT_ = 2
-        $gQuarkFspTokenSpaceGuid_FspReservedMemoryLength               4 bytes    $_DEFAULT_ = 0x00100000
-        $gQuarkFspTokenSpaceGuid_MrcDataPtr                            4 bytes    $_DEFAULT_ = 0
-        $gQuarkFspTokenSpaceGuid_MrcDataLength                         4 bytes    $_DEFAULT_ = 0
-
-    Find "QRKUPD_S"
-        $gPlatformFspPkgTokenSpaceGuid_Revision                        1 bytes    $_DEFAULT_ = 0x01
-
-EndStruct
-
-
-List &EN_DIS
-    Selection 0x1 , "Enabled"
-    Selection 0x0 , "Disabled"
-EndList
-
-BeginInfoBlock
-    PPVer       "0.1"
-    Description "Quark FSP"
-EndInfoBlock
-
-Page "FSP MemoryInit Settings"
-    EditNum $gQuarkFspTokenSpaceGuid_RmuLength, "RmuLength", HEX,
-        Help "RMU microcode binary length in bytes"
-             "Valid range: 0x00000000 ~ 0x00010000"
-    EditNum $gQuarkFspTokenSpaceGuid_Reserved_48, "SerialPortBaseAddress", HEX,
-        Help "Debug serial port base address set by BIOS. Zero disables debug serial output."
-             "Valid range: 0x00000000 ~ 0x00010000"
-    EditNum $gQuarkFspTokenSpaceGuid_tRAS, "tRAS", HEX,
-        Help "ACT to PRE command period in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_tWTR, "tWTR", HEX,
-        Help "Delay from start of internal write transaction to internal read command in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_tRRD, "tRRD", HEX,
-        Help "ACT to ACT command period (JESD79 specific to page size 1K/2K) in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_tFAW, "tFAW", HEX,
-        Help "Four activate window (JESD79 specific to page size 1K/2K) in picoseconds."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_Flags, "Flags", HEX,
-        Help "Bitmap of MRC_FLAG_XXX: ECC_EN            BIT0, SCRAMBLE_EN       BIT1, MEMTEST_EN        BIT2, TOP_TREE_EN       BIT3  0b DDR "fly-by" topology else 1b DDR "tree" topology, WR_ODT_EN         BIT4  If set ODR signal is asserted to DRAM devices on writes."
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_DramWidth, "DramWidth", HEX,
-        Help "0=x8, 1=x16, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramSpeed, "DramSpeed", HEX,
-        Help "0=DDRFREQ_800, 1=DDRFREQ_1066, others=RESERVED. Only 533MHz SKU support 1066 memory."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramType, "DramType", HEX,
-        Help "0=DDR3, 1=DDR3L, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_RankMask, "RankMask", HEX,
-        Help "bit[0] RANK0_EN, bit[1] RANK1_EN, others=RESERVED."
-             "Valid range: 0x0 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_ChanMask, "ChanMask", HEX,
-        Help "bit[0] CHAN0_EN, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_ChanWidth, "ChanWidth", HEX,
-        Help "1=x16, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_AddrMode, "AddrMode", HEX,
-        Help "0, 1, 2 (mode 2 forced if ecc enabled), others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_SrInt, "SrInt", HEX,
-        Help "1=1.95us, 2=3.9us, 3=7.8us, others=RESERVED. REFRESH_RATE."
-             "Valid range: 0x1 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_SrTemp, "SrTemp", HEX,
-        Help "0=normal, 1=extended, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramRonVal, "DramRonVal", HEX,
-        Help "0=34ohm, 1=40ohm, others=RESERVED. RON_VALUE Select MRS1.DIC driver impedance control."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramRttNomVal, "DramRttNomVal", HEX,
-        Help "0=40ohm, 1=60ohm, 2=120ohm, others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_DramRttWrVal, "DramRttWrVal", HEX,
-        Help "0=off others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_SocRdOdtVal, "SocRdOdtVal", HEX,
-        Help "0=off, 1=60ohm, 2=120ohm, 3=180ohm, others=RESERVED."
-             "Valid range: 0x0 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_SocWrRonVal, "SocWrRonVal", HEX,
-        Help "0=27ohm, 1=32ohm, 2=40ohm, others=RESERVED."
-             "Valid range: 0x0 ~ 0x2"
-    EditNum $gQuarkFspTokenSpaceGuid_SocWrSlewRate, "SocWrSlewRate", HEX,
-        Help "0=2.5V/ns, 1=4V/ns, others=RESERVED."
-             "Valid range: 0x0 ~ 0x1"
-    EditNum $gQuarkFspTokenSpaceGuid_DramDensity, "DramDensity", HEX,
-        Help "0=512Mb, 1=1Gb, 2=2Gb, 3=4Gb, others=RESERVED."
-             "Valid range: 0x0 ~ 0x3"
-    EditNum $gQuarkFspTokenSpaceGuid_tCL, "tCL", HEX,
-        Help "DRAM CAS Latency in clocks"
-             "Valid range: 0x00 ~ 0xFF"
-    EditNum $gQuarkFspTokenSpaceGuid_EccScrubInterval, "EccScrubInterval", HEX,
-        Help "ECC scrub interval in miliseconds 1..255 (0 works as feature disable"
-             "Valid range: 0x00 ~ 0xFF"
-    EditNum $gQuarkFspTokenSpaceGuid_EccScrubBlkSize, "EccScrubBlkSize", HEX,
-        Help "Number of 32B blocks read for ECC scrub 2..16"
-             "Valid range: 0x2 ~ 0x10"
-    EditNum $gQuarkFspTokenSpaceGuid_SmmTsegSize, "SmmTsegSize", HEX,
-        Help "Size of the SMM region in 1 MiB chunks"
-             "Valid range: 0x0 ~ 0x8"
-    EditNum $gQuarkFspTokenSpaceGuid_FspReservedMemoryLength, "FspReservedMemoryLength", HEX,
-        Help "FSP reserved memory length in bytes"
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_MrcDataPtr, "MrcDataPtr", HEX,
-        Help "Pointer to saved MRC data"
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-    EditNum $gQuarkFspTokenSpaceGuid_MrcDataLength, "MrcDataLength", HEX,
-        Help "Length of saved MRC data"
-             "Valid range: 0x00000000 ~ 0xFFFFFFFF"
-EndPage
-
-Page "FSP SiliconInit Settings"
-EndPage
-
diff --git a/soc/intel/quark/Fsp2_0Pei/Include/FspUpd.h b/soc/intel/quark/Fsp2_0Pei/Include/FspUpd.h
deleted file mode 100644
index 2410d7e..0000000
--- a/soc/intel/quark/Fsp2_0Pei/Include/FspUpd.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPUPD_H__
-#define __FSPUPD_H__
-
-#include <FspEas.h>
-
-#pragma pack(1)
-
-#define FSPT_UPD_SIGNATURE               0x545F4450554B5251        /* 'QRKUPD_T' */
-
-#define FSPM_UPD_SIGNATURE               0x4D5F4450554B5251        /* 'QRKUPD_M' */
-
-#define FSPS_UPD_SIGNATURE               0x535F4450554B5251        /* 'QRKUPD_S' */
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0Pei/Include/FspmUpd.h b/soc/intel/quark/Fsp2_0Pei/Include/FspmUpd.h
deleted file mode 100644
index ee83589..0000000
--- a/soc/intel/quark/Fsp2_0Pei/Include/FspmUpd.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPMUPD_H__
-#define __FSPMUPD_H__
-
-#include <FspUpd.h>
-
-#pragma pack(1)
-
-
-/** Fsp M Configuration
-**/
-typedef struct {
-
-/** Offset 0x0040 - RmuBaseAddress
-  RMU microcode binary base address in SPI flash'
-**/
-  UINT32                      RmuBaseAddress;
-
-/** Offset 0x0044 - RmuLength
-  RMU microcode binary length in bytes
-**/
-  UINT32                      RmuLength;
-
-/** Offset 0x0048 - SerialPortBaseAddress
-  Debug serial port base address set by BIOS. Zero disables debug serial output.
-**/
-  UINT32                      Reserved_48;
-
-/** Offset 0x004C - tRAS
-  ACT to PRE command period in picoseconds.
-**/
-  UINT32                      tRAS;
-
-/** Offset 0x0050 - tWTR
-  Delay from start of internal write transaction to internal read command in picoseconds.
-**/
-  UINT32                      tWTR;
-
-/** Offset 0x0054 - tRRD
-  ACT to ACT command period (JESD79 specific to page size 1K/2K) in picoseconds.
-**/
-  UINT32                      tRRD;
-
-/** Offset 0x0058 - tFAW
-  Four activate window (JESD79 specific to page size 1K/2K) in picoseconds.
-**/
-  UINT32                      tFAW;
-
-/** Offset 0x005C - Flags
-  Bitmap of MRC_FLAG_XXX: ECC_EN            BIT0, SCRAMBLE_EN       BIT1, MEMTEST_EN
-  BIT2, TOP_TREE_EN       BIT3  0b DDR "fly-by" topology else 1b DDR "tree"
-  topology, WR_ODT_EN         BIT4  If set ODR signal is asserted to DRAM devices
-  on writes.
-**/
-  UINT32                      Flags;
-
-/** Offset 0x0060 - DramWidth
-  0=x8, 1=x16, others=RESERVED.
-**/
-  UINT8                       DramWidth;
-
-/** Offset 0x0061 - DramSpeed
-  0=DDRFREQ_800, 1=DDRFREQ_1066, others=RESERVED. Only 533MHz SKU support 1066 memory.
-**/
-  UINT8                       DramSpeed;
-
-/** Offset 0x0062 - DramType
-  0=DDR3, 1=DDR3L, others=RESERVED.
-**/
-  UINT8                       DramType;
-
-/** Offset 0x0063 - RankMask
-  bit[0] RANK0_EN, bit[1] RANK1_EN, others=RESERVED.
-**/
-  UINT8                       RankMask;
-
-/** Offset 0x0064 - ChanMask
-  bit[0] CHAN0_EN, others=RESERVED.
-**/
-  UINT8                       ChanMask;
-
-/** Offset 0x0065 - ChanWidth
-  1=x16, others=RESERVED.
-**/
-  UINT8                       ChanWidth;
-
-/** Offset 0x0066 - AddrMode
-  0, 1, 2 (mode 2 forced if ecc enabled), others=RESERVED.
-**/
-  UINT8                       AddrMode;
-
-/** Offset 0x0067 - SrInt
-  1=1.95us, 2=3.9us, 3=7.8us, others=RESERVED. REFRESH_RATE.
-**/
-  UINT8                       SrInt;
-
-/** Offset 0x0068 - SrTemp
-  0=normal, 1=extended, others=RESERVED.
-**/
-  UINT8                       SrTemp;
-
-/** Offset 0x0069 - DramRonVal
-  0=34ohm, 1=40ohm, others=RESERVED. RON_VALUE Select MRS1.DIC driver impedance control.
-**/
-  UINT8                       DramRonVal;
-
-/** Offset 0x006A - DramRttNomVal
-  0=40ohm, 1=60ohm, 2=120ohm, others=RESERVED.
-**/
-  UINT8                       DramRttNomVal;
-
-/** Offset 0x006B - DramRttWrVal
-  0=off others=RESERVED.
-**/
-  UINT8                       DramRttWrVal;
-
-/** Offset 0x006C - SocRdOdtVal
-  0=off, 1=60ohm, 2=120ohm, 3=180ohm, others=RESERVED.
-**/
-  UINT8                       SocRdOdtVal;
-
-/** Offset 0x006D - SocWrRonVal
-  0=27ohm, 1=32ohm, 2=40ohm, others=RESERVED.
-**/
-  UINT8                       SocWrRonVal;
-
-/** Offset 0x006E - SocWrSlewRate
-  0=2.5V/ns, 1=4V/ns, others=RESERVED.
-**/
-  UINT8                       SocWrSlewRate;
-
-/** Offset 0x006F - DramDensity
-  0=512Mb, 1=1Gb, 2=2Gb, 3=4Gb, others=RESERVED.
-**/
-  UINT8                       DramDensity;
-
-/** Offset 0x0070 - tCL
-  DRAM CAS Latency in clocks
-**/
-  UINT8                       tCL;
-
-/** Offset 0x0071 - EccScrubInterval
-  ECC scrub interval in miliseconds 1..255 (0 works as feature disable
-**/
-  UINT8                       EccScrubInterval;
-
-/** Offset 0x0072 - EccScrubBlkSize
-  Number of 32B blocks read for ECC scrub 2..16
-**/
-  UINT8                       EccScrubBlkSize;
-
-/** Offset 0x0073 - SmmTsegSize
-  Size of the SMM region in 1 MiB chunks
-**/
-  UINT8                       SmmTsegSize;
-
-/** Offset 0x0074 - FspReservedMemoryLength
-  FSP reserved memory length in bytes
-**/
-  UINT32                      FspReservedMemoryLength;
-
-/** Offset 0x0078 - MrcDataPtr
-  Pointer to saved MRC data
-**/
-  UINT32                      MrcDataPtr;
-
-/** Offset 0x007C - MrcDataLength
-  Length of saved MRC data
-**/
-  UINT32                      MrcDataLength;
-
-/** Offset 0x0080
-**/
-  UINT32                      SerialPortPollForChar;
-
-/** Offset 0x0084
-**/
-  UINT32                      SerialPortReadChar;
-
-/** Offset 0x0088
-**/
-  UINT32                      SerialPortWriteChar;
-
-/** Offset 0x008C
-**/
-  UINT16                      UpdTerminator;
-} FSP_M_CONFIG;
-
-/** Fsp M UPD Configuration
-**/
-typedef struct {
-
-/** Offset 0x0000
-**/
-  FSP_UPD_HEADER              FspUpdHeader;
-
-/** Offset 0x0020
-**/
-  FSPM_ARCH_UPD               FspmArchUpd;
-
-/** Offset 0x0040
-**/
-  FSP_M_CONFIG                FspmConfig;
-} FSPM_UPD;
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0Pei/Include/FspsUpd.h b/soc/intel/quark/Fsp2_0Pei/Include/FspsUpd.h
deleted file mode 100644
index 125df14..0000000
--- a/soc/intel/quark/Fsp2_0Pei/Include/FspsUpd.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPSUPD_H__
-#define __FSPSUPD_H__
-
-#include <FspUpd.h>
-
-#pragma pack(1)
-
-
-/** Fsp S UPD Configuration
-**/
-typedef struct {
-
-/** Offset 0x0000
-**/
-  FSP_UPD_HEADER              FspUpdHeader;
-
-/** Offset 0x0020
-**/
-  UINT16                      UpdTerminator;
-} FSPS_UPD;
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0Pei/Include/FsptUpd.h b/soc/intel/quark/Fsp2_0Pei/Include/FsptUpd.h
deleted file mode 100644
index 1790dbc..0000000
--- a/soc/intel/quark/Fsp2_0Pei/Include/FsptUpd.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/** @file
-
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-  This file is automatically generated. Please do NOT modify !!!
-
-**/
-
-#ifndef __FSPTUPD_H__
-#define __FSPTUPD_H__
-
-#include <FspUpd.h>
-
-#pragma pack(1)
-
-
-/** Fsp T Common UPD
-**/
-typedef struct {
-
-/** Offset 0x0020
-**/
-  UINT8                       Revision;
-
-/** Offset 0x0021
-**/
-  UINT8                       Reserved[3];
-
-/** Offset 0x0024
-**/
-  UINT32                      MicrocodeRegionBase;
-
-/** Offset 0x0028
-**/
-  UINT32                      MicrocodeRegionLength;
-
-/** Offset 0x002C
-**/
-  UINT32                      CodeRegionBase;
-
-/** Offset 0x0030
-**/
-  UINT32                      CodeRegionLength;
-
-/** Offset 0x0034
-**/
-  UINT8                       Reserved1[12];
-} FSPT_COMMON_UPD;
-
-/** Fsp T UPD Configuration
-**/
-typedef struct {
-
-/** Offset 0x0000
-**/
-  FSP_UPD_HEADER              FspUpdHeader;
-
-/** Offset 0x0020
-**/
-  FSPT_COMMON_UPD             FsptCommonUpd;
-
-/** Offset 0x0040
-**/
-  UINT16                      UpdTerminator;
-} FSPT_UPD;
-
-#pragma pack()
-
-#endif
diff --git a/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_M.fd b/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_M.fd
deleted file mode 100644
index 3b16efb..0000000
--- a/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_M.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_S.fd b/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_S.fd
deleted file mode 100644
index 2ca95e1..0000000
--- a/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_S.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_T.fd b/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_T.fd
deleted file mode 100644
index 03e2b10..0000000
--- a/soc/intel/quark/Fsp2_0Pei/RELEASE/FSP_T.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/Fsp2_0Pei/RELEASE/QUARK.fd b/soc/intel/quark/Fsp2_0Pei/RELEASE/QUARK.fd
deleted file mode 100644
index d50a654..0000000
--- a/soc/intel/quark/Fsp2_0Pei/RELEASE/QUARK.fd
+++ /dev/null
Binary files differ
diff --git a/soc/intel/quark/QuarkFsp.patch b/soc/intel/quark/QuarkFsp.patch
deleted file mode 100644
index fee548f..0000000
--- a/soc/intel/quark/QuarkFsp.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BuildFsp2_0.sh b/BuildFsp2_0.sh
-index 8910928..ca96446 100755
---- a/BuildFsp2_0.sh
-+++ b/BuildFsp2_0.sh
-@@ -22,7 +22,7 @@ PLATFORM_NAME=QuarkFsp2_0
- BIN_SUB_DIR=Fsp2_0
- FSP_PKG_CONF_NAME=QuarkFspPkgConfig
- FSP_PKG_EXT_CONF_NAME=QuarkFspPkgExtConfig
--TOOL_CHAIN=GCC48
-+TOOL_CHAIN=COREBOOT
- Edksetup=edksetup.sh
- FSP_T_UPD_GUID=34686CA3-34F9-4901-B82A-BA630F0714C6
- FSP_M_UPD_GUID=39A250DB-E465-4DD1-A2AC-E2BD3C0E2385
-diff --git a/BuildFsp2_0Pei.sh b/BuildFsp2_0Pei.sh
-index 3f447e1..f266572 100755
---- a/BuildFsp2_0Pei.sh
-+++ b/BuildFsp2_0Pei.sh
-@@ -22,7 +22,7 @@ PLATFORM_NAME=QuarkFsp2_0Pei
- BIN_SUB_DIR=Fsp2_0Pei
- FSP_PKG_CONF_NAME=QuarkFspPkgConfig
- FSP_PKG_EXT_CONF_NAME=QuarkFspPkgExtConfig
--TOOL_CHAIN=GCC48
-+TOOL_CHAIN=COREBOOT
- Edksetup=edksetup.sh
- FSP_T_UPD_GUID=34686CA3-34F9-4901-B82A-BA630F0714C6
- FSP_M_UPD_GUID=39A250DB-E465-4DD1-A2AC-E2BD3C0E2385
-diff --git a/Library/Fsp2_0Lib/Peim.c b/Library/Fsp2_0Lib/Peim.c
-index 14d0f99..c9a531a 100644
---- a/Library/Fsp2_0Lib/Peim.c
-+++ b/Library/Fsp2_0Lib/Peim.c
-@@ -13,6 +13,7 @@
- **/

- 

- #include <PiPei.h>

-+#include <Library/BaseMemoryLib.h>

- #include <Library/DebugLib.h>

- #include <Library/FspCommonLib.h>

- #include <Library/FspLib.h>

-@@ -53,3 +54,17 @@ VOID FspInstallPeiMemory(EFI_PHYSICAL_ADDRESS FspReservedArea,
-   Status = PeiServicesInstallPeiMemory (FspReservedArea, ReservedBytes);

-   ASSERT_EFI_ERROR (Status);

- }

-+

-+#if !((defined(MDE_CPU_ARM) || defined(MDE_CPU_AARCH64)) && defined(__GNUC__))

-+/** The memset function copies the value of c (converted to an unsigned char)

-+    into each of the first n characters of the object pointed to by s.

-+

-+    @return   The memset function returns the value of s.

-+**/

-+void *

-+memset(void *s, int c, size_t n)

-+{

-+  return SetMem( s, (UINTN)n, (UINT8)c);

-+}

-+#endif

-+

diff --git a/soc/intel/quark/README.txt b/soc/intel/quark/README.txt
deleted file mode 100644
index ed0e6cc..0000000
--- a/soc/intel/quark/README.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-These binaries are the result of compiling the QuarkFsp sources and
-provided as a convenience since not everybody wants to setup a working
-edk2 tree.
-Since the sources, as well as the edk2 sources, are BSD-licensed,
-redistribution is not an issue.
-
-These binaries are untested and come with no warranty!
-
-Instructions to build your own binaries, using the coreboot toolchain:
-
-$ git clone http://github.com/tianocore/edk2
-$ cd edk2
-$ git checkout a5cd3bb037cf87ecda0a5c8cd8a3eda722591b70
-$ git clone https://review.gerrithub.io/LeeLeahy/quarkfsp QuarkFspPkg
-$ (cd QuarkFspPkg; patch -p1 -i $path/to/this/directory/QuarkFsp.patch)
-$ . edksetup.sh
-$ cat $path/to/your/coreboot/toolchain/share/edk2config/tools_def.txt >> Conf/tools_def.txt
-
-$ # builds the debug images
-$ QuarkFspPkg/BuildFsp2_0.sh -d32
-$ QuarkFspPkg/BuildFsp2_0Pei.sh -d32
-
-$ # builds the release images
-$ QuarkFspPkg/BuildFsp2_0.sh -r32
-$ QuarkFspPkg/BuildFsp2_0Pei.sh -r32