summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-wrs/8250.cfg7
-rw-r--r--meta/recipes-kernel/linux/linux-wrs/i915.cfg18
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb8
3 files changed, 2 insertions, 31 deletions
diff --git a/meta/recipes-kernel/linux/linux-wrs/8250.cfg b/meta/recipes-kernel/linux/linux-wrs/8250.cfg
deleted file mode 100644
index 5a1cf7a77e..0000000000
--- a/meta/recipes-kernel/linux/linux-wrs/8250.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
1CONFIG_SERIAL_8250=y
2CONFIG_SERIAL_8250_CONSOLE=y
3CONFIG_SERIAL_8250_PCI=y
4CONFIG_SERIAL_8250_NR_UARTS=4
5CONFIG_SERIAL_8250_RUNTIME_UARTS=4
6CONFIG_SERIAL_CORE=y
7CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/meta/recipes-kernel/linux/linux-wrs/i915.cfg b/meta/recipes-kernel/linux/linux-wrs/i915.cfg
deleted file mode 100644
index 9b228225fb..0000000000
--- a/meta/recipes-kernel/linux/linux-wrs/i915.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
1CONFIG_I2C=y
2CONFIG_I2C_BOARDINFO=y
3CONFIG_I2C_COMPAT=y
4CONFIG_I2C_HELPER_AUTO=y
5CONFIG_I2C_ALGOBIT=y
6
7CONFIG_AGP=y
8CONFIG_AGP_INTEL=y
9CONFIG_DRM=y
10CONFIG_DRM_KMS_HELPER=y
11CONFIG_DRM_I915=y
12CONFIG_DRM_I915_KMS=y
13
14CONFIG_FB=y
15CONFIG_FB_CFB_FILLRECT=y
16CONFIG_FB_CFB_COPYAREA=y
17CONFIG_FB_CFB_IMAGEBLIT=y
18CONFIG_FRAMEBUFFER_CONSOLE=y
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index 4178f4b171..45c11505b3 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -13,17 +13,13 @@ PV = "2.6.34+git${SRCPV}"
13SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \ 13SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \
14 git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" 14 git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
15 15
16SRC_URI_append_atom-pc = "\
17 file://i915.cfg \
18 file://8250.cfg"
19
20WRMACHINE = "${MACHINE}" 16WRMACHINE = "${MACHINE}"
21WRMACHINE_qemux86 = "common_pc" 17WRMACHINE_qemux86 = "common_pc"
22WRMACHINE_qemux86-64 = "common_pc_64" 18WRMACHINE_qemux86-64 = "common_pc_64"
23WRMACHINE_qemuppc = "qemu_ppc32" 19WRMACHINE_qemuppc = "qemu_ppc32"
24WRMACHINE_qemumips = "mti_malta32_be" 20WRMACHINE_qemumips = "mti_malta32_be"
25WRMACHINE_qemuarm = "arm_versatile_926ejs" 21WRMACHINE_qemuarm = "arm_versatile_926ejs"
26WRMACHINE_atom-pc = "common_pc" 22WRMACHINE_atom-pc = "atom-pc"
27WRMACHINE_routerstationpro = "routerstationpro" 23WRMACHINE_routerstationpro = "routerstationpro"
28WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" 24WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
29WRMACHINE_beagleboard = "beagleboard" 25WRMACHINE_beagleboard = "beagleboard"
@@ -32,7 +28,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|route
32 28
33LINUX_VERSION = "v2.6.34" 29LINUX_VERSION = "v2.6.34"
34LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}" 30LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"
35PR = "r9" 31PR = "r10"
36 32
37S = "${WORKDIR}/linux" 33S = "${WORKDIR}/linux"
38B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build" 34B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build"