GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commonlib/storage/pci_sdhci.c: Drop CAR_GLOBAL_MIGRATION support 

Change-Id: Idfbc0cf24000c361c9272fe0f61797de999c9277
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37052
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-11-20 22:13:02 +01:00 committed by Patrick Georgi
parent 5d70978920
commit eb501f0543
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/commonlib/storage/pci_sdhci.c
View File

@ -12,7 +12,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/early_variables.h>
#include <commonlib/sdhci.h> #include <commonlib/sdhci.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
@ -32,22 +31,22 @@ int sdhci_controller_init(struct sdhci_ctrlr *sdhci_ctrlr, void *ioaddr)
struct sd_mmc_ctrlr *new_mem_sdhci_controller(void *ioaddr) struct sd_mmc_ctrlr *new_mem_sdhci_controller(void *ioaddr)
{ {
static bool sdhci_init_done CAR_GLOBAL; static bool sdhci_init_done;
static struct sdhci_ctrlr sdhci_ctrlr CAR_GLOBAL; static struct sdhci_ctrlr sdhci_ctrlr;
if (car_get_var(sdhci_init_done) == true) { if (sdhci_init_done == true) {
sdhc_error("Error: SDHCI is already initialized.\n"); sdhc_error("Error: SDHCI is already initialized.\n");
return NULL; return NULL;
} }
if (sdhci_controller_init(car_get_var_ptr(&sdhci_ctrlr), ioaddr)) { if (sdhci_controller_init(&sdhci_ctrlr, ioaddr)) {
sdhc_error("Error: SDHCI initialization failed.\n"); sdhc_error("Error: SDHCI initialization failed.\n");
return NULL; return NULL;
} }
car_set_var(sdhci_init_done, true); sdhci_init_done = true;
return car_get_var_ptr(&sdhci_ctrlr.sd_mmc_ctrlr); return &sdhci_ctrlr.sd_mmc_ctrlr;
} }
struct sd_mmc_ctrlr *new_pci_sdhci_controller(pci_devfn_t dev) struct sd_mmc_ctrlr *new_pci_sdhci_controller(pci_devfn_t dev)