summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-02-02 01:00:34 -0500
committerSaul Wold <sgw@linux.intel.com>2011-02-03 08:49:21 -0800
commit4714d02e380d13d56a891201abd2f5003153abad (patch)
tree5fda86f7c2371e2d7b710dfdc2810e3c1d9d4ddd /meta
parentacfef9301e6cbb489c8b686b682335f0930728a9 (diff)
downloadpoky-4714d02e380d13d56a891201abd2f5003153abad.tar.gz
linux-yocto: BSP updates
Updating for the sugarbay and beagleboard BSPs. To make the sugbay inhert common-pc-64 generic config/changes/fixes it has been branched in the kernel as yocto/standard/common-pc-64/sugarbar, as a result, we'll bump the common-pc-64 to be yocto/standard/common-pc-64/base. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc24
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_git.bb2
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index a6d5903505..db72140a0e 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -97,18 +97,18 @@ SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "a1c0ed6bf4060c10874b2a8547
97SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "ef7f944e773950d4016b7643f9ecf052bbe250cd" 97SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "ef7f944e773950d4016b7643f9ecf052bbe250cd"
98SRCREV_meta_pn-linux-yocto-stable ?= "e1f85a470934a0cf6abde5d95533e74501822c6b" 98SRCREV_meta_pn-linux-yocto-stable ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
99# development SRCREVs 99# development SRCREVs
100SRCREV_machine_pn-linux-yocto_qemuarm ?= "4f86b5a0cb23faa4134cc004730d673f6640614b" 100SRCREV_machine_pn-linux-yocto_qemuarm ?= "ed53121c69f1217348a442280870eca145d71a8b"
101SRCREV_machine_pn-linux-yocto_qemumips ?= "2b43d84250a582b61397ad5f59a6445ce1258615" 101SRCREV_machine_pn-linux-yocto_qemumips ?= "36c68e6766ab698a63da1ee95bd64e4baa0e796b"
102SRCREV_machine_pn-linux-yocto_qemuppc ?= "20f182db27f3e6fc6bd55bfc9e24c8c023fbff7f" 102SRCREV_machine_pn-linux-yocto_qemuppc ?= "cdb58f93de8c4bb7f10b1dba2ab3f30e2c847030"
103SRCREV_machine_pn-linux-yocto_qemux86 ?= "a9d833fda90e2f1257888a97e092135610b5f259" 103SRCREV_machine_pn-linux-yocto_qemux86 ?= "72ebe58ddeb173881c9b35b98708ff1c70c3eb18"
104SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "a9d833fda90e2f1257888a97e092135610b5f259" 104SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "41ec30ddc42912fec133a533b924e9c56ecda8f9"
105SRCREV_machine_pn-linux-yocto_emenlow ?= "c19e556f79f03c8f1e5e84ccd9b5436c2001fcce" 105SRCREV_machine_pn-linux-yocto_emenlow ?= "92fe45e754d621d90aeb8dc4de156f4ac8f18b1c"
106SRCREV_machine_pn-linux-yocto_atom-pc ?= "a9d833fda90e2f1257888a97e092135610b5f259" 106SRCREV_machine_pn-linux-yocto_atom-pc ?= "41ec30ddc42912fec133a533b924e9c56ecda8f9"
107SRCREV_machine_pn-linux-yocto_routerstationpro ?= "219a5f9dc6e5beced36184e141f80b2df61ae32f" 107SRCREV_machine_pn-linux-yocto_routerstationpro ?= "3266d06c6cc978218ad44bfee53ffa759cd15ed5"
108SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae9538717bc" 108SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "769e9d100a5287983426b74c652d88dc7d9fd47d"
109SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259" 109SRCREV_machine_pn-linux-yocto_beagleboard ?= "41ec30ddc42912fec133a533b924e9c56ecda8f9"
110SRCREV_meta_pn-linux-yocto ?= "e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99" 110SRCREV_meta_pn-linux-yocto ?= "5a32d7fe3b817868ebb697d2d883d743903685ae"
111SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259" 111SRCREV_pn-linux-libc-headers-yocto ??= "41ec30ddc42912fec133a533b924e9c56ecda8f9"
112SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" 112SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
113SRCREV_pn-matchbox-desktop-sato ??= "76" 113SRCREV_pn-matchbox-desktop-sato ??= "76"
114SRCREV_pn-matchbox-desktop ??= "af7ed6775487380be73160aa0298bf6019765fad" 114SRCREV_pn-matchbox-desktop ??= "af7ed6775487380be73160aa0298bf6019765fad"
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb
index 1757c5532a..5f126b37b7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_git.bb
@@ -2,7 +2,7 @@ inherit kernel
2require linux-yocto.inc 2require linux-yocto.inc
3 3
4KMACHINE_qemux86 = "yocto/standard/common-pc/base" 4KMACHINE_qemux86 = "yocto/standard/common-pc/base"
5KMACHINE_qemux86-64 = "yocto/standard/common-pc-64" 5KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base"
6KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" 6KMACHINE_qemuppc = "yocto/standard/qemu-ppc32"
7KMACHINE_qemumips = "yocto/standard/mti-malta32-be" 7KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
8KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" 8KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"