summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/arch/arm/boot.c2
-rw-r--r--src/arch/arm64/boot.c2
-rw-r--r--src/arch/riscv/boot.c2
-rw-r--r--src/arch/x86/boot/boot.c2
-rw-r--r--src/arch/x86/lib/cbfs_and_run.c2
-rw-r--r--src/cpu/x86/mirror_payload.c2
-rw-r--r--src/include/program_loading.h (renamed from src/include/payload_loader.h)29
-rw-r--r--src/include/ramstage_loader.h34
-rw-r--r--src/lib/hardwaremain.c2
-rw-r--r--src/lib/loaders/cbfs_payload_loader.c2
-rw-r--r--src/lib/loaders/cbfs_ramstage_loader.c2
-rw-r--r--src/lib/loaders/load_and_run_payload.c2
-rw-r--r--src/lib/loaders/load_and_run_ramstage.c2
-rw-r--r--src/lib/selfboot.c2
-rw-r--r--src/vendorcode/google/chromeos/vboot_handoff.c2
-rw-r--r--src/vendorcode/google/chromeos/vboot_loader.c2
16 files changed, 39 insertions, 52 deletions
diff --git a/src/arch/arm/boot.c b/src/arch/arm/boot.c
index 85b2cce95f..5217a9f3b0 100644
--- a/src/arch/arm/boot.c
+++ b/src/arch/arm/boot.c
@@ -21,7 +21,7 @@
#include <arch/stages.h>
#include <cbmem.h>
#include <console/console.h>
-#include <payload_loader.h>
+#include <program_loading.h>
void arch_payload_run(const struct payload *payload)
{
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index 85b2cce95f..5217a9f3b0 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -21,7 +21,7 @@
#include <arch/stages.h>
#include <cbmem.h>
#include <console/console.h>
-#include <payload_loader.h>
+#include <program_loading.h>
void arch_payload_run(const struct payload *payload)
{
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index ecaf86fde3..ff65cc3008 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <arch/stages.h>
-#include <payload_loader.h>
+#include <program_loading.h>
#include <console/uart.h>
void arch_payload_run(const struct payload *payload)
diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot/boot.c
index 29070a0ce1..8f7f0e01d0 100644
--- a/src/arch/x86/boot/boot.c
+++ b/src/arch/x86/boot/boot.c
@@ -1,6 +1,6 @@
#include <console/console.h>
#include <arch/stages.h>
-#include <payload_loader.h>
+#include <program_loading.h>
#include <ip_checksum.h>
#include <string.h>
diff --git a/src/arch/x86/lib/cbfs_and_run.c b/src/arch/x86/lib/cbfs_and_run.c
index ca8d61be54..d279b72e40 100644
--- a/src/arch/x86/lib/cbfs_and_run.c
+++ b/src/arch/x86/lib/cbfs_and_run.c
@@ -18,7 +18,7 @@
*/
#include <arch/stages.h>
-#include <ramstage_loader.h>
+#include <program_loading.h>
void asmlinkage copy_and_run(void)
{
diff --git a/src/cpu/x86/mirror_payload.c b/src/cpu/x86/mirror_payload.c
index edd26416f2..0ba8d05787 100644
--- a/src/cpu/x86/mirror_payload.c
+++ b/src/cpu/x86/mirror_payload.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <console/console.h>
#include <bootmem.h>
-#include <payload_loader.h>
+#include <program_loading.h>
void mirror_payload(struct payload *payload)
{
diff --git a/src/include/payload_loader.h b/src/include/program_loading.h
index 7a3f045f1c..8ceebc12d4 100644
--- a/src/include/payload_loader.h
+++ b/src/include/program_loading.h
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2014 Google Inc.
+ * Copyright 2015 Google Inc.
*
* 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
@@ -16,12 +16,32 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PAYLOAD_LOADER_H
-#define PAYLOAD_LOADER_H
+#ifndef PROGRAM_LOADING_H
+#define PROGRAM_LOADING_H
#include <stdint.h>
#include <stddef.h>
+
+/************************
+ * RAMSTAGE LOADING *
+ ************************/
+
+struct cbmem_entry;
+
+/* Run ramstage from romstage. */
+void run_ramstage(void);
+
+struct ramstage_loader_ops {
+ const char *name;
+ void *(*load)(uint32_t cbmem_id, const char *name,
+ const struct cbmem_entry **cbmem_entry);
+};
+
+/***********************
+ * PAYLOAD LOADING *
+ ***********************/
+
struct buffer_area {
void *data;
size_t size;
@@ -63,4 +83,5 @@ struct payload_loader_ops {
/* Defined in src/lib/selfboot.c */
void *selfload(struct payload *payload);
-#endif /* PAYLOAD_LOADER_H */
+
+#endif /* PROGRAM_LOADING_H */
diff --git a/src/include/ramstage_loader.h b/src/include/ramstage_loader.h
deleted file mode 100644
index ad085c0ba5..0000000000
--- a/src/include/ramstage_loader.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Google Inc.
- *
- * 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; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef RAMSTAGE_LOADER_H
-#define RAMSTAGE_LOADER_H
-
-#include <stdint.h>
-struct cbmem_entry;
-
-/* Run ramstage from romstage. */
-void run_ramstage(void);
-
-struct ramstage_loader_ops {
- const char *name;
- void *(*load)(uint32_t cbmem_id, const char *name,
- const struct cbmem_entry **cbmem_entry);
-};
-
-#endif /* RAMSTAGE_LOADER_H */
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index d16aa09a29..9917a690e7 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <reset.h>
#include <boot/tables.h>
-#include <payload_loader.h>
+#include <program_loading.h>
#include <lib.h>
#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h>
diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c
index 2c1d1796f2..22f4c2fcd6 100644
--- a/src/lib/loaders/cbfs_payload_loader.c
+++ b/src/lib/loaders/cbfs_payload_loader.c
@@ -18,7 +18,7 @@
*/
#include <cbfs.h>
-#include <payload_loader.h>
+#include <program_loading.h>
static int cbfs_locate_payload(struct payload *payload)
{
diff --git a/src/lib/loaders/cbfs_ramstage_loader.c b/src/lib/loaders/cbfs_ramstage_loader.c
index 5d5cc0b0ec..5155aea511 100644
--- a/src/lib/loaders/cbfs_ramstage_loader.c
+++ b/src/lib/loaders/cbfs_ramstage_loader.c
@@ -20,7 +20,7 @@
#include <console/console.h>
#include <cbfs.h>
#include <arch/stages.h>
-#include <ramstage_loader.h>
+#include <program_loading.h>
#include <timestamp.h>
#if CONFIG_RELOCATABLE_RAMSTAGE
diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c
index 2204090843..4bb29c10e5 100644
--- a/src/lib/loaders/load_and_run_payload.c
+++ b/src/lib/loaders/load_and_run_payload.c
@@ -22,7 +22,7 @@
#include <console/console.h>
#include <fallback.h>
#include <lib.h>
-#include <payload_loader.h>
+#include <program_loading.h>
#include <timestamp.h>
extern const struct payload_loader_ops vboot_payload_loader;
diff --git a/src/lib/loaders/load_and_run_ramstage.c b/src/lib/loaders/load_and_run_ramstage.c
index 5237e20db7..b24e29fc2d 100644
--- a/src/lib/loaders/load_and_run_ramstage.c
+++ b/src/lib/loaders/load_and_run_ramstage.c
@@ -22,7 +22,7 @@
#include <arch/stages.h>
#include <cbfs.h>
#include <cbmem.h>
-#include <ramstage_loader.h>
+#include <program_loading.h>
#include <romstage_handoff.h>
#include <timestamp.h>
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index de059b0faa..4c5fbad8ff 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -27,7 +27,7 @@
#include <cbfs.h>
#include <lib.h>
#include <bootmem.h>
-#include <payload_loader.h>
+#include <program_loading.h>
/* from ramstage.ld: */
extern unsigned char _ram_seg;
diff --git a/src/vendorcode/google/chromeos/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot_handoff.c
index 7ea21ea61b..4fb3338b00 100644
--- a/src/vendorcode/google/chromeos/vboot_handoff.c
+++ b/src/vendorcode/google/chromeos/vboot_handoff.c
@@ -24,7 +24,7 @@
#include <cbfs.h>
#include <cbmem.h>
#include <console/console.h>
-#include <payload_loader.h>
+#include <program_loading.h>
#include "vboot_handoff.h"
int vboot_enable_developer(void)
diff --git a/src/vendorcode/google/chromeos/vboot_loader.c b/src/vendorcode/google/chromeos/vboot_loader.c
index daf5260d44..0294ac63ac 100644
--- a/src/vendorcode/google/chromeos/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot_loader.c
@@ -25,9 +25,9 @@
#include <cbmem.h>
#include <console/console.h>
#include <console/vtxprintf.h>
+#include <program_loading.h>
#include <tpm.h>
#include <reset.h>
-#include <ramstage_loader.h>
#include <romstage_handoff.h>
#include <rmodule.h>
#include <string.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 20:35:29 +0000