linux-omap 2.6.37rc2: add patch to add omap_rev_* macros

Signed-off-by: Koen Kooi <k-kooi@ti.com>

diff --git a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
index 09b2075..43059b2 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
@@ -1,7 +1,7 @@
 From 26383be87990cba18af2da275d12781d179215a8 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 6 Oct 2010 10:19:34 +0200
-Subject: [PATCH 1/7] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
+Subject: [PATCH 1/8] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
 
 Add support for Tincantools Zippy and Zippy2 expansionboards as well
 

diff --git a/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch b/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch
index 2a3eaf9..0a28478 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch
@@ -1,7 +1,7 @@
 From 3f6d595815a2362c3c7b3ed0db48aad2436f2c4e Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 8 Mar 2010 14:38:31 +0100
-Subject: [PATCH 2/7] modedb.c: add proper 720p60 mode
+Subject: [PATCH 2/8] modedb.c: add proper 720p60 mode
 
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
 ---

diff --git a/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch b/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch
index 8fe3fea..f683194 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch
@@ -1,7 +1,7 @@
 From 5eca3854e9bd6fa1d27f2def25176bb9fc27b86d Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 7 Oct 2010 09:25:45 +0200
-Subject: [PATCH 3/7] ARM: OMAP: fix USB initialization for beagleboard-xM
+Subject: [PATCH 3/8] ARM: OMAP: fix USB initialization for beagleboard-xM
 
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
 ---

diff --git a/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
index 061116b..bc6a224 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
@@ -1,7 +1,7 @@
 From c423f45fee0b6b5148e9ad31a79761b8562e2df8 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 7 Oct 2010 11:46:01 +0200
-Subject: [PATCH 4/7] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-x<
+Subject: [PATCH 4/8] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-x<
 
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
 ---

diff --git a/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch b/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch
index 2e81145..5b2f740 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch
@@ -1,7 +1,7 @@
 From 386961b3ee4201286f1f0d91785a0edc9f053360 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 4 Jan 2010 19:20:25 -0800
-Subject: [PATCH 5/7] mmc: don't display single block read console messages
+Subject: [PATCH 5/8] mmc: don't display single block read console messages
 
 mmc: don't display single block read console messages
 ---

diff --git a/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch b/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch
index a9cec4c..8226b19 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch
@@ -1,7 +1,7 @@
 From 7565934e99f3e0b2a4d1bdae5542db7ceda03ccf Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 26 Apr 2010 11:17:26 -0700
-Subject: [PATCH 6/7] MTD: silence ecc errors on mtdblock0
+Subject: [PATCH 6/8] MTD: silence ecc errors on mtdblock0
 
 mtdblock0 is the x-load partition, which uses hw ecc
 this confuses linux, which uses sw ecc

diff --git a/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch b/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch
index a24acac..e938f72 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch
@@ -1,7 +1,7 @@
 From f88552cc59b8292b45dd16ec56198e50f040122a Mon Sep 17 00:00:00 2001
 From: Mike Galbraith <efault@gmx.de>
 Date: Fri, 19 Nov 2010 12:52:42 +0100
-Subject: [PATCH 7/7] Miracle patch
+Subject: [PATCH 7/8] Miracle patch
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch b/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch
new file mode 100644 (file)
index 0000000..abf8ff3
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch
@@ -0,0 +1,81 @@
+From 7b1ce28ae31b4114634d1b1b67f8de7a4d8df20d Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 23 Nov 2010 11:40:20 +0100
+Subject: [PATCH 8/8] ARM: OMAP: add omap_rev_* macros
+
+This is just to make the SGX modules build that depend on omap_rev_lt_3_0
+
+Signed-off-by: Koen Kooi <koen@beagleboard.org>
+---
+ arch/arm/plat-omap/include/plat/cpu.h |   55 +++++++++++++++++++++++++++++++++
+ 1 files changed, 55 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
+index 3fd8b40..1a8c347 100644
+--- a/arch/arm/plat-omap/include/plat/cpu.h
++++ b/arch/arm/plat-omap/include/plat/cpu.h
+@@ -394,6 +394,61 @@ IS_OMAP_TYPE(3517, 0x3517)
+ #define OMAP4430_REV_ES2_0    0x44301044
+ 
+ /*
++ * Silicon revisions
++ */
++#define OMAP_ES_1_0           0x00
++#define OMAP_ES_2_0           0x10
++#define OMAP_ES_2_1           0x20
++#define OMAP_ES_3_0           0x30
++#define OMAP_ES_3_1           0x40
++
++#define OMAP_REV_MASK         0x0000ff00
++#define OMAP_REV_BITS         ((omap_rev() & OMAP_REV_MASK) >> 8)
++
++#define OMAP_REV_IS(revid)                                    \
++static inline u8 omap_rev_is_ ##revid (void)                  \
++{                                                             \
++      return (OMAP_REV_BITS == OMAP_ES_ ##revid) ? 1 : 0;     \
++}
++
++#define OMAP_REV_LT(revid)                                    \
++static inline u8 omap_rev_lt_ ##revid (void)                  \
++{                                                             \
++      return (OMAP_REV_BITS < OMAP_ES_ ##revid) ? 1 : 0;      \
++}
++
++#define OMAP_REV_LE(revid)                                    \
++static inline u8 omap_rev_le_ ##revid (void)                  \
++{                                                             \
++      return (OMAP_REV_BITS <= OMAP_ES_ ##revid) ? 1 : 0;     \
++}
++
++#define OMAP_REV_GT(revid)                                    \
++static inline u8 omap_rev_gt_ ##revid (void)                  \
++{                                                             \
++      return (OMAP_REV_BITS > OMAP_ES_ ##revid) ? 1 : 0;      \
++}
++
++#define OMAP_REV_GE(revid)                                    \
++static inline u8 omap_rev_ge_ ##revid (void)                  \
++{                                                             \
++      return (OMAP_REV_BITS >= OMAP_ES_ ##revid) ? 1 : 0;     \
++}
++
++#define OMAP_REV_FUNCTIONS(revid)     \
++      OMAP_REV_IS(revid)              \
++      OMAP_REV_LT(revid)              \
++      OMAP_REV_LE(revid)              \
++      OMAP_REV_GT(revid)              \
++      OMAP_REV_GE(revid)
++
++OMAP_REV_FUNCTIONS(1_0)
++OMAP_REV_FUNCTIONS(2_0)
++OMAP_REV_FUNCTIONS(2_1)
++OMAP_REV_FUNCTIONS(3_0)
++OMAP_REV_FUNCTIONS(3_1)
++
++/*
+  * omap_chip bits
+  *
+  * CHIP_IS_OMAP{2420,2430,3430} indicate that a particular structure is
+-- 
+1.6.6.1
+

diff --git a/recipes/linux/linux-omap_2.6.37rc.bb b/recipes/linux/linux-omap_2.6.37rc.bb
index 68851f1..553f015 100644 (file)
--- a/recipes/linux/linux-omap_2.6.37rc.bb
+++ b/recipes/linux/linux-omap_2.6.37rc.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
 PV = "2.6.36+2.6.37-rc2"
-MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
 SRCREV = "8973a21e18241081d16693504d7c0ed5b9918716"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.37rc:"
@@ -25,6 +25,7 @@ SRC_URI_append = " \
                   file://0005-mmc-don-t-display-single-block-read-console-messages.patch \
                   file://0006-MTD-silence-ecc-errors-on-mtdblock0.patch \
                   file://0007-Miracle-patch.patch \
+                  file://0008-ARM-OMAP-add-omap_rev_-macros.patch \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \