u-boot 2011.12RC: move to 2011.12 final
authorKoen Kooi <koen@dominion.thruhere.net>
Thu, 29 Dec 2011 08:08:05 +0000 (09:08 +0100)
committerKoen Kooi <koen@dominion.thruhere.net>
Thu, 29 Dec 2011 09:03:06 +0000 (10:03 +0100)
Also fix the beagleboard expansionboard patch as reported by Peter Bigot

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch
recipes-bsp/u-boot/u-boot_2011.12.bb

index c8bb130995f11f1a2558a31fffef42d3990d1677..31c406391def6ba4ba50989f9cccc84a05092260 100644 (file)
@@ -1,4 +1,4 @@
-From 4422038e69f79993cc21e3649715c9556e68413d Mon Sep 17 00:00:00 2001
+From fe9c653a0b0a3fa49d269b697c2058a6a55aa42b Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Sun, 27 Nov 2011 14:53:56 +0100
 Subject: [PATCH 3/5] beagleboard: add support for scanning loop-through expansionboards like the uLCD-lite
@@ -6,8 +6,8 @@ Subject: [PATCH 3/5] beagleboard: add support for scanning loop-through expansio
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
  board/ti/beagle/beagle.c       |   30 ++++++++++++++++++++++++++----
- include/configs/omap3_beagle.h |    ++
- 2 files changed, 28 insertions(+), 4 deletions(-)
+ include/configs/omap3_beagle.h |    4 ++++
+ 2 files changed, 30 insertions(+), 4 deletions(-)
 
 diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
 index 9c2e6d0..5ea50d1 100644
@@ -81,7 +81,7 @@ index 9c2e6d0..5ea50d1 100644
        switch (get_board_revision()) {
        case REVISION_XM_A:
 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index d4f33d0..04d3eed 100644
+index d4f33d0..65ab8ee 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
 @@ -214,6 +214,7 @@
@@ -92,7 +92,7 @@ index d4f33d0..04d3eed 100644
        "optargs=\0" \
        "camera=none\0" \
        "vram=12M\0" \
-@@ -240,6 +241,7 @@
+@@ -230,6 +231,7 @@
                "${optargs} " \
                "mpurate=${mpurate} " \
                "buddy=${buddy} "\
@@ -100,6 +100,22 @@ index d4f33d0..04d3eed 100644
                "camera=${camera} "\
                "vram=${vram} " \
                "omapfb.mode=dvi:${dvimode} " \
+@@ -240,6 +242,7 @@
+               "${optargs} " \
+               "mpurate=${mpurate} " \
+               "buddy=${buddy} "\
++              "buddy2=${buddy2} "\
+               "camera=${camera} "\
+               "vram=${vram} " \
+               "omapfb.mode=dvi:${dvimode} " \
+@@ -254,6 +257,7 @@
+               "${optargs} " \
+               "mpurate=${mpurate} " \
+               "buddy=${buddy} "\
++              "buddy2=${buddy2} "\
+               "vram=${vram} " \
+               "omapfb.mode=dvi:${dvimode} " \
+               "omapdss.def_disp=${defaultdisplay} " \
 -- 
 1.7.2.5
 
index b735702d0ee4c6a3aacf4dc16c00aa11365f0a0d..5a19066f5b3a49126090b70c75bf8730ab6d1bb7 100644 (file)
@@ -5,8 +5,8 @@ UBOOT_BINARY = "u-boot.img"
 UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.img"
 
-PV = "2011.09+2011.12rc1"
-PR = "r1"
+PV = "2011.12"
+PR = "r0"
 
 # No patches for other machines yet
 COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)"
@@ -19,7 +19,8 @@ SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \
            file://2011.12/0005-omap4-common-use-ext4-by-default.patch \
           "
 
-SRCREV = "d82a27bc5c404da907f71960a3ed2e148ac73fd0"
+# v2011.12 tag
+SRCREV = "cba9a894fdb1cb49b60fcd1d1d6919cbd7995dd5"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"