summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc1
-rw-r--r--meta/conf/machine/beagleboard.conf3
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb3
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 67bf4c419b..2507d16aa4 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -91,6 +91,7 @@ SRCREV_machine_pn-linux-wrs_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7
91SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 91SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
93SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 93SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
94SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
94SRCREV_meta_pn-linux-wrs ?= "134a33e3a43579114ca5263e34c18a5d6854d085" 95SRCREV_meta_pn-linux-wrs ?= "134a33e3a43579114ca5263e34c18a5d6854d085"
95SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" 96SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
96SRCREV_pn-matchbox-config-gtk ??= "2081" 97SRCREV_pn-matchbox-config-gtk ??= "2081"
diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf
index 710fc76172..d44b7aaf60 100644
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta/conf/machine/beagleboard.conf
@@ -22,8 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
22# Guesswork 22# Guesswork
23SERIAL_CONSOLE = "115200 ttyS2" 23SERIAL_CONSOLE = "115200 ttyS2"
24 24
25# No kernel recipe yet 25PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
26PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
27 26
28KERNEL_IMAGETYPE = "uImage" 27KERNEL_IMAGETYPE = "uImage"
29 28
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index 00e74022ef..ddc8d3bdce 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -28,8 +28,9 @@ WRMACHINE_qemuarm = "arm_versatile_926ejs"
28WRMACHINE_atom-pc = "common_pc" 28WRMACHINE_atom-pc = "common_pc"
29WRMACHINE_routerstationpro = "routerstationpro" 29WRMACHINE_routerstationpro = "routerstationpro"
30WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" 30WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
31WRMACHINE_beagleboard = "beagleboard"
31 32
32COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb)" 33COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)"
33 34
34LINUX_VERSION = "v2.6.34" 35LINUX_VERSION = "v2.6.34"
35LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}" 36LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"