This converts all the Keymile powerpc boards to the generic board initialization.

This includes the 3 Keymile powerpc subsystems: km82xx, km83xx, and kmp204x.

Signed-off-by: Valentin Longchamp valentin.longchamp@keymile.com ---

include/configs/km/km83xx-common.h | 3 +++ include/configs/km/kmp204x-common.h | 3 +++ include/configs/km82xx.h | 3 +++ 3 files changed, 9 insertions(+)

diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index ae6b6dc..940000e 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -8,6 +8,9 @@ #ifndef __CONFIG_KM83XX_H #define __CONFIG_KM83XX_H

+#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_DISPLAY_BOARDINFO + /* include common defines/options for all Keymile boards */ #include "keymile-common.h" #include "km-powerpc.h" diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index a0f9d29..b658c68 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -21,6 +21,9 @@

#define CONFIG_NAND_ECC_BCH

+#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_DISPLAY_BOARDINFO + /* common KM defines */ #include "keymile-common.h"

diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index 029c348..69ba66a 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -29,6 +29,9 @@ #error ("Board unsupported") #endif

+#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_DISPLAY_BOARDINFO + #define CONFIG_SYS_TEXT_BASE 0xFE000000

/* include common defines/options for all Keymile boards */

On 10/03/2014 02:45 AM, Valentin Longchamp wrote:

The argument boot_flags of board_init_f() is not used at all in the powerpc specific board.c init sequence. Now with the generic init sequence, this boot_flags arg is used by board_init_f().

This patch sets the r3 register that is used to pass the boot_flags argument from the start.S board_init_f() call to 0 prior to the function call to avoid unknown content to end up in gd->flags.

Signed-off-by: Valentin Longchamp valentin.longchamp@keymile.com

arch/powerpc/cpu/mpc83xx/start.S | 1 + 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 36724e5..8abb3f1 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -283,6 +283,7 @@ in_flash: bl cpu_init_f

/* run 1st part of board init code (in Flash)*/

• li r3, 0 /* clear boot_flag for calling board_init_f */ bl board_init_f

  /* NOTREACHED - board_init_f() does not return */

Kim,

This is for 83xx. I think the patch is OK. I can take it in along with other patches when the merge window opens if you are OK.

York