mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 03:49:20 +00:00
Code Issues Projects Releases Wiki Activity

u-boot: fix conflicting patch name

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-01-28 09:41:21 +01:00
parent 579d8efb3e
commit 682d21fe45
2 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-bsp/u-boot/u-boot/dont-inline-weak-symbols2.patch
+45
View File
@@ -0,0 +1,45 @@
Patch initially created by Ron Lee and archived in OE patchwork at
http://patchwork.openembedded.org/patch/1534/.
GCC 4.4 complains about this now.
Signed-off-by: Ron Lee <ron@debian.org>
---
lib_arm/board.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -124,23 +124,23 @@
* 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")));
void inline __blue_LED_on(void) {}
-void inline blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
+void blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
void inline __blue_LED_off(void) {}
-void inline blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
+void blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
/************************************************************************
* Init Utilities *
recipes-bsp/u-boot/u-boot_git.bb
+7 -7
View File
@@ -56,21 +56,21 @@ SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
file://0001-BeagleBoard-move-ramdisk-parameters.patch \ file://0001-BeagleBoard-move-ramdisk-parameters.patch \
file://fw_env.config \ file://fw_env.config \
" "
SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55" SRCREV_pn-${PN}_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"
PV_beagleboard = "2010.03+${PR}+gitr${SRCREV}" PV_pn-${PN}_beagleboard = "2010.03+${PR}+gitr${SRCREV}"
# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits) # ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
SRC_URI_omap3evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \ SRC_URI_omap3evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \
file://0001-omap3evm-Change-default-console-serial-port-from.patch \ file://0001-omap3evm-Change-default-console-serial-port-from.patch \
" "
SRCREV_omap3evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620" SRCREV_${PN}_omap3evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
PV_omap3evm = "2009.11+${PR}+gitr${SRCREV}" PV_omap3evm = "2009.11+${PR}+gitr${SRCREV}"
# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits) # ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
SRC_URI_am37x-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \ SRC_URI_am37x-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \
file://0001-omap3evm-Change-default-console-serial-port-from.patch \ file://0001-omap3evm-Change-default-console-serial-port-from.patch \
" "
SRCREV_am37x-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620" SRCREV_pn-${PN}_pn-${PN}_am37x-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
PV_am37x-evm = "2009.11+${PR}+gitr${SRCREV}" PV_am37x-evm = "2009.11+${PR}+gitr${SRCREV}"
SRC_URI_omap3-touchbook = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \ SRC_URI_omap3-touchbook = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \
@@ -87,14 +87,14 @@ SRC_URI_omap3-touchbook = "git://gitorious.org/u-boot-omap3/mainline.git;branch=
file://touchbook-config.patch \ file://touchbook-config.patch \
file://dont-inline-weak-symbols.patch \ file://dont-inline-weak-symbols.patch \
" "
SRCREV_omap3-touchbook = "d363f9cb0918a1b6b92e2e20d01543d0c4f53274" SRCREV_pn-${PN}_omap3-touchbook = "d363f9cb0918a1b6b92e2e20d01543d0c4f53274"
PV_omap3-touchbook = "2009.05+${PR}+gitr${SRCREV}" PV_omap3-touchbook = "2009.05+${PR}+gitr${SRCREV}"
# hawkboard - master branch (hawk still .07beta) # hawkboard - master branch (hawk still .07beta)
SRC_URI_hawkboard = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=master" SRC_URI_hawkboard = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=master"
SRC_URI_hawkboard += "file://dont-inline-weak-symbols.patch" SRC_URI_hawkboard += "file://dont-inline-weak-symbols2.patch"
SRCREV_hawkboard = "0d291f2f255e6d66a78b3dc2445362a96ae39a57" SRCREV_pn-${PN}_hawkboard = "0d291f2f255e6d66a78b3dc2445362a96ae39a57"
PV_hawkboard = "2009.08+gitr${SRCREV}" PV_hawkboard = "2009.08+gitr${SRCREV}"