On most platforms the print_fpga_state function is never called. Only on dlvision-10g do we, so in that case inline it. Drop it from everywhere else to avoid extra strings.

Cc: Dirk Eibach dirk.eibach@gdsys.cc Signed-off-by: Tom Rini trini@konsulko.com --- board/gdsys/405ep/405ep.c | 8 -------- board/gdsys/405ep/dlvision-10g.c | 5 ++++- board/gdsys/405ex/405ex.c | 8 -------- board/gdsys/mpc8308/mpc8308.c | 8 -------- include/gdsys_fpga.h | 1 - 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/board/gdsys/405ep/405ep.c b/board/gdsys/405ep/405ep.c index 426dc05..35fa06a 100644 --- a/board/gdsys/405ep/405ep.c +++ b/board/gdsys/405ep/405ep.c @@ -31,14 +31,6 @@ int get_fpga_state(unsigned dev) return gd->arch.fpga_state[dev]; }

-void print_fpga_state(unsigned dev) -{ - if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED) - puts(" Waiting for FPGA-DONE timed out.\n"); - if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED) - puts(" FPGA reflection test failed.\n"); -} - int board_early_init_f(void) { unsigned k; diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c index 54c7eb3..def4f9c 100644 --- a/board/gdsys/405ep/dlvision-10g.c +++ b/board/gdsys/405ep/dlvision-10g.c @@ -109,7 +109,10 @@ static void print_fpga_info(unsigned dev) && !((hardware_version == HWVER_101) && (fpga_state == FPGA_STATE_DONE_FAILED))) { puts("not available\n"); - print_fpga_state(dev); + if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED) + puts(" Waiting for FPGA-DONE timed out.\n"); + if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED) + puts(" FPGA reflection test failed.\n"); return; }

diff --git a/board/gdsys/405ex/405ex.c b/board/gdsys/405ex/405ex.c index c1a583f..9e1c57f 100644 --- a/board/gdsys/405ex/405ex.c +++ b/board/gdsys/405ex/405ex.c @@ -24,14 +24,6 @@ int get_fpga_state(unsigned dev) return gd->arch.fpga_state[dev]; }

-void print_fpga_state(unsigned dev) -{ - if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED) - puts(" Waiting for FPGA-DONE timed out.\n"); - if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED) - puts(" FPGA reflection test failed.\n"); -} - int board_early_init_f(void) { u32 val; diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c index 4338a33..1b8e035 100644 --- a/board/gdsys/mpc8308/mpc8308.c +++ b/board/gdsys/mpc8308/mpc8308.c @@ -31,14 +31,6 @@ int get_fpga_state(unsigned dev) return gd->arch.fpga_state[dev]; }

-void print_fpga_state(unsigned dev) -{ - if (gd->arch.fpga_state[dev] & FPGA_STATE_DONE_FAILED) - puts(" Waiting for FPGA-DONE timed out.\n"); - if (gd->arch.fpga_state[dev] & FPGA_STATE_REFLECTION_FAILED) - puts(" FPGA reflection test failed.\n"); -} - int board_early_init_f(void) { unsigned k; diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index 3b8762d..4ef4e09 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -17,7 +17,6 @@ enum { };

int get_fpga_state(unsigned dev); -void print_fpga_state(unsigned dev);

int fpga_set_reg(u32 fpga, u16 *reg, off_t regoff, u16 data); int fpga_get_reg(u32 fpga, u16 *reg, off_t regoff, u16 *data);