Commit b3ab9dfd authored by Peter Tyser's avatar Peter Tyser Committed by Tom Rix

ppc: Clean up calling of misc_init_r() during init

Remove board-specific #ifdefs for calling misc_init_r() during
initializtion
Signed-off-by: default avatarPeter Tyser <ptyser@xes-inc.com>
Acked-by: default avatarHeiko Schocher <hs@denx.de>
parent 61c83b7b
......@@ -37,6 +37,7 @@
#define CONFIG_MPC860 1 /* This is a MPC860 CPU ... */
#define CONFIG_CCM 1 /* on a Card Controller Module */
#define CONFIG_MISC_INIT_R /* Call misc_init_r() */
#define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */
#undef CONFIG_8xx_CONS_SMC2
......
......@@ -38,6 +38,7 @@
#define CONFIG_CPCI405 1 /* ...on a CPCI405 board */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */
......
......@@ -40,6 +40,7 @@
#undef CONFIG_CPCI405_6U /* enable this for 6U boards */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
......
......@@ -40,6 +40,7 @@
#define CONFIG_CPCI405AB 1 /* ...and special AB version */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
......
......@@ -39,6 +39,7 @@
#define CONFIG_CPCI405_VER2 1 /* ...version 2 */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
......
......@@ -40,6 +40,7 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_F 1 /* and misc_init_f() */
#define CONFIG_MISC_INIT_R 1 /* and misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
......
......@@ -40,6 +40,7 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_F 1 /* and misc_init_f() */
#define CONFIG_MISC_INIT_R 1 /* and misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
......
......@@ -38,6 +38,7 @@
#define CONFIG_CPM2 1 /* Has a CPM2 */
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_MISC_INIT_R /* Use misc_init_r() */
/* Cogent Modular Architecture options */
#define CONFIG_CMA282 1 /* ...on a CMA282 CPU module */
......
......@@ -37,6 +37,7 @@
#define CONFIG_COGENT 1 /* using Cogent Modular Architecture */
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_MISC_INIT_R /* Use misc_init_r() */
/* Cogent Modular Architecture options */
#define CONFIG_CMA286_60_OLD 1 /* ...on an old CMA286-60 CPU module */
......
......@@ -47,8 +47,9 @@
#define CONFIG_OVERWRITE_ETHADDR_ONCE 1
#endif
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_BOARD_POSTCLK_INIT 1 /* Call board_postclk_init */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f() */
#define CONFIG_BOARD_POSTCLK_INIT 1 /* Call board_postclk_init() */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */
#define CONFIG_LCD 1 /* use LCD controller ... */
#define CONFIG_HLD1045 1 /* ... with a HLD1045 display */
......
......@@ -42,6 +42,8 @@
#define CONFIG_MPC860T 1
#define CONFIG_PCU_E 1 /* ...on a PCU E board */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */
#define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */
#define CONFIG_BAUDRATE 9600
......
......@@ -63,6 +63,7 @@
#define CONFIG_405GP 1
#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */
/*
* Define IDE_USES_ISA_EMULATION for slower IDE access in the ISA-IO address range
......
......@@ -921,17 +921,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
/* Initialize the console (after the relocation and devices init) */
console_init_r ();
#if defined(CONFIG_CCM) || \
defined(CONFIG_COGENT) || \
defined(CONFIG_CPCI405) || \
defined(CONFIG_EVB64260) || \
defined(CONFIG_KUP4K) || \
defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \
defined(CONFIG_SC3) || \
defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R)
#if defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */
misc_init_r ();
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment