Lee Leahy has uploaded a new change for review. ( https://review.coreboot.org/19006 )
Change subject: include/device: Move mmc.h and sdhci.h into include/device ......................................................................
include/device: Move mmc.h and sdhci.h into include/device
Move include files from drivers/storage into include/device.
TEST=None
Change-Id: Ief907499420dfe0b217494d1a4981bb9b93bee91 Signed-off-by: Lee Leahy Leroy.P.Leahy@intel.com --- M src/drivers/storage/mmc.c M src/drivers/storage/sdhci.c R src/include/device/mmc.h R src/include/device/sdhci.h 4 files changed, 16 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/19006/1
diff --git a/src/drivers/storage/mmc.c b/src/drivers/storage/mmc.c index 2e1516b..9338f8f 100644 --- a/src/drivers/storage/mmc.c +++ b/src/drivers/storage/mmc.c @@ -3,6 +3,7 @@ * Andy Fleming * * Copyright 2013 Google Inc. All rights reserved. + * Copyrigit 2017 Intel Corporation * * Based vaguely on the Linux code * @@ -21,12 +22,12 @@ */
#include <assert.h> +#include <device/mmc.h> #include <endian.h> #include <libpayload.h> #include <stdint.h>
#include "config.h" -#include "drivers/storage/mmc.h"
/* Set block count limit because of 16 bit register limit on some hardware*/ #ifndef CONFIG_SYS_MMC_MAX_BLK_COUNT diff --git a/src/drivers/storage/sdhci.c b/src/drivers/storage/sdhci.c index d2a0991..f655849 100644 --- a/src/drivers/storage/sdhci.c +++ b/src/drivers/storage/sdhci.c @@ -2,6 +2,8 @@ * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen leiwen@marvell.com * + * Copyrigit 2017 Intel Corporation + * * See file CREDITS for list of people who contributed to this * project. * @@ -19,11 +21,11 @@ * Murray.Jensen@cmst.csiro.au, 27-Jan-01. */
+#include <device/mmc.h> +#include <device/sdhci.h> #include <libpayload.h>
#include "drivers/storage/blockdev.h" -#include "drivers/storage/mmc.h" -#include "drivers/storage/sdhci.h"
static void sdhci_reset(SdhciHost *host, u8 mask) { diff --git a/src/drivers/storage/mmc.h b/src/include/device/mmc.h similarity index 98% rename from src/drivers/storage/mmc.h rename to src/include/device/mmc.h index a7448e3..67e9962 100644 --- a/src/drivers/storage/mmc.h +++ b/src/include/device/mmc.h @@ -3,6 +3,7 @@ * Andy Fleming * * Copyright 2013 Google Inc. All rights reserved. + * Copyrigit 2017 Intel Corporation * * Based (loosely) on the Linux code * @@ -20,8 +21,8 @@ * GNU General Public License for more details. */
-#ifndef __DRIVERS_STORAGE_MMC_H__ -#define __DRIVERS_STORAGE_MMC_H__ +#ifndef __DEVICE_MMC_H__ +#define __DEVICE_MMC_H__
#include "drivers/storage/blockdev.h" #include "drivers/storage/bouncebuf.h" @@ -332,4 +333,4 @@ while (__mmc_trace) { printf(format); break; } #define mmc_error(format...) printf("mmc: ERROR: " format)
-#endif /* __DRIVERS_STORAGE_MMC_H__ */ +#endif /* __DEVICE_MMC_H__ */ diff --git a/src/drivers/storage/sdhci.h b/src/include/device/sdhci.h similarity index 98% rename from src/drivers/storage/sdhci.h rename to src/include/device/sdhci.h index 3ba74a0..42e50c3 100644 --- a/src/drivers/storage/sdhci.h +++ b/src/include/device/sdhci.h @@ -2,6 +2,8 @@ * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen leiwen@marvell.com * + * Copyrigit 2017 Intel Corporation + * * See file CREDITS for list of people who contributed to this * project. * @@ -18,12 +20,11 @@ * Back ported to the 8xx platform (from the 8260 platform) by * Murray.Jensen@cmst.csiro.au, 27-Jan-01. */ -#ifndef __DRIVER_STORAGE_SDHCI_H__ -#define __DRIVER_STORAGE_SDHCI_H__ +#ifndef __DEVICE_SDHCI_H__ +#define __DEVICE_SDHCI_H__
+#include <device/mmc.h> #include <libpayload.h> - -#include "mmc.h"
/* * Controller registers @@ -361,4 +362,4 @@ int clock_max, int clock_base);
-#endif +#endif /* __DEVICE_SDHCI_H__ */
-
Lee Leahy (Code Review)