aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/intel/galileo
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2017-05-08 16:56:03 -0700
committerLee Leahy <leroy.p.leahy@intel.com>2017-05-12 18:20:33 +0200
commit48dbc663d75e6b7e45e50cd099acb88b35e65a0a (patch)
treef60c19148b8be447c5350f939ac9d832e379579c /src/mainboard/intel/galileo
parentf542aca0908ead68314a6d9603dde8849abcff19 (diff)
commonlib: Move drivers/storage into commonlib/storage
Move drivers/storage into commonlib/storage to enable access by libpayload and indirectly by payloads. * Remove SD/MMC specific include files from include/device * Remove files from drivers/storage * Add SD/MMC specific include files to commonlib/include * Add files to commonlib/storage * Fix header file references * Add subdir entry in commonlib/Makefile.inc to build the SD/MMC driver * Add Kconfig source for commonlib/storage * Rename *DEVICE* to *COMMONLIB* * Rename *DRIVERS_STORAGE* to *COMMONLIB_STORAGE* TEST=Build and run on Galileo Gen2 Change-Id: I4339e4378491db9a0da1f2dc34e1906a5ba31ad6 Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com> Reviewed-on: https://review.coreboot.org/19672 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/intel/galileo')
-rw-r--r--src/mainboard/intel/galileo/Kconfig2
-rw-r--r--src/mainboard/intel/galileo/Makefile.inc4
-rw-r--r--src/mainboard/intel/galileo/sd.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index 4ae412f5d6..12cbb6c849 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -182,7 +182,7 @@ config FMDFILE
config ENABLE_SD_TESTING
bool "Enable SD card testing"
default y
- select DRIVERS_STORAGE_SD
+ select COMMONLIB_STORAGE_SD
select SDHC_DEBUG
select STORAGE_LOG
select STORAGE_TEST
diff --git a/src/mainboard/intel/galileo/Makefile.inc b/src/mainboard/intel/galileo/Makefile.inc
index 25f672e5f7..60c0ee0cd8 100644
--- a/src/mainboard/intel/galileo/Makefile.inc
+++ b/src/mainboard/intel/galileo/Makefile.inc
@@ -26,7 +26,7 @@ verstage-$(CONFIG_VBOOT) += vboot.c
romstage-y += gpio.c
romstage-y += reg_access.c
-romstage-$(CONFIG_DRIVERS_STORAGE_SD) += sd.c
+romstage-$(CONFIG_COMMONLIB_STORAGE_SD) += sd.c
romstage-$(CONFIG_VBOOT) += vboot.c
postcar-y += gpio.c
@@ -34,4 +34,4 @@ postcar-y += reg_access.c
ramstage-y += gpio.c
ramstage-y += reg_access.c
-ramstage-$(CONFIG_DRIVERS_STORAGE_SD) += sd.c
+ramstage-$(CONFIG_COMMONLIB_STORAGE_SD) += sd.c
diff --git a/src/mainboard/intel/galileo/sd.c b/src/mainboard/intel/galileo/sd.c
index d13b318679..0c0e58b7c6 100644
--- a/src/mainboard/intel/galileo/sd.c
+++ b/src/mainboard/intel/galileo/sd.c
@@ -13,9 +13,9 @@
* GNU General Public License for more details.
*/
+#include <commonlib/sdhci.h>
+#include <commonlib/storage.h>
#include <console/console.h>
-#include <device/sdhci.h>
-#include <device/storage.h>
void soc_sd_mmc_controller_quirks(struct sd_mmc_ctrlr *ctrlr)
{