[U-Boot] [PATCH 28/29 V2] bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- lib_avr32/bootm.c | 2 +- lib_blackfin/bootm.c | 2 +- lib_microblaze/bootm.c | 2 +- lib_nios2/bootm.c | 1 - lib_sh/bootm.c | 1 - 5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index 8a6109d..35240e2 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -202,6 +202,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
theKernel(ATAG_MAGIC, params_start); /* does not return */ -error: + return 1; } diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c index d0afb21..9938ae5 100644 --- a/lib_blackfin/bootm.c +++ b/lib_blackfin/bootm.c @@ -48,6 +48,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) dcache_disable(); (*appl) (cmdline); /* does not return */ -error: + return 1; } diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index 5986a31..52fe068 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -49,6 +49,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
theKernel (commandline); /* does not return */ -error: + return 1; } diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c index c0be4fd..34f5b8f 100644 --- a/lib_nios2/bootm.c +++ b/lib_nios2/bootm.c @@ -35,6 +35,5 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) kernel (); /* does not return */
-error: return 1; } diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index e92c848..bc1c3da 100644 --- a/lib_sh/bootm.c +++ b/lib_sh/bootm.c @@ -70,6 +70,5 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) kernel(); /* does not return */
-error: return 1; }

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- include/configs/ap325rxa.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index cfcd85c..a6312b5 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -117,7 +117,6 @@ /* FLASH */ #define CONFIG_FLASH_CFI_DRIVER 1 #define CFG_FLASH_CFI -#define CONFIG_FLASH_CFI_DRIVER #undef CFG_FLASH_QUIET_TEST /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_EMPTY_INFO
participants (1)
-
Jean-Christophe PLAGNIOL-VILLARD