From: Holger Brunck holger.brunck@keymile.com
We use CONFIG_OF_LIBFDT and CONFIG_OF_BOARD_SETUP on all our powerpc targets, so there is no need to check these defines within our C code.
Signed-off-by: Holger Brunck holger.brunck@keymile.com Signed-off-by: Valentin Longchamp valentin.longchamp@keymile.com
---
Changes in v2: - Removed merge conflict files in commit message
board/keymile/km82xx/km82xx.c | 8 ++------ board/keymile/km83xx/km83xx.c | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c index cc9a7c9..70f816b 100644 --- a/board/keymile/km82xx/km82xx.c +++ b/board/keymile/km82xx/km82xx.c @@ -11,10 +11,7 @@ #include <malloc.h> #include <asm/io.h>
-#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#endif - #include <i2c.h> #include "../common/common.h"
@@ -465,14 +462,13 @@ static void setports(int gpio) } } #endif -#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) -int ft_board_setup(void *blob, bd_t *bd) + +void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd);
return 0; } -#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
#if defined(CONFIG_MGCOGE3NE) int get_testpin(void) diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 89e9e1e..1164c2e 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -361,14 +361,12 @@ int checkboard(void) return 0; }
-#if defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, bd_t *bd) +void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd);
return 0; } -#endif
#if defined(CONFIG_HUSH_INIT_VAR) int hush_init_var(void)