summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/fast-reboot.c1
-rw-r--r--core/fdt.c1
-rw-r--r--core/init.c1
-rw-r--r--hdata/fsp.c1
-rw-r--r--hdata/hdata.h1
-rw-r--r--hdata/memory.c1
-rw-r--r--hdata/spira.c1
-rw-r--r--include/memory.h23
8 files changed, 1 insertions, 29 deletions
diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index 49b80b6e..a32bed3d 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -23,7 +23,6 @@
#include <interrupts.h>
#include <cec.h>
#include <timebase.h>
-#include <memory.h>
#include <pci.h>
#include <chip.h>
diff --git a/core/fdt.c b/core/fdt.c
index 62e60fcc..7abebba5 100644
--- a/core/fdt.c
+++ b/core/fdt.c
@@ -19,7 +19,6 @@
#include <libfdt.h>
#include <device.h>
#include <cpu.h>
-#include <memory.h>
#include <opal.h>
#include <interrupts.h>
#include <fsp.h>
diff --git a/core/init.c b/core/init.c
index 1d32be56..d934e788 100644
--- a/core/init.c
+++ b/core/init.c
@@ -18,7 +18,6 @@
#include <fsp.h>
#include <fsp-sysparam.h>
#include <psi.h>
-#include <memory.h>
#include <chiptod.h>
#include <nx.h>
#include <cpu.h>
diff --git a/hdata/fsp.c b/hdata/fsp.c
index 365f9b73..15cc6110 100644
--- a/hdata/fsp.c
+++ b/hdata/fsp.c
@@ -17,7 +17,6 @@
#include <device.h>
#include "spira.h"
#include <cpu.h>
-#include <memory.h>
#include <vpd.h>
#include <ccan/str/str.h>
#include <device_tree.h>
diff --git a/hdata/hdata.h b/hdata/hdata.h
index b9b77215..79cc5760 100644
--- a/hdata/hdata.h
+++ b/hdata/hdata.h
@@ -19,6 +19,7 @@
struct dt_node;
+extern void memory_parse(void);
extern void paca_parse(void);
extern bool pcia_parse(void);
extern void fsp_parse(void);
diff --git a/hdata/memory.c b/hdata/memory.c
index 3c1dc2d5..36a66829 100644
--- a/hdata/memory.c
+++ b/hdata/memory.c
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <memory.h>
#include <cpu.h>
#include <device_tree.h>
#include <device.h>
diff --git a/hdata/spira.c b/hdata/spira.c
index ee403e89..8dd9a781 100644
--- a/hdata/spira.c
+++ b/hdata/spira.c
@@ -17,7 +17,6 @@
#include <device.h>
#include "spira.h"
#include <cpu.h>
-#include <memory.h>
#include <vpd.h>
#include <interrupts.h>
#include <ccan/str/str.h>
diff --git a/include/memory.h b/include/memory.h
deleted file mode 100644
index ce0b22bc..00000000
--- a/include/memory.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2013-2014 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MEMORY_H
-#define __MEMORY_H
-
-/* This populate the @memory dt nodes. */
-extern void memory_parse(void);
-
-#endif /* __MEMORY_H */
OpenPOWER on IntegriCloud