[u-boot 3/3] arm: aspeed: Remove cpu directory

[Joel Stanley]

ast2400 support had two mostly empty functions in the CPU directory.
The only function was to enable the i and d caches, so do this in the
board file instead.

It's not clear if this was necessary as the system boots without it.

Signed-off-by: Joel Stanley <joel at jms.id.au>
---
 arch/arm/cpu/arm926ejs/aspeed/Makefile |  1 -
 arch/arm/cpu/arm926ejs/aspeed/cpu.c    | 29 -----------------------------
 board/aspeed/ast-g4/ast-g4.c           |  4 ++++
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/aspeed/Makefile
 delete mode 100644 arch/arm/cpu/arm926ejs/aspeed/cpu.c

diff --git a/arch/arm/cpu/arm926ejs/aspeed/Makefile b/arch/arm/cpu/arm926ejs/aspeed/Makefile
deleted file mode 100644
index e085b7b442e7..000000000000
--- a/arch/arm/cpu/arm926ejs/aspeed/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y	+= cpu.o
diff --git a/arch/arm/cpu/arm926ejs/aspeed/cpu.c b/arch/arm/cpu/arm926ejs/aspeed/cpu.c
deleted file mode 100644
index cf62293b51ab..000000000000
--- a/arch/arm/cpu/arm926ejs/aspeed/cpu.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/io.h>
-
-int arch_cpu_init(void)
-{
-
-	return 0;
-}
-
-void enable_caches(void)
-{
-	icache_enable();
-	//TODO .....
-	dcache_enable();
-
-}
-
diff --git a/board/aspeed/ast-g4/ast-g4.c b/board/aspeed/ast-g4/ast-g4.c
index 6f705d8559b3..549be782891f 100644
--- a/board/aspeed/ast-g4/ast-g4.c
+++ b/board/aspeed/ast-g4/ast-g4.c
@@ -36,6 +36,10 @@ void show_boot_progress(int progress)
 
 int board_init (void)
 {
+	/* The BSP did this in the cpu code */
+	icache_enable();
+	dcache_enable();
+
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 	gd->flags = 0;
-- 
2.8.1