loaders: add program_loading.h header file

Instead of two headers for payload and ramstage loading
combine the 2 files into one. This also allows for easier
refactoring by keeping header files consistent.

Change-Id: I4a6dffb78ad84c78e6e96c886d361413f9b4a17d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8708
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

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)
 {

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)
 {

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)

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>
 

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)
 {

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)
 {

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
+#ifndef PROGRAM_LOADING_H
-#define PAYLOAD_LOADER_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 */

src/include/ramstage_loader.h

@@ -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 */

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>

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)
 {

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

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;

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>
 

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;

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)

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>