[U-Boot] [PATCH 10/22] ppc: xilinx-ppc440-generic: Cleanout header files

Ricardo Ribalda Delgado
2016-01-26T10:24:13Z

Now that there is only one header file for all ppc440 files, merge
header files.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
include/configs/xilinx-ppc440-generic.h | 3 ++-
include/configs/xilinx-ppc440.h | 17 -----------------
2 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 include/configs/xilinx-ppc440.h

diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 769a1deb8a6f..47bc4aec148e 100644
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -10,6 +10,7 @@

/*CPU*/
#define CONFIG_440 1
+#define CONFIG_XILINX_440 1
#define CONFIG_XILINX_PPC440_GENERIC 1
#include "../board/xilinx/ppc440-generic/xparameters.h"

@@ -33,6 +34,6 @@
#define MTDPARTS_DEFAULT "mtdparts=ml507-flash:-(user)"

/*Generic Configs*/
-#include <configs/xilinx-ppc440.h>
+#include <configs/xilinx-ppc.h>

#endif /* __CONFIG_H */
diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h
deleted file mode 100644
index f521387d2289..000000000000
--- a/include/configs/xilinx-ppc440.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda at gmail.com
- * This work has been supported by: QTechnology http://qtec.com/
- * SPDX-License-Identifier: GPL-2.0+
-*/
-
-#ifndef __CONFIG_GEN_H
-#define __CONFIG_GEN_H
-
-/*CPU*/
-#define CONFIG_440 1
-#define CONFIG_XILINX_440 1
-
-#include <configs/xilinx-ppc.h>
-
-#endif /* __CONFIG_H */
--
2.7.0.rc3