summaryrefslogtreecommitdiff
path: root/src/commonlib/storage
diff options
context:
space:
mode:
authorMaximilian Brune <maximilian.brune@9elements.com>2023-09-16 19:49:39 +0200
committerLean Sheng Tan <sheng.tan@9elements.com>2024-03-15 10:09:43 +0000
commitb3e336c51d02c678a4d15573f4edb5834f39bb36 (patch)
treece9cfaa161472fa337f9ed46d1e701cb15692fb2 /src/commonlib/storage
parent8627112424796e37f4b20e176cc7524c0db828bc (diff)
treewide: Move stdlib.h to commonlib
This patch moves commonlib/stdlib.h -> commonlib/bsd/stdlib.h, since all code is BSD licensed anyway. It also moves some code from libpayloads stdlib.h to commonlib/bsd/stdlib.h so that it can be shared with coreboot. This is useful for a subsequent commit that adds devicetree.c into commonlib. Also we don't support DMA on arm platforms in coreboot (only libpayload) therefore `dma_malloc()` has been removed and `dma_coherent()` has been moved to architecture specific functions. Any architecture that tries to use `dma_coherent()` now will get a compile time error. In order to not break current platforms like mb/google/herobrine which make use of the commonlib/storage/sdhci.c controller which in turn uses `dma_coherent` a stub has been added to arch/arm64/dma.c. Signed-off-by: Maximilian Brune <maximilian.brune@9elements.com> Change-Id: I3a7ab0d1ddcc7ce9af121a61b4d4eafc9e563a8a Reviewed-on: https://review.coreboot.org/c/coreboot/+/77969 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/commonlib/storage')
-rw-r--r--src/commonlib/storage/bouncebuf.c2
-rw-r--r--src/commonlib/storage/sdhci.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/commonlib/storage/bouncebuf.c b/src/commonlib/storage/bouncebuf.c
index 9edf41aed8..a0a379e1cd 100644
--- a/src/commonlib/storage/bouncebuf.c
+++ b/src/commonlib/storage/bouncebuf.c
@@ -7,7 +7,7 @@
#include "bouncebuf.h"
#include "storage.h"
#include <string.h>
-#include <commonlib/stdlib.h>
+#include <commonlib/bsd/stdlib.h>
static int addr_aligned(struct bounce_buffer *state)
{
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index 410d4fcc85..fbc6c985a5 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -6,7 +6,7 @@
#include "bouncebuf.h"
#include <commonlib/sd_mmc_ctrlr.h>
#include <commonlib/sdhci.h>
-#include <commonlib/stdlib.h>
+#include <commonlib/bsd/stdlib.h>
#include <commonlib/storage.h>
#include <delay.h>
#include <endian.h>
@@ -21,11 +21,6 @@
|| (CONFIG(SDHCI_ADMA_IN_ROMSTAGE) && ENV_SEPARATE_ROMSTAGE) \
|| ENV_POSTCAR || ENV_RAMSTAGE)
-__weak void *dma_malloc(size_t length_in_bytes)
-{
- return malloc(length_in_bytes);
-}
-
void sdhci_reset(struct sdhci_ctrlr *sdhci_ctrlr, u8 mask)
{
struct stopwatch sw;