July 2014 - U-Boot

[U-Boot] [PATCH] common: bootm_os: make arch_preboot_os __weak
by Jeroen Hofstee 21 Jul '14

21 Jul '14

Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- prevents a clang warning: common/bootm_os.c:440:13: warning: unused function '__arch_preboot_os' [-Wunused-function] static void __arch_preboot_os(void) ^ --- common/bootm_os.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/bootm_os.c b/common/bootm_os.c index f7769ac..5be4467 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -437,11 +437,10 @@ static boot_os_fn *boot_os[] = { }; /* Allow for arch specific config before we boot */ -static void __arch_preboot_os(void) +__weak void arch_preboot_os(void) { /* please define platform specific arch_preboot_os() */ } -void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os"))); int boot_selected_os(int argc, char * const argv[], int state, bootm_headers_t *images, boot_os_fn *boot_fn) -- 1.8.3.2

2 1

[U-Boot] [PATCH] dirvers: mmc: use __weak
by Jeroen Hofstee 21 Jul '14

21 Jul '14

use weak instead of alias to prevent some clang warnings. Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- drivers/mmc/mmc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b5477b1..e3df1f7 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -42,13 +42,11 @@ int mmc_getwp(struct mmc *mmc) return wp; } -int __board_mmc_getcd(struct mmc *mmc) { +__weak int board_mmc_getcd(struct mmc *mmc) +{ return -1; } -int board_mmc_getcd(struct mmc *mmc)__attribute__((weak, - alias("__board_mmc_getcd"))); - int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) { int ret; @@ -1371,17 +1369,17 @@ int mmc_set_dsr(struct mmc *mmc, u16 val) return 0; } -/* - * CPU and board-specific MMC initializations. Aliased function - * signals caller to move on - */ -static int __def_mmc_init(bd_t *bis) +/* CPU-specific MMC initializations */ +__weak int cpu_mmc_init(bd_t *bis) { return -1; } -int cpu_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init"))); -int board_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init"))); +/* board-specific MMC initializations. */ +__weak int board_mmc_init(bd_t *bis) +{ + return -1; +} #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) -- 1.8.3.2

2 1

[U-Boot] [PATCH] lib:vsprintf: reduce scope of pack_hex_byte
by Jeroen Hofstee 21 Jul '14

21 Jul '14

pack_hex_byte is only used when CONFIG_CMD_NET is defined so limit it to that scope. This prevents a clang warning. Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- lib/vsprintf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 60874da..7ec758e 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -28,17 +28,6 @@ /* some reluctance to put this into a new limits.h, so it is here */ #define INT_MAX ((int)(~0U>>1)) -static const char hex_asc[] = "0123456789abcdef"; -#define hex_asc_lo(x) hex_asc[((x) & 0x0f)] -#define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] - -static inline char *pack_hex_byte(char *buf, u8 byte) -{ - *buf++ = hex_asc_hi(byte); - *buf++ = hex_asc_lo(byte); - return buf; -} - unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base) { @@ -434,6 +423,17 @@ static char *string(char *buf, char *end, char *s, int field_width, } #ifdef CONFIG_CMD_NET +static const char hex_asc[] = "0123456789abcdef"; +#define hex_asc_lo(x) hex_asc[((x) & 0x0f)] +#define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] + +static inline char *pack_hex_byte(char *buf, u8 byte) +{ + *buf++ = hex_asc_hi(byte); + *buf++ = hex_asc_lo(byte); + return buf; +} + static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width, int precision, int flags) { -- 1.8.3.2

2 1

[U-Boot] [PATCH] env_callback.h: spl: mark callback as maybe_unused
by Jeroen Hofstee 21 Jul '14

21 Jul '14

When static inline is used in a header file the function should preferably be inlined and if not possible made a static function. When declared inside a c file there is a static function, which might be inlined. Since SPL uses a define to declare the static inline it becomes part of the c file although it is declared in a header and clang will warn that you have introduced unused static functions. Add maybe_unused to prevent such warnings. Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- fixes warnings for clang like: drivers/serial/serial.c:96:1: warning: unused function '_u_boot_env_noop_baudrate' [-Wunused-function] U_BOOT_ENV_CALLBACK(baudrate, on_baudrate); ^ include/env_callback.h:63:21: note: expanded from macro 'U_BOOT_ENV_CALLBACK' static inline void _u_boot_env_noop_##name(void) \ ^ <scratch space>:63:1: note: expanded from here _u_boot_env_noop_baudrate ^ common/console.c:59:1: warning: unused function '_u_boot_env_noop_console' [-Wunused-function] U_BOOT_ENV_CALLBACK(console, on_console); ^ include/env_callback.h:63:21: note: expanded from macro 'U_BOOT_ENV_CALLBACK' static inline void _u_boot_env_noop_##name(void) \ ^ <scratch space>:91:1: note: expanded from here _u_boot_env_noop_console ^ --- include/env_callback.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/env_callback.h b/include/env_callback.h index f90a7fa..ab4e115 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -60,7 +60,7 @@ void env_callback_init(ENTRY *var_entry); */ #ifdef CONFIG_SPL_BUILD #define U_BOOT_ENV_CALLBACK(name, callback) \ - static inline void _u_boot_env_noop_##name(void) \ + static inline __maybe_unused void _u_boot_env_noop_##name(void) \ { \ (void)callback; \ } -- 1.8.3.2

2 1

[U-Boot] [PATCH] lib:sha1: remove unused constant
by Jeroen Hofstee 21 Jul '14

21 Jul '14

This prevents a clang warning. Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- lib/sha1.c:392:19: warning: unused variable '_sha1_src' [-Wunused-const-variable] static const char _sha1_src[] = "_sha1_src"; ^ --- lib/sha1.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/sha1.c b/lib/sha1.c index 0a5f688..05b17a2 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -389,8 +389,6 @@ void sha1_hmac(const unsigned char *key, int keylen, memset (&ctx, 0, sizeof (sha1_context)); } -static const char _sha1_src[] = "_sha1_src"; - #ifdef SELF_TEST /* * FIPS-180-1 test vectors -- 1.8.3.2

2 1

[U-Boot] [PATCH] common: main.c: make show_boot_progress __weak
by Jeroen Hofstee 21 Jul '14

21 Jul '14

This not only looks a bit better it also prevents a warning with W=1 (no previous prototype). Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- common/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/main.c b/common/main.c index 32618f1..2979fbe 100644 --- a/common/main.c +++ b/common/main.c @@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * Board-specific Platform code can reimplement show_boot_progress () if needed */ -void inline __show_boot_progress (int val) {} -void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); +__weak void show_boot_progress(int val) {} static void modem_init(void) { -- 1.8.3.2

3 2

[U-Boot] [PATCH] lib:lmb: use __weak
by Jeroen Hofstee 21 Jul '14

21 Jul '14

This not only looks a bit better it also prevents a warning with W=1 (no previous prototype). Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- lib/lmb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/lmb.c b/lib/lmb.c index 081e418..49a3c9e 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -332,14 +332,12 @@ int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr) return 0; } -void __board_lmb_reserve(struct lmb *lmb) +__weak void board_lmb_reserve(struct lmb *lmb) { /* please define platform specific board_lmb_reserve() */ } -void board_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__board_lmb_reserve"))); -void __arch_lmb_reserve(struct lmb *lmb) +__weak void arch_lmb_reserve(struct lmb *lmb) { /* please define platform specific arch_lmb_reserve() */ } -void arch_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__arch_lmb_reserve"))); -- 1.8.3.2

2 1

[U-Boot] [PATCH] common:splash: use __weak
by Jeroen Hofstee 21 Jul '14

21 Jul '14

This not only looks a bit better it also prevents a warning with W=1 (no previous prototype). cc: agust(a)denx.de Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- common/splash.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/splash.c b/common/splash.c index 18885f1..144fb10 100644 --- a/common/splash.c +++ b/common/splash.c @@ -23,15 +23,11 @@ #include <common.h> #include <splash.h> -int __splash_screen_prepare(void) +__weak int splash_screen_prepare(void) { return 0; } -int splash_screen_prepare(void) - __attribute__ ((weak, alias("__splash_screen_prepare"))); - - #ifdef CONFIG_SPLASH_SCREEN_ALIGN void splash_get_pos(int *x, int *y) { -- 1.8.3.2

2 1

[U-Boot] [PATCH] dm: add missing includes
by Jeroen Hofstee 21 Jul '14

21 Jul '14

lists.c / root.c do not include their own header and they could potentially implement a different function. Therefore actually include the headers. cc: sjg(a)chromium.org Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- drivers/core/lists.c | 1 + drivers/core/root.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/core/lists.c b/drivers/core/lists.c index afb59d1..87164a5 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -11,6 +11,7 @@ #include <errno.h> #include <dm/device.h> #include <dm/device-internal.h> +#include <dm/lists.h> #include <dm/platdata.h> #include <dm/uclass.h> #include <dm/util.h> diff --git a/drivers/core/root.c b/drivers/core/root.c index 1cbb096..11e0879 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -15,6 +15,7 @@ #include <dm/device-internal.h> #include <dm/lists.h> #include <dm/platdata.h> +#include <dm/root.h> #include <dm/uclass.h> #include <dm/util.h> #include <linux/list.h> -- 1.8.3.2

3 2

[U-Boot] [PATCH] common: board_f: cosmetic use __weak for leds
by Jeroen Hofstee 21 Jul '14

21 Jul '14

First of all this looks a lot better, but it also prevents a gcc warning (W=1), that the weak function has no previous prototype. cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- This likely causes some merge issues, but is so uggly it deserves it. --- common/board_f.c | 29 ++++++++++------------------- include/status_led.h | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 4ea4cb2..bdab38e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -37,6 +37,7 @@ #include <os.h> #include <post.h> #include <spi.h> +#include <status_led.h> #include <trace.h> #include <watchdog.h> #include <asm/errno.h> @@ -78,25 +79,15 @@ DECLARE_GLOBAL_DATA_PTR; ************************************************************************ * May be supplied by boards if desired */ -inline void __coloured_LED_init(void) {} -void coloured_LED_init(void) - __attribute__((weak, alias("__coloured_LED_init"))); -inline void __red_led_on(void) {} -void red_led_on(void) __attribute__((weak, alias("__red_led_on"))); -inline void __red_led_off(void) {} -void red_led_off(void) __attribute__((weak, alias("__red_led_off"))); -inline void __green_led_on(void) {} -void green_led_on(void) __attribute__((weak, alias("__green_led_on"))); -inline void __green_led_off(void) {} -void green_led_off(void) __attribute__((weak, alias("__green_led_off"))); -inline void __yellow_led_on(void) {} -void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on"))); -inline void __yellow_led_off(void) {} -void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off"))); -inline void __blue_led_on(void) {} -void blue_led_on(void) __attribute__((weak, alias("__blue_led_on"))); -inline void __blue_led_off(void) {} -void blue_led_off(void) __attribute__((weak, alias("__blue_led_off"))); +__weak void coloured_LED_init(void) {} +__weak void red_led_on(void) {} +__weak void red_led_off(void) {} +__weak void green_led_on(void) {} +__weak void green_led_off(void) {} +__weak void yellow_led_on(void) {} +__weak void yellow_led_off(void) {} +__weak void blue_led_on(void) {} +__weak void blue_led_off(void) {} /* * Why is gd allocated a register? Prior to reloc it might be better to diff --git a/include/status_led.h b/include/status_led.h index ecff60d..848708a 100644 --- a/include/status_led.h +++ b/include/status_led.h @@ -294,19 +294,21 @@ extern void __led_set (led_id_t mask, int state); # include <asm/status_led.h> #endif +#endif /* CONFIG_STATUS_LED */ + /* * Coloured LEDs API */ #ifndef __ASSEMBLY__ -extern void coloured_LED_init (void); -extern void red_led_on(void); -extern void red_led_off(void); -extern void green_led_on(void); -extern void green_led_off(void); -extern void yellow_led_on(void); -extern void yellow_led_off(void); -extern void blue_led_on(void); -extern void blue_led_off(void); +void coloured_LED_init(void); +void red_led_on(void); +void red_led_off(void); +void green_led_on(void); +void green_led_off(void); +void yellow_led_on(void); +void yellow_led_off(void); +void blue_led_on(void); +void blue_led_off(void); #else .extern LED_init .extern red_led_on @@ -319,6 +321,4 @@ extern void blue_led_off(void); .extern blue_led_off #endif -#endif /* CONFIG_STATUS_LED */ - #endif /* _STATUS_LED_H_ */ -- 1.8.3.2

3 2