From 2150addeffbf6e4f40b30709237896a9c5de22cb Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Tue, 26 Jan 2016 11:24:14 +0100 Subject: [PATCH] ppc: xilinx-ppc405-generic: Cleanout header files Now that there is only one header file for all ppc405 files, merge header files. Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Bin Meng Reviewed-by: Tom Rini Acked-by: Stefan Roese Signed-off-by: Michal Simek Reviewed-by: Michal Simek --- 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 bdb9372abc..e2d189d0ac 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 +#include #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx-ppc405.h b/include/configs/xilinx-ppc405.h deleted file mode 100644 index dcfe56e048..0000000000 --- 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 - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* cpu parameter */ -#define CONFIG_405 1 -#define CONFIG_XILINX_405 1 - -#include - -#endif -- 2.39.5