diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2021-09-30 16:48:14 +1000 |
|---|---|---|
| committer | Alexey Kardashevskiy <aik@ozlabs.ru> | 2021-10-01 14:19:58 +1000 |
| commit | 0705a5cc1df7ad6bd3c2a7dfb1faccd3b44269c1 (patch) | |
| tree | ee9720426e1ba130936c7304d69941d734cadc65 /board-js2x | |
| parent | 6903c037a6b45140a495a6541ef92a0aabc7a30c (diff) | |
| download | SLOF-0705a5cc1df7ad6bd3c2a7dfb1faccd3b44269c1.zip SLOF-0705a5cc1df7ad6bd3c2a7dfb1faccd3b44269c1.tar.gz SLOF-0705a5cc1df7ad6bd3c2a7dfb1faccd3b44269c1.tar.bz2 | |
js2x: Fix compile and cleanup
This moves shared symbols out from the header file and leaves only
the minimum in bmc.h.
This fixes a "while (...); {" bug spotted by the modern gcc.
This fixes cleanup as otherwise the board-js2x/Makefile's "clean" tries
cleaning "rtas" which tries cleaning all libs (not just the ones it uses)
and that in turn triggers generation of lib/libtpm/Makefile.dep which
fails due to missing ./board-js2x/include/version.h.
This fixes create_reloc_table.sh to build with newer toolchains which
otherwise fail with:
ld: cannot use executable file 'reloc_table.o' as input to a link
This adds js2x compile to the travis script to know when it breaks
again.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Diffstat (limited to 'board-js2x')
| -rw-r--r-- | board-js2x/include/bmc.h | 14 | ||||
| -rw-r--r-- | board-js2x/rtas/rtas_board.c | 15 |
2 files changed, 16 insertions, 13 deletions
diff --git a/board-js2x/include/bmc.h b/board-js2x/include/bmc.h index 39dff80..7879379 100644 --- a/board-js2x/include/bmc.h +++ b/board-js2x/include/bmc.h @@ -13,17 +13,7 @@ #ifndef __BMC_H #define __BMC_H -void (*bmc_system_reboot) (void); -void (*bmc_power_off) (void); - -short (*bmc_set_flashside) (short mode); -short (*bmc_get_flashside) (void); -int (*bmc_stop_bootwatchdog) (void); -int (*bmc_set_bootwatchdog) (unsigned short); - -uint32_t(*bmc_read_vpd) (uint8_t * dst, uint32_t len, uint32_t offset); -uint32_t(*bmc_write_vpd) (uint8_t * src, uint32_t len, uint32_t offset); - -uint32_t(*bmc_get_blade_descr) (uint8_t * dst, uint32_t maxlen, uint32_t * len); +extern short (*bmc_set_flashside) (short mode); +extern short (*bmc_get_flashside) (void); #endif /* __BMC_H */ diff --git a/board-js2x/rtas/rtas_board.c b/board-js2x/rtas/rtas_board.c index 7f7409d..531bb1f 100644 --- a/board-js2x/rtas/rtas_board.c +++ b/board-js2x/rtas/rtas_board.c @@ -23,6 +23,19 @@ void io_init(void); short reg_get_flashside(void); void rtas_init(void); +void (*bmc_system_reboot) (void); +void (*bmc_power_off) (void); + +short (*bmc_set_flashside) (short mode); +short (*bmc_get_flashside) (void); +int (*bmc_stop_bootwatchdog) (void); +int (*bmc_set_bootwatchdog) (unsigned short); + +uint32_t(*bmc_read_vpd) (uint8_t * dst, uint32_t len, uint32_t offset); +uint32_t(*bmc_write_vpd) (uint8_t * src, uint32_t len, uint32_t offset); + +uint32_t(*bmc_get_blade_descr) (uint8_t * dst, uint32_t maxlen, uint32_t * len); + typedef struct { uint64_t r3; uint64_t addr; @@ -36,7 +49,7 @@ rtas_slave_loop(volatile slave_t * pIface) { uint64_t mask = pIface->id; pIface->id = 0; - while (pIface->id != mask); { + while (pIface->id != mask) { int dly = 0x1000; while (dly--); } |