summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/quark/Kconfig7
-rw-r--r--src/soc/intel/quark/include/soc/storage_test.h2
-rw-r--r--src/soc/intel/quark/sd.c4
-rw-r--r--src/soc/intel/quark/storage_test.c4
4 files changed, 9 insertions, 8 deletions
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 7f95b7193a..cb0a1bcec9 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -311,11 +311,12 @@ config C_ENV_BOOTBLOCK_SIZE
config STORAGE_TEST
bool "Test SD/MMC/eMMC card or device access"
default n
- select DRIVERS_STORAGE
+ select COMMONLIB_STORAGE
select SDHCI_CONTROLLER
help
- Read block 0 from each parition of the storage device. User must
- also enable one or both of DRIVERS_STORAGE_SD or DRIVERS_STORAGE_MMC.
+ Read block 0 from each parition of the storage device. User
+ must also enable one or both of COMMONLIB_STORAGE_SD or
+ COMMONLIB_STORAGE_MMC.
config STORAGE_LOG
bool "Log and display SD/MMC commands"
diff --git a/src/soc/intel/quark/include/soc/storage_test.h b/src/soc/intel/quark/include/soc/storage_test.h
index 6e970ccf3d..cae296fe59 100644
--- a/src/soc/intel/quark/include/soc/storage_test.h
+++ b/src/soc/intel/quark/include/soc/storage_test.h
@@ -16,9 +16,9 @@
#ifndef __STORAGE_TEST_H__
#define __STORAGE_TEST_H__
+#include <commonlib/sd_mmc_ctrlr.h>
#include <device/device.h>
#include <device/pci.h>
-#include <device/sd_mmc_ctrlr.h>
#include <timer.h>
#ifdef __SIMPLE_DEVICE__
diff --git a/src/soc/intel/quark/sd.c b/src/soc/intel/quark/sd.c
index 7b9600193c..e41afa4acd 100644
--- a/src/soc/intel/quark/sd.c
+++ b/src/soc/intel/quark/sd.c
@@ -14,12 +14,12 @@
*/
#include <arch/io.h>
+#include <commonlib/sdhci.h>
+#include <commonlib/storage.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include <device/sdhci.h>
-#include <device/storage.h>
#include <soc/storage_test.h>
static void init(struct device *dev)
diff --git a/src/soc/intel/quark/storage_test.c b/src/soc/intel/quark/storage_test.c
index 4c83dbed4a..507fa9260c 100644
--- a/src/soc/intel/quark/storage_test.c
+++ b/src/soc/intel/quark/storage_test.c
@@ -18,9 +18,9 @@
#include <assert.h>
#include <cbmem.h>
#include <commonlib/cbmem_id.h>
+#include <commonlib/sdhci.h>
+#include <commonlib/storage.h>
#include <console/console.h>
-#include <device/sdhci.h>
-#include <device/storage.h>
#include <lib.h>
#include <soc/iomap.h>
#include <soc/pci_devs.h>