summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig4
-rw-r--r--src/arch/arm64/Makefile.mk1
-rw-r--r--src/arch/arm64/dma.c9
-rw-r--r--src/arch/ppc64/include/arch/hlt.h5
-rw-r--r--src/arch/riscv/include/arch/hlt.h5
-rw-r--r--src/arch/x86/Makefile.mk1
-rw-r--r--src/arch/x86/dma.c8
-rw-r--r--src/commonlib/bsd/include/commonlib/bsd/stdlib.h57
-rw-r--r--src/commonlib/include/commonlib/stdlib.h46
-rw-r--r--src/commonlib/storage/bouncebuf.c2
-rw-r--r--src/commonlib/storage/sdhci.c7
-rw-r--r--src/drivers/intel/fsp2_0/silicon_init.c2
-rw-r--r--src/include/halt.h11
-rw-r--r--src/include/stdlib.h6
-rw-r--r--src/lib/device_tree.c1
-rw-r--r--src/lib/fit.c2
-rw-r--r--src/lib/halt.c2
-rw-r--r--src/lib/libgcov.c1
-rw-r--r--src/soc/intel/xeon_sp/acpi.c2
-rw-r--r--src/soc/intel/xeon_sp/numa.c1
-rw-r--r--src/soc/mediatek/common/pcie.c2
-rw-r--r--src/soc/mediatek/mt8195/pcie.c1
22 files changed, 100 insertions, 76 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 2afb9db177..c895492021 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -4,10 +4,6 @@ mainmenu "coreboot configuration"
menu "General setup"
-config COREBOOT_BUILD
- bool
- default y
-
config LOCALVERSION
string "Local version string"
help
diff --git a/src/arch/arm64/Makefile.mk b/src/arch/arm64/Makefile.mk
index 538d254ace..2986397e51 100644
--- a/src/arch/arm64/Makefile.mk
+++ b/src/arch/arm64/Makefile.mk
@@ -119,6 +119,7 @@ ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += bl31.c
ramstage-y += transition.c transition_asm.S
ramstage-$(CONFIG_PAYLOAD_FIT_SUPPORT) += fit_payload.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
+ramstage-y += dma.c
rmodules_arm64-y += memset.S
rmodules_arm64-y += memcpy.S
diff --git a/src/arch/arm64/dma.c b/src/arch/arm64/dma.c
new file mode 100644
index 0000000000..cdeb50fa09
--- /dev/null
+++ b/src/arch/arm64/dma.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <console/console.h>
+#include <stdlib.h>
+
+int dma_coherent(const void *ptr)
+{
+ return 0;
+}
diff --git a/src/arch/ppc64/include/arch/hlt.h b/src/arch/ppc64/include/arch/hlt.h
index 397b3ccfbb..2839805f21 100644
--- a/src/arch/ppc64/include/arch/hlt.h
+++ b/src/arch/ppc64/include/arch/hlt.h
@@ -1,7 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef ARCH_HLT_H
+#define ARCH_HLT_H
+
static __always_inline void hlt(void)
{
while (1)
;
}
+
+#endif /* ARCH_HLT_H */
diff --git a/src/arch/riscv/include/arch/hlt.h b/src/arch/riscv/include/arch/hlt.h
index bdefbb5de7..b2643fdfdf 100644
--- a/src/arch/riscv/include/arch/hlt.h
+++ b/src/arch/riscv/include/arch/hlt.h
@@ -1,6 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef ARCH_HLT_H
+#define ARCH_HLT_H
+
static __always_inline void hlt(void)
{
while (1);
}
+
+#endif /* ARCH_HLT_H */
diff --git a/src/arch/x86/Makefile.mk b/src/arch/x86/Makefile.mk
index 04a0e58dbf..19945465bc 100644
--- a/src/arch/x86/Makefile.mk
+++ b/src/arch/x86/Makefile.mk
@@ -261,6 +261,7 @@ ramstage-y += ebda.c
ramstage-y += exception.c
ramstage-y += idt.S
ramstage-$(CONFIG_IOAPIC) += ioapic.c
+ramstage-y += dma.c
ramstage-y += memcpy.c
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += memmove_32.c
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_64) += memmove_64.S
diff --git a/src/arch/x86/dma.c b/src/arch/x86/dma.c
new file mode 100644
index 0000000000..b39ac2ce30
--- /dev/null
+++ b/src/arch/x86/dma.c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <stdlib.h>
+
+int dma_coherent(const void *ptr)
+{
+ return 1;
+}
diff --git a/src/commonlib/bsd/include/commonlib/bsd/stdlib.h b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h
new file mode 100644
index 0000000000..c497b5c7fd
--- /dev/null
+++ b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+#ifndef __COMMONLIB_STDLIB_H__
+#define __COMMONLIB_STDLIB_H__
+
+#include <stddef.h>
+#include <string.h>
+
+#ifdef __COREBOOT__
+#include <console/console.h>
+#else
+#include <stdio.h>
+#define printk(level, ...) printf(__VA_ARGS__)
+#endif
+
+void __noreturn abort(void);
+void free(void *ptr);
+void *malloc(size_t size);
+void *calloc(size_t nitems, size_t size);
+void *memalign(size_t align, size_t size);
+int dma_coherent(const void *ptr);
+
+static inline void *xmalloc_work(size_t size, const char *file, const char *func, int line)
+{
+ void *ret = malloc(size);
+ if (!ret && size) {
+ printk(BIOS_ERR, "%s:%d %s(): Failed to malloc %zu bytes\n",
+ file, line, func, size);
+ abort();
+ }
+ return ret;
+}
+#define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __LINE__)
+
+static inline void *xzalloc_work(size_t size, const char *file, const char *func, int line)
+{
+ void *ret = xmalloc_work(size, file, func, line);
+ memset(ret, 0, size);
+ return ret;
+}
+#define xzalloc(size) xzalloc_work((size), __FILE__, __func__, __LINE__)
+
+static inline void *xmemalign_work(size_t align, size_t size, const char *file,
+ const char *func, int line)
+{
+ void *ret = memalign(align, size);
+ if (!ret && size) {
+ printk(BIOS_ERR, "%s:%d %s(): "
+ "Failed to memalign %zu bytes with %zu alignment.\n",
+ file, line, func, size, align);
+ abort();
+ }
+ return ret;
+}
+#define xmemalign(align, size) xmemalign_work((align), (size), __FILE__, __func__, __LINE__)
+
+#endif /* __COMMONLIB_STDLIB_H__ */
diff --git a/src/commonlib/include/commonlib/stdlib.h b/src/commonlib/include/commonlib/stdlib.h
deleted file mode 100644
index 374fe16dd9..0000000000
--- a/src/commonlib/include/commonlib/stdlib.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-
-#ifndef __COMMONLIB_STDLIB_H__
-#define __COMMONLIB_STDLIB_H__
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if CONFIG(COREBOOT_BUILD)
-#include <console/console.h>
-#include <halt.h>
-#define HALT(x) halt()
-#else
-#include <stdio.h>
-#define printk(level, ...) printf(__VA_ARGS__)
-#define HALT(x) abort()
-#endif
-
-static inline void *xmalloc_work(size_t size, const char *file,
- const char *func, int line)
-{
- void *ret = malloc(size);
- if (!ret && size) {
- printk(BIOS_ERR, "%s/%s/line %d: Failed to malloc %zu bytes\n",
- file, func, line, size);
- while (1)
- HALT(1);
- }
- return ret;
-}
-#define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __LINE__)
-
-static inline void *xzalloc_work(size_t size, const char *file,
- const char *func, int line)
-{
- void *ret = xmalloc_work(size, file, func, line);
- memset(ret, 0, size);
- return ret;
-}
-#define xzalloc(size) xzalloc_work((size), __FILE__, __func__, __LINE__)
-
-void *dma_malloc(size_t size);
-int dma_coherent(void *ptr);
-
-#endif /* __COMMONLIB_STDLIB_H__ */
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;
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index ab51571903..08258d3f26 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -5,7 +5,7 @@
#include <cbfs.h>
#include <cbmem.h>
#include <commonlib/fsp.h>
-#include <commonlib/stdlib.h>
+#include <stdlib.h>
#include <console/console.h>
#include <fsp/api.h>
#include <fsp/util.h>
diff --git a/src/include/halt.h b/src/include/halt.h
index a00975ba2d..cb691a202b 100644
--- a/src/include/halt.h
+++ b/src/include/halt.h
@@ -3,10 +3,13 @@
#ifndef __HALT_H__
#define __HALT_H__
-/**
- * halt the system reliably
- */
-void __noreturn halt(void);
+#include <arch/hlt.h>
+#include <commonlib/bsd/stdlib.h>
+
+static inline __noreturn void halt(void)
+{
+ abort();
+}
/* Power off the system. */
void poweroff(void);
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 8fa5d20ab6..8e62f27305 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -3,11 +3,7 @@
#ifndef STDLIB_H
#define STDLIB_H
+#include <commonlib/bsd/stdlib.h>
#include <stddef.h>
-void *memalign(size_t boundary, size_t size);
-void *malloc(size_t size);
-void *calloc(size_t nitems, size_t size);
-void free(void *ptr);
-
#endif /* STDLIB_H */
diff --git a/src/lib/device_tree.c b/src/lib/device_tree.c
index ab9c937b38..a36798619b 100644
--- a/src/lib/device_tree.c
+++ b/src/lib/device_tree.c
@@ -2,7 +2,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <assert.h>
-#include <commonlib/stdlib.h>
#include <console/console.h>
#include <ctype.h>
#include <device_tree.h>
diff --git a/src/lib/fit.c b/src/lib/fit.c
index 9db083e21d..46ac972128 100644
--- a/src/lib/fit.c
+++ b/src/lib/fit.c
@@ -12,7 +12,7 @@
#include <memrange.h>
#include <fit.h>
#include <boardid.h>
-#include <commonlib/stdlib.h>
+#include <stdlib.h>
#include <types.h>
static struct list_node image_nodes;
diff --git a/src/lib/halt.c b/src/lib/halt.c
index 8d9e5c84a6..441f5bb786 100644
--- a/src/lib/halt.c
+++ b/src/lib/halt.c
@@ -3,7 +3,7 @@
#include <arch/hlt.h>
#include <halt.h>
-void halt(void)
+void __noreturn abort(void)
{
while (1)
hlt();
diff --git a/src/lib/libgcov.c b/src/lib/libgcov.c
index b0c816181d..61304ff4e3 100644
--- a/src/lib/libgcov.c
+++ b/src/lib/libgcov.c
@@ -23,7 +23,6 @@ permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
*/
-#define __COREBOOT__
#ifdef __COREBOOT__
#include <stdlib.h>
#include <string.h>
diff --git a/src/soc/intel/xeon_sp/acpi.c b/src/soc/intel/xeon_sp/acpi.c
index 11913d354c..de63ced7b6 100644
--- a/src/soc/intel/xeon_sp/acpi.c
+++ b/src/soc/intel/xeon_sp/acpi.c
@@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <assert.h>
-#include <commonlib/stdlib.h>
#include <intelblocks/acpi.h>
#include <soc/chip_common.h>
#include <soc/pci_devs.h>
#include <soc/util.h>
#include <stdint.h>
+#include <stdlib.h>
#include "chip.h"
diff --git a/src/soc/intel/xeon_sp/numa.c b/src/soc/intel/xeon_sp/numa.c
index 23f52c625f..62657dce1f 100644
--- a/src/soc/intel/xeon_sp/numa.c
+++ b/src/soc/intel/xeon_sp/numa.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h>
-#include <commonlib/stdlib.h>
#include <device/device.h>
#include <device/pci_ops.h>
#include <device/pci.h>
diff --git a/src/soc/mediatek/common/pcie.c b/src/soc/mediatek/common/pcie.c
index b3903a528a..10bece94d3 100644
--- a/src/soc/mediatek/common/pcie.c
+++ b/src/soc/mediatek/common/pcie.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <boot/coreboot_tables.h>
-#include <commonlib/stdlib.h>
#include <console/console.h>
#include <device/device.h>
#include <device/mmio.h>
@@ -15,7 +14,6 @@
#include <soc/pcie.h>
#include <soc/pcie_common.h>
#include <soc/soc_chip.h>
-#include <stdlib.h>
#include <types.h>
#define PCIE_SETTING_REG 0x80
diff --git a/src/soc/mediatek/mt8195/pcie.c b/src/soc/mediatek/mt8195/pcie.c
index c9f8ecd08b..cb36f8db0c 100644
--- a/src/soc/mediatek/mt8195/pcie.c
+++ b/src/soc/mediatek/mt8195/pcie.c
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only OR MIT */
-#include <commonlib/stdlib.h>
#include <console/console.h>
#include <device/mmio.h>
#include <device/resource.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 03:04:58 +0000