From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Tue, 26 Jan 2016 10:24:13 +0000 (+0100)
Subject: ppc: xilinx-ppc440-generic: Cleanout header files
X-Git-Tag: v2016.03-rc1~46^2~100
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06a6405ad868996cece0e86f84ecd097a87f2d61;p=u-boot

ppc: xilinx-ppc440-generic: Cleanout header files

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>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 769a1deb8a..47bc4aec14 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 f521387d22..0000000000
--- a/include/configs/xilinx-ppc440.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * (C) Copyright 2008
- *  Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@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 */