From 10c9b03cdb3b965961e000c46b175677b4b5c2d1 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Sun, 14 Jan 2007 15:07:11 +0000
Subject: Actually, the initrd image should be architecture-independent.

---
 src/arch/i386/image/initrd.c   | 37 -------------------------------------
 src/arch/i386/include/initrd.h | 14 --------------
 src/image/initrd.c             | 37 +++++++++++++++++++++++++++++++++++++
 src/include/gpxe/initrd.h      | 14 ++++++++++++++
 4 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 src/arch/i386/image/initrd.c
 delete mode 100644 src/arch/i386/include/initrd.h
 create mode 100644 src/image/initrd.c
 create mode 100644 src/include/gpxe/initrd.h

(limited to 'src')

diff --git a/src/arch/i386/image/initrd.c b/src/arch/i386/image/initrd.c
deleted file mode 100644
index d0e0d88a6..000000000
--- a/src/arch/i386/image/initrd.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Brown <mbrown@fensystems.co.uk>.
- *
- * 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; either version 2 of the
- * License, or any later version.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/**
- * @file
- *
- * Linux initrd image format
- *
- * This file does nothing except provide a way to mark images as being
- * initrds.  The actual processing is done in the Linux kernel image
- * code; this file exists so that we can include the "initrd" command
- * without necessarily dragging in the Linux image format.
- *
- */
-
-#include <initrd.h>
-#include <gpxe/image.h>
-
-/** Linux initrd image type */
-struct image_type initrd_image_type __image_type ( PROBE_NORMAL ) = {
-	.name = "initrd",
-};
diff --git a/src/arch/i386/include/initrd.h b/src/arch/i386/include/initrd.h
deleted file mode 100644
index 196a96528..000000000
--- a/src/arch/i386/include/initrd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _INITRD_H
-#define _INITRD_H
-
-/**
- * @file
- *
- * Linux initrd image format
- *
- */
-
-#include <gpxe/image.h>
-extern struct image_type initrdimage_image_type __image_type ( PROBE_NORMAL );
-
-#endif /* _INITRD_H */
diff --git a/src/image/initrd.c b/src/image/initrd.c
new file mode 100644
index 000000000..f03564a81
--- /dev/null
+++ b/src/image/initrd.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2007 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * 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; either version 2 of the
+ * License, or any later version.
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/**
+ * @file
+ *
+ * Linux initrd image format
+ *
+ * This file does nothing except provide a way to mark images as being
+ * initrds.  The actual processing is done in the Linux kernel image
+ * code; this file exists so that we can include the "initrd" command
+ * without necessarily dragging in the Linux image format.
+ *
+ */
+
+#include <gpxe/image.h>
+#include <gpxe/initrd.h>
+
+/** Linux initrd image type */
+struct image_type initrd_image_type __image_type ( PROBE_NORMAL ) = {
+	.name = "initrd",
+};
diff --git a/src/include/gpxe/initrd.h b/src/include/gpxe/initrd.h
new file mode 100644
index 000000000..4533a1245
--- /dev/null
+++ b/src/include/gpxe/initrd.h
@@ -0,0 +1,14 @@
+#ifndef _GPXE_INITRD_H
+#define _GPXE_INITRD_H
+
+/**
+ * @file
+ *
+ * Linux initrd image format
+ *
+ */
+
+#include <gpxe/image.h>
+extern struct image_type initrdimage_image_type __image_type ( PROBE_NORMAL );
+
+#endif /* _GPXE_INITRD_H */
-- 
cgit v1.2.3-55-g7522