This renames BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT.
Along the way it removes some leftover
#define BOARD_LATE_INIT1
and adds some basic documentation for board specific
callbacks in README.
Signed-off-by: Helmut Raiger
---
V2: added some docu in README
README | 14 ++
arch/arm/lib/board.c |2 +-
arch/sandbox/lib/board.c |2 +-
arch/sh/lib/board.c |2 +-
board/freescale/mx35pdk/mx35pdk.c|4 ++--
board/freescale/mx51evk/mx51evk.c|2 +-
board/imx31_phycore/imx31_phycore.c |2 +-
board/st-ericsson/u8500/u8500_href.c |4 ++--
include/configs/VCMA9.h |2 +-
include/configs/cerf250.h|2 +-
include/configs/colibri_pxa270.h |2 +-
include/configs/efikamx.h|2 +-
include/configs/imx31_phycore.h |2 +-
include/configs/jadecpu.h|2 +-
include/configs/lubbock.h|2 +-
include/configs/ms7750se.h |2 +-
include/configs/mx1ads.h |2 +-
include/configs/mx31pdk.h|2 +-
include/configs/mx35pdk.h|2 +-
include/configs/mx51evk.h|2 +-
include/configs/mx53evk.h|2 +-
include/configs/nhk8815.h|2 +-
include/configs/pleb2.h |2 +-
include/configs/pxa255_idp.h |2 +-
include/configs/qong.h |2 +-
include/configs/r2dplus.h|2 +-
include/configs/sh7757lcr.h |2 +-
include/configs/trizepsiv.h |2 +-
include/configs/tx25.h |2 +-
include/configs/u8500_href.h |2 +-
include/configs/vision2.h|2 +-
include/configs/xaeniax.h|2 +-
include/configs/zipitz2.h|2 +-
include/configs/zmx25.h |2 +-
34 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/README b/README
index eb9ade9..5b36b55 100644
--- a/README
+++ b/README
@@ -2388,6 +2388,20 @@ Modem Support:
See also: doc/README.Modem
+Board initialization settings:
+--
+
+During Initialization u-boot calls a number of board specific functions
+to allow the preparation of board specific prerequisites, e.g. pin setup
+before drivers are initialized. To enable these callbacks the
+following configuration macros have to be defined. Currently this is
+architecture specific, so please check arch/your_architecture/lib/board.c
+typically in board_init_f() and board_init_r().
+
+- CONFIG_BOARD_EARLY_INIT_F: Call board_early_init_f()
+- CONFIG_BOARD_EARLY_INIT_R: Call board_early_init_r()
+- CONFIG_BOARD_LATE_INIT: Call board_late_init()
+- CONFIG_BOARD_POSTCLK_INIT: Call board_postclk_init()
Configuration Settings:
---
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 1fe3751..29dd348 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -578,7 +578,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
copy_filename(BootFile, s, sizeof(BootFile));
#endif
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
board_late_init();
#endif
diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c
index 1fd8fa6..ae5a517 100644
--- a/arch/sandbox/lib/board.c
+++ b/arch/sandbox/lib/board.c
@@ -250,7 +250,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* enable exceptions */
enable_interrupts();
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
board_late_init();
#endif
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 6148e6b..d9c0c22 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -141,7 +141,7 @@ init_fnc_t *init_sequence[] =
stdio_init,
console_init_r,
interrupt_init,
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
board_late_init,
#endif
#if defined(CONFIG_CMD_NET)
diff --git a/board/freescale/mx35pdk/mx35pdk.c
b/board/freescale/mx35pdk/mx35pdk.c
index 9eefe5e..155b9ff 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -38,8 +38,8 @@
#include
#include
-#ifndef BOARD_LATE_INIT
-#error "BOARD_LATE_INIT must be set for this board"
+#ifndef CONFIG_BOARD_LATE_INIT
+#error "CONFIG_BOARD_LATE_INIT must be set for this board"
#endif
#ifndef CONFIG_BOARD_EARLY_INIT_F
diff --git a/board/freescale/mx51evk/mx51evk.c
b/board/freescale/mx51evk/mx51evk.c
index 8da1ee8..f998610 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -409,7 +409,7 @@ int board_init(void)
return 0;
}
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_MXC_SPI
diff --git a/board/imx31_phycore/imx31_phycore.c
b/board/imx31_phycore/imx31_phycore.c
index 773900e..47f1a8d 100644
--- a/board/imx31_phycore/imx31_phycore.c
+++ b/boar
