diff options
| author | Holger Brunck <holger.brunck@keymile.com> | 2015-11-17 10:53:29 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-18 15:28:54 -0500 |
| commit | fc882a310d8c22bf7c366336553acab4385b1284 (patch) | |
| tree | 0d9de85aa7161799a36b3b977c85da7a14146906 | |
| parent | bbd94a0b491161c11a93436fd1bf91d601a8ba95 (diff) | |
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>
| -rw-r--r-- | board/keymile/km82xx/km82xx.c | 8 | ||||
| -rw-r--r-- | 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 cc9a7c9a8eb..70f816be7ea 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 89e9e1e57c3..1164c2e34f4 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) |