km/powerpc: remove unneeded defines

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>
This commit is contained in:
Holger Brunck 2015-11-17 10:53:29 +01:00 committed by Tom Rini
parent bbd94a0b49
commit fc882a310d
2 changed files with 3 additions and 9 deletions

View File

@ -11,10 +11,7 @@
#include <malloc.h> #include <malloc.h>
#include <asm/io.h> #include <asm/io.h>
#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
#include <libfdt.h> #include <libfdt.h>
#endif
#include <i2c.h> #include <i2c.h>
#include "../common/common.h" #include "../common/common.h"
@ -465,14 +462,13 @@ static void setports(int gpio)
} }
} }
#endif #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); ft_cpu_setup(blob, bd);
return 0; return 0;
} }
#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
#if defined(CONFIG_MGCOGE3NE) #if defined(CONFIG_MGCOGE3NE)
int get_testpin(void) int get_testpin(void)

View File

@ -361,14 +361,12 @@ int checkboard(void)
return 0; return 0;
} }
#if defined(CONFIG_OF_BOARD_SETUP) void ft_board_setup(void *blob, bd_t *bd)
int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
return 0; return 0;
} }
#endif
#if defined(CONFIG_HUSH_INIT_VAR) #if defined(CONFIG_HUSH_INIT_VAR)
int hush_init_var(void) int hush_init_var(void)