common/board_r: arm: Merge initr_enable_interrupts into interrupts_init
PATCH v2 1/3 common/board_r: arm: Merge initr_enable_interrupts into interrupts_init
initr_enable_interrupts() is an ARM-specific wrapper over enable_interrupts(), which is run during the common init sequence. It can be eliminated by moving the enable_interrupts() call to the end of interrupt_init() function, in arch/arm/lib/interrupts*.c.
---
v2 updates:
- add reviewed-by tag
arch/arm/lib/interrupts.c | 2 ++ arch/arm/lib/interrupts_64.c | 2 ++ arch/arm/lib/interrupts_m.c | 2 ++ common/board_r.c | 12 ------------ 4 files changed, 6 insertions(+), 12 deletions(-)
arch/arm/lib/interrupts.c +2 -0
@@ -34,6 +34,8 @@ int interrupt_init(void)*/ IRQ_STACK_START_IN = gd->irq_sp +8 ; +enable_interrupts (); +return 0 ; }
arch/arm/lib/interrupts_64.c +2 -0
@@ -13,6 +13,8 @@ DECLARE_GLOBAL_DATA_PTR;int interrupt_init (void ) { +enable_interrupts (); +return 0 ; }
arch/arm/lib/interrupts_m.c +2 -0
@@ -31,6 +31,8 @@ struct autosave_regs {int interrupt_init (void ) { +enable_interrupts (); +return 0 ; }
common/board_r.c +0 -12
@@ -518,15 +518,6 @@ static int initr_api(void) }#endif -/* enable exceptions */ -#ifdef CONFIG_ARM -static int initr_enable_interrupts (void ) -{ -enable_interrupts (); -return 0 ; -} -#endif -#ifdef CONFIG_CMD_NET static int initr_ethaddr (void ) {
@@ -813,9 +804,6 @@ static init_fnc_t init_sequence_r[] = { initr_kgdb, #endif interrupt_init, -#ifdef CONFIG_ARM - initr_enable_interrupts, -#endif #if defined(CONFIG_MICROBLAZE ) || defined(CONFIG_M68K ) timer_init, /* initialize timer */#endif
Signature · 1 line
2.17.1
PATCH v2 2/3 cmd/bedbug.c: Make bedbug_init have a return value
Do this as a preparation for removing initr_bedbug wrapper from common/board_r.c.
---
v2 updates:
- fix checkpatch warnings
- add reviewed-by tag
cmd/bedbug.c | 4 ++-- include/bedbug/type.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
cmd/bedbug.c +2 -2
@@ -44,10 +44,10 @@ int bedbug_puts (const char *str)* settings. * ====================================================================== */ -void bedbug_init (void ) +int bedbug_init (void ) {/* -------------------------------------------------- */ -return ; +return 0 ; }/* bedbug_init */
include/bedbug/type.h +1 -1
@@ -3,7 +3,7 @@/* Supporting routines */ int bedbug_puts (const char *); -void bedbug_init (void ); +int bedbug_init (void );void bedbug860_init (void );void do_bedbug_breakpoint (struct pt_regs *);void bedbug_main_loop (unsigned long ,struct pt_regs *);
Signature · 1 line
2.17.1
PATCH v2 2/3 cmd/bedbug.c: Make bedbug_init have a return value
Quoted 5 lines · Ovidiu Panait
Do this as a preparation for removing
initr_bedbugwrapper fromcommon/board_r.c.Signed-off-by Ovidiu Panait <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200501/1d56c0e4/attachment.sig>
PATCH v2 3/3 common/board_r: Drop initr_bedbug wrapper
In reply to Ovidiu PanaitDrop initr_bedbug wrapper and call bedbug_init directly during the init sequence.
---
v2 updates:
- add reviewed-by tag
common/board_r.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
common/board_r.c +1 -10
@@ -637,15 +637,6 @@ int initr_mem(void) }#endif -#ifdef CONFIG_CMD_BEDBUG -static int initr_bedbug (void ) -{ -bedbug_init (); - -return 0 ; -} -#endif -static int run_main_loop (void ) {#ifdef CONFIG_SANDBOX
@@ -848,7 +839,7 @@ static init_fnc_t init_sequence_r[] = {#endif #ifdef CONFIG_CMD_BEDBUG INIT_FUNC_WATCHDOG_RESET - initr_bedbug, + bedbug_init,#endif #if defined(CONFIG_PRAM ) initr_mem,
Signature · 1 line
2.17.1
PATCH v2 3/3 common/board_r: Drop initr_bedbug wrapper
Quoted 5 lines · Ovidiu Panait
Drop
initr_bedbugwrapper and callbedbug_initdirectly during the init sequence.Signed-off-by Ovidiu Panait <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200501/a06eeedf/attachment.sig>
PATCH v2 1/3 common/board_r: arm: Merge initr_enable_interrupts into interrupts_init
In reply to Ovidiu PanaitQuoted 7 lines · Ovidiu Panait
initr_enable_interrupts()is an ARM-specific wrapper overenable_interrupts(), which is run during the common init sequence. It can be eliminated by moving theenable_interrupts()call to the end ofinterrupt_init()function, inarch/arm/lib/interrupts*.c.Signed-off-by Ovidiu Panait <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200501/c4085462/attachment.sig>