move s3c44b0 to arch_cpu_init and as noone use cpu_init remove it
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagn...@jcrosoft.com>
---
applied to arm/testing
Best Regards,
J.
cpu/arm1136/cpu.c | 5 -----
cpu/arm1176/cpu.c | 5 -----
cpu/arm720t/cpu.c | 5 -----
cpu/arm920t/cpu.c | 5 -----
cpu/arm925t/cpu.c | 5 -----
cpu/arm926ejs/cpu.c | 5 -----
cpu/arm946es/cpu.c | 5 -----
cpu/arm_cortexa8/cpu.c | 5 -----
cpu/arm_intcm/cpu.c | 5 -----
cpu/ixp/cpu.c | 5 -----
cpu/lh7a40x/cpu.c | 5 -----
cpu/pxa/cpu.c | 5 -----
cpu/s3c44b0/cpu.c | 2 +-
cpu/sa1100/cpu.c | 5 -----
include/configs/B2.h | 1 +
lib_arm/board.c | 1 -
16 files changed, 2 insertions(+), 67 deletions(-)
diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c
index f467b7a..c2110c9 100644
--- a/cpu/arm1136/cpu.c
+++ b/cpu/arm1136/cpu.c
@@ -37,11 +37,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c
index bfa4378..bd1e4dd 100644
--- a/cpu/arm1176/cpu.c
+++ b/cpu/arm1176/cpu.c
@@ -38,11 +38,6 @@
static void cache_flush (void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm720t/cpu.c b/cpu/arm720t/cpu.c
index 7a2b9c3..88c71bf 100644
--- a/cpu/arm720t/cpu.c
+++ b/cpu/arm720t/cpu.c
@@ -40,11 +40,6 @@
static void cache_flush(void);
#endif
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm920t/cpu.c b/cpu/arm920t/cpu.c
index 9d5d025..0c7d73f 100644
--- a/cpu/arm920t/cpu.c
+++ b/cpu/arm920t/cpu.c
@@ -35,11 +35,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm925t/cpu.c b/cpu/arm925t/cpu.c
index 354ba5c..893eec0 100644
--- a/cpu/arm925t/cpu.c
+++ b/cpu/arm925t/cpu.c
@@ -36,11 +36,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm926ejs/cpu.c b/cpu/arm926ejs/cpu.c
index 978bfcd..82f4242 100644
--- a/cpu/arm926ejs/cpu.c
+++ b/cpu/arm926ejs/cpu.c
@@ -35,11 +35,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm946es/cpu.c b/cpu/arm946es/cpu.c
index 3939322..8816071 100644
--- a/cpu/arm946es/cpu.c
+++ b/cpu/arm946es/cpu.c
@@ -35,11 +35,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/arm_cortexa8/cpu.c b/cpu/arm_cortexa8/cpu.c
index e911206..9c2d5da 100644
--- a/cpu/arm_cortexa8/cpu.c
+++ b/cpu/arm_cortexa8/cpu.c
@@ -42,11 +42,6 @@ void l2cache_disable(void);
static void cache_flush(void);
-int cpu_init(void)
-{
- return 0;
-}
-
int cleanup_before_linux(void)
{
unsigned int i;
diff --git a/cpu/arm_intcm/cpu.c b/cpu/arm_intcm/cpu.c
index 9ce17f2..1310604 100644
--- a/cpu/arm_intcm/cpu.c
+++ b/cpu/arm_intcm/cpu.c
@@ -33,11 +33,6 @@
#include <common.h>
#include <command.h>
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c
index 5cfc39d..ce275e5 100644
--- a/cpu/ixp/cpu.c
+++ b/cpu/ixp/cpu.c
@@ -75,11 +75,6 @@ int print_cpuinfo (void)
}
#endif /* CONFIG_DISPLAY_CPUINFO */
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/lh7a40x/cpu.c b/cpu/lh7a40x/cpu.c
index f47ca03..9808ab8 100644
--- a/cpu/lh7a40x/cpu.c
+++ b/cpu/lh7a40x/cpu.c
@@ -35,11 +35,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/pxa/cpu.c b/cpu/pxa/cpu.c
index 8edb44e..800d120 100644
--- a/cpu/pxa/cpu.c
+++ b/cpu/pxa/cpu.c
@@ -37,11 +37,6 @@
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/cpu/s3c44b0/cpu.c b/cpu/s3c44b0/cpu.c
index 7ef4a1f..bca38f8 100644
--- a/cpu/s3c44b0/cpu.c
+++ b/cpu/s3c44b0/cpu.c
@@ -32,7 +32,7 @@
#include <command.h>
#include <asm/hardware.h>
-int cpu_init (void)
+int arch_cpu_init (void)
{
icache_enable();
diff --git a/cpu/sa1100/cpu.c b/cpu/sa1100/cpu.c
index 39285a0..58e90dc 100644
--- a/cpu/sa1100/cpu.c
+++ b/cpu/sa1100/cpu.c
@@ -40,11 +40,6 @@ DECLARE_GLOBAL_DATA_PTR;
static void cache_flush(void);
-int cpu_init (void)
-{
- return 0;
-}
-
int cleanup_before_linux (void)
{
/*
diff --git a/include/configs/B2.h b/include/configs/B2.h
index 35fad5c..e5439f3 100644
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -39,6 +39,7 @@
#define CONFIG_ARM_THUMB 1 /* this is an ARM7TDMI */
#undef CONFIG_ARM7_REVD /* disable ARM720 REV.D Workarounds */
#define CONFIG_SYS_NO_CP15_CACHE
+#define CONFIG_ARCH_CPU_INIT
#define CONFIG_S3C44B0_CLOCK_SPEED 75 /* we have a 75Mhz S3C44B0*/
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 344120f..452b177 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -265,7 +265,6 @@ typedef int (init_fnc_t) (void);
int print_cpuinfo (void);
init_fnc_t *init_sequence[] = {
- cpu_init, /* basic cpu dependent setup */
#if defined(CONFIG_ARCH_CPU_INIT)
arch_cpu_init, /* basic arch cpu dependent setup */
#endif
--
1.6.2.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
