diff options
author | Lee Leahy <leroy.p.leahy@intel.com> | 2017-05-08 16:56:03 -0700 |
---|---|---|
committer | Lee Leahy <leroy.p.leahy@intel.com> | 2017-05-12 18:20:33 +0200 |
commit | 48dbc663d75e6b7e45e50cd099acb88b35e65a0a (patch) | |
tree | f60c19148b8be447c5350f939ac9d832e379579c /src/drivers/storage/pci_sdhci.c | |
parent | f542aca0908ead68314a6d9603dde8849abcff19 (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/drivers/storage/pci_sdhci.c')
-rw-r--r-- | src/drivers/storage/pci_sdhci.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/src/drivers/storage/pci_sdhci.c b/src/drivers/storage/pci_sdhci.c deleted file mode 100644 index 1d3974eaea..0000000000 --- a/src/drivers/storage/pci_sdhci.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * Copyright 2017 Intel Corporation - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <rules.h> -#if ENV_RAMSTAGE -#define __SIMPLE_DEVICE__ 1 -#endif - -#include <assert.h> -#include <console/console.h> -#include <device/pci.h> -#include <device/sdhci.h> -#include "sd_mmc.h" -#include "storage.h" -#include <string.h> - -/* Initialize an SDHCI port */ -int sdhci_controller_init(struct sdhci_ctrlr *sdhci_ctrlr, void *ioaddr) -{ - memset(sdhci_ctrlr, 0, sizeof(*sdhci_ctrlr)); - sdhci_ctrlr->ioaddr = ioaddr; - return add_sdhci(sdhci_ctrlr); -} - -struct sd_mmc_ctrlr *new_mem_sdhci_controller(void *ioaddr) -{ - struct sdhci_ctrlr *sdhci_ctrlr; - - sdhci_ctrlr = malloc(sizeof(*sdhci_ctrlr)); - if (sdhci_ctrlr == NULL) - return NULL; - - if (sdhci_controller_init(sdhci_ctrlr, ioaddr)) { - free(sdhci_ctrlr); - sdhci_ctrlr = NULL; - } - return &sdhci_ctrlr->sd_mmc_ctrlr; -} - -struct sd_mmc_ctrlr *new_pci_sdhci_controller(uint32_t dev) -{ - uint32_t addr; - - addr = pci_read_config32(dev, PCI_BASE_ADDRESS_0); - if (addr == ((uint32_t)~0)) { - sdhc_error("Error: PCI SDHCI not found\n"); - return NULL; - } - - addr &= ~0xf; - return new_mem_sdhci_controller((void *)addr); -} |