diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2011-07-28 15:52:18 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2011-07-28 15:52:18 -0500 |
| commit | 4410b762f0d653a367b3e8f4dc1f5e36bdced954 (patch) | |
| tree | 0f91b53f755c0b9053cf871977aeda6a76820351 | |
| parent | 39562ce900bbe9a04176bd6585e1b05f815267cf (diff) | |
u-boot 1.3.4: fix compile with gcc 4.5
| -rw-r--r-- | multitech/recipes/u-boot/u-boot-1.3.4/fix_inline_weak_compile.patch | 40 | ||||
| -rw-r--r-- | multitech/recipes/u-boot/u-boot_1.3.4.bb | 5 |
2 files changed, 43 insertions, 2 deletions
diff --git a/multitech/recipes/u-boot/u-boot-1.3.4/fix_inline_weak_compile.patch b/multitech/recipes/u-boot/u-boot-1.3.4/fix_inline_weak_compile.patch new file mode 100644 index 0000000..68c373c --- /dev/null +++ b/multitech/recipes/u-boot/u-boot-1.3.4/fix_inline_weak_compile.patch @@ -0,0 +1,40 @@ +--- a/lib_arm/board.c 2011-07-28 15:33:09.338518444 -0500 ++++ b/lib_arm/board.c 2011-07-28 15:33:33.713544295 -0500 +@@ -135,19 +135,19 @@ + * May be supplied by boards if desired + */ + void inline __coloured_LED_init (void) {} +-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init"))); ++void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init"))); + void inline __red_LED_on (void) {} +-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on"))); ++void red_LED_on (void) __attribute__((weak, alias("__red_LED_on"))); + void inline __red_LED_off(void) {} +-void inline red_LED_off(void) __attribute__((weak, alias("__red_LED_off"))); ++void red_LED_off(void) __attribute__((weak, alias("__red_LED_off"))); + void inline __green_LED_on(void) {} +-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on"))); ++void green_LED_on(void) __attribute__((weak, alias("__green_LED_on"))); + void inline __green_LED_off(void) {} +-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off"))); ++void green_LED_off(void)__attribute__((weak, alias("__green_LED_off"))); + void inline __yellow_LED_on(void) {} +-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on"))); ++void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on"))); + void inline __yellow_LED_off(void) {} +-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off"))); ++void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off"))); + + /************************************************************************ + * Init Utilities * +--- a/common/main.c 2011-07-28 15:41:38.446686506 -0500 ++++ b/common/main.c 2011-07-28 15:41:40.678206148 -0500 +@@ -48,7 +48,7 @@ + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ + void inline __show_boot_progress (int val) {} +-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); ++void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); + + #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY) + extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */ diff --git a/multitech/recipes/u-boot/u-boot_1.3.4.bb b/multitech/recipes/u-boot/u-boot_1.3.4.bb index c030a7f..df73768 100644 --- a/multitech/recipes/u-boot/u-boot_1.3.4.bb +++ b/multitech/recipes/u-boot/u-boot_1.3.4.bb @@ -1,9 +1,10 @@ require recipes/u-boot/u-boot.inc -PR = "r7" +PR = "r8" ALLOW_EMPTY = 1 -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ + file://fix_inline_weak_compile.patch" SRC_URI[md5sum] = "ca12b805b4f2bdcf15733be3fe22e896" SRC_URI[sha256sum] = "096aa286d923b7cc356bbe0dda0a29a701369deeb27ada1a2f053155aa403c31" |