diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 3 | ||||
| -rw-r--r-- | packages/u-boot/u-boot-openmoko-devel_git.bb | 8 | ||||
| -rw-r--r-- | packages/u-boot/u-boot-openmoko.inc | 4 |
3 files changed, 2 insertions, 13 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 924810e396..c081e0d450 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -195,8 +195,7 @@ SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" SRCREV_pn-tichy ?= "168" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "414367bf5b65942947dd5d569c27d2a8e8e5e562" -SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" +SRCREV_pn-u-boot-openmoko ?= "2b78a9413619902aa4ff55a986b12ece3021fbe3" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-webkit-gtk ?= "36540" diff --git a/packages/u-boot/u-boot-openmoko-devel_git.bb b/packages/u-boot/u-boot-openmoko-devel_git.bb deleted file mode 100644 index 3659241dfa..0000000000 --- a/packages/u-boot/u-boot-openmoko-devel_git.bb +++ /dev/null @@ -1,8 +0,0 @@ -require u-boot-openmoko.inc - -SRC_URI = "\ - git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \ - file://makefile-no-dirafter.patch;patch=1 \ -" -S = "${WORKDIR}/git" - diff --git a/packages/u-boot/u-boot-openmoko.inc b/packages/u-boot/u-boot-openmoko.inc index c25afd38f6..2238d3662a 100644 --- a/packages/u-boot/u-boot-openmoko.inc +++ b/packages/u-boot/u-boot-openmoko.inc @@ -6,12 +6,10 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+gitr${SRCREV}" PV = "1.3.1${LOCALVERSION}" -PR = "r0" +PR = "r1" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" -DEFAULT_PREFERENCE = "-1" - EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" |