[uClinux-dev] [PATCH 1/3] m68knommu: clean up init code in ColdFire 523x startup

[gerg]

From: Greg Ungerer <gerg at uclinux.org>

We can move the QSPI init call to the more general config_BSP() code on
the 523x platorm setup code. Then we can remove the initcall code all
together.

We can also remove the un-needed include of mcfuart.h while we are
cleaning up here too.

Also I noticed that we are not calling the fec_init() code here, and we
should be doing that. Put that back in too.

Signed-off-by: Greg Ungerer <gerg at uclinux.org>
---
arch/m68k/platform/523x/config.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index 518c27b..7e39c69 100644
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -19,7 +19,6 @@
#include <asm/machdep.h>
#include <asm/coldfire.h>
#include <asm/mcfsim.h>
-#include <asm/mcfuart.h>

/***************************************************************************/

@@ -66,18 +65,10 @@ static void m523x_cpu_reset(void)
void __init config_BSP(char *commandp, int size)
{
mach_reset = m523x_cpu_reset;
-}
-
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
+ m523x_fec_init();
#ifdef CONFIG_SPI_COLDFIRE_QSPI
m523x_qspi_init();
#endif
- return 0;
}

-arch_initcall(init_BSP);
-
/***************************************************************************/

[gerg]

From: Greg Ungerer <gerg at uclinux.org>

We can move all the init calls in the initcall code into the more general
arch setup code (which is config_BSP() here). That makes the 532x consistent
with other ColdFire CPUs setup code. It means we can get rid of the initcall
setup here all together. Also make sure we set the arch mach_reset function
pointer to get the local arch reset code called on reset.

Signed-off-by: Greg Ungerer <gerg at uclinux.org>
---
arch/m68k/platform/532x/config.c | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
index ff20d3e..99c9e4a 100644
--- a/arch/m68k/platform/532x/config.c
+++ b/arch/m68k/platform/532x/config.c
@@ -82,6 +82,13 @@ void __init config_BSP(char *commandp, int size)
}
#endif

+ mach_reset = m532x_cpu_reset;
+ m532x_uarts_init();
+ m532x_fec_init();
+#ifdef CONFIG_SPI_COLDFIRE_QSPI
+ m532x_qspi_init();
+#endif
+
#ifdef CONFIG_BDM_DISABLE
/*
* Disable the BDM clocking. This also turns off most of the rest of
@@ -93,20 +100,6 @@ void __init config_BSP(char *commandp, int size)
}

/***************************************************************************/
-
-static int __init init_BSP(void)
-{
- m532x_uarts_init();
- m532x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
- m532x_qspi_init();
-#endif
- return 0;
-}
-
-arch_initcall(init_BSP);
-
-/***************************************************************************/
/* Board initialization */
/***************************************************************************/
/*

[gerg]

From: Greg Ungerer <gerg at uclinux.org>

We can move all the init calls in the initcall code into the more general
arch setup code (which is config_BSP() here). That makes the 528x consistent
with other ColdFire CPUs setup cod. It means we can get rif of the initcall
setup here all together.

Signed-off-by: Greg Ungerer <gerg at uclinux.org>
---
arch/m68k/platform/528x/config.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
index 7829123..038d13f 100644
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/528x/config.c
@@ -103,21 +103,12 @@ void __init config_BSP(char *commandp, int size)
#ifdef CONFIG_WILDFIREMOD
mach_halt = wildfiremod_halt;
#endif
-}
-
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
mach_reset = m528x_cpu_reset;
m528x_uarts_init();
m528x_fec_init();
#ifdef CONFIG_SPI_COLDFIRE_QSPI
m528x_qspi_init();
#endif
- return 0;
}

-arch_initcall(init_BSP);
-
/***************************************************************************/