Now that there is only one header file for all ppc405 files, merge header files.
Signed-off-by: Ricardo Ribalda Delgado ricardo.ribalda@gmail.com --- include/configs/xilinx-ppc405-generic.h | 5 ++++- include/configs/xilinx-ppc405.h | 22 ---------------------- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 include/configs/xilinx-ppc405.h
diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h index bdb9372abc45..e2d189d0ac60 100644 --- a/include/configs/xilinx-ppc405-generic.h +++ b/include/configs/xilinx-ppc405-generic.h @@ -14,6 +14,9 @@
#include "../board/xilinx/ppc405-generic/xparameters.h"
+#define CONFIG_405 1 +#define CONFIG_XILINX_405 1 + /* sdram */ #define CONFIG_SYS_SDRAM_SIZE_MB 256
@@ -37,5 +40,5 @@ #define MTDIDS_DEFAULT "nor0=ppc405-flash" #define MTDPARTS_DEFAULT "mtdpartsa=ppc405-flash:-(user)"
-#include <configs/xilinx-ppc405.h> +#include <configs/xilinx-ppc.h> #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx-ppc405.h b/include/configs/xilinx-ppc405.h deleted file mode 100644 index dcfe56e0483b..000000000000 --- a/include/configs/xilinx-ppc405.h +++ /dev/null @@ -1,22 +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/ - * - * (C) Copyright 2008 - * Georg Schardt schardt@team-ctech.de - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* cpu parameter */ -#define CONFIG_405 1 -#define CONFIG_XILINX_405 1 - -#include <configs/xilinx-ppc.h> - -#endif