diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-10-13 16:27:27 -0400 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-10-13 21:38:51 -0700 |
| commit | cbeb72b90dbfba06d1477edc893f43e4343d8de0 (patch) | |
| tree | e0f1f69ede6803882aaddd691845feb9bc10b393 /meta/recipes-kernel/linux | |
| parent | 48755c4bc6a71b206b054fc6fa349f0c97baef61 (diff) | |
| download | openembedded-core-cbeb72b90dbfba06d1477edc893f43e4343d8de0.tar.gz openembedded-core-cbeb72b90dbfba06d1477edc893f43e4343d8de0.tar.bz2 openembedded-core-cbeb72b90dbfba06d1477edc893f43e4343d8de0.zip | |
atom-pc: switch to the atom-pc branch
The atom-pc has a dedicated branch and merged kernel commits.
Swtich the kernel recipe to use the fully integrated BSP
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-kernel/linux')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-wrs/8250.cfg | 7 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-wrs/i915.cfg | 18 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-wrs_git.bb | 8 |
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 @@ -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_CORE=y -CONFIG_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 @@ -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y - -CONFIG_AGP=y -CONFIG_AGP_INTEL=y -CONFIG_DRM=y -CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_I915=y -CONFIG_DRM_I915_KMS=y - -CONFIG_FB=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_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}" SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \ git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" -SRC_URI_append_atom-pc = "\ - file://i915.cfg \ - file://8250.cfg" - WRMACHINE = "${MACHINE}" WRMACHINE_qemux86 = "common_pc" WRMACHINE_qemux86-64 = "common_pc_64" WRMACHINE_qemuppc = "qemu_ppc32" WRMACHINE_qemumips = "mti_malta32_be" WRMACHINE_qemuarm = "arm_versatile_926ejs" -WRMACHINE_atom-pc = "common_pc" +WRMACHINE_atom-pc = "atom-pc" WRMACHINE_routerstationpro = "routerstationpro" WRMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" WRMACHINE_beagleboard = "beagleboard" @@ -32,7 +28,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|route LINUX_VERSION = "v2.6.34" LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}" -PR = "r9" +PR = "r10" S = "${WORKDIR}/linux" B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build" |