linux 2.6.22: merge 2.6.22.6 recipe as it is 2.6.22.19 now

diff --git a/recipes/linux/linux-2.6.22.6/mx31moboard/defconfig b/recipes/linux/linux-2.6.22/mx31moboard/defconfig
similarity index 100%
rename from recipes/linux/linux-2.6.22.6/mx31moboard/defconfig
rename to recipes/linux/linux-2.6.22/mx31moboard/defconfig

diff --git a/recipes/linux/linux_2.6.22.6.bb b/recipes/linux/linux_2.6.22.6.bb
deleted file mode 100644 (file)
index 69b988e..0000000
--- a/recipes/linux/linux_2.6.22.6.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require linux.inc
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_ts72xx = "1"
-DEFAULT_PREFERENCE_mx31moboard = "1"
-
-PR = "r1"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.bz2;patch=1 \
-           file://defconfig \
-           "
-
-SRC_URI_append_ts72xx = "\
-           file://ep93xx-gpio-interrupt-debounce.diff;patch=1 \
-           file://ep93xx-i2c-bus.diff;patch=1 \
-           file://ep93xx-i2c.diff;patch=1 \
-           file://ep93xx-leds.diff;patch=1 \
-           file://ep93xx-serial-uartbaud.diff;patch=1 \
-           file://ep93xx-serial-clocks.diff;patch=1 \
-           file://ep93xx-timer-accuracy.diff;patch=1 \
-           file://ep93xx-maverick-uniqid.patch;patch=1 \
-           file://ts72xx-nfbit-fix.patch;patch=1 \
-           file://ts72xx-machine-id-fix.patch;patch=1 \
-           file://ts72xx-watchdog.patch;patch=1 \
-           file://ts72xx-use-cpld-reset.patch;patch=1 \
-           "
-
-SRC_URI_append_mx31moboard = "http://mobots.epfl.ch/mx31moboard/linux-2.6.22-moboard.patch.bz2;patch=1"
-
-S = "${WORKDIR}/linux-2.6.22"

diff --git a/recipes/linux/linux_2.6.22.bb b/recipes/linux/linux_2.6.22.bb
index a2d4f55..8533df5 100644 (file)
--- a/recipes/linux/linux_2.6.22.bb
+++ b/recipes/linux/linux_2.6.22.bb
@@ -4,6 +4,8 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_cm-x270 = "-1"
 DEFAULT_PREFERENCE_bd-neon = "0"
+DEFAULT_PREFERENCE_ts72xx = "1"
+DEFAULT_PREFERENCE_mx31moboard = "1"
 
 PR = "r6"
 
@@ -22,6 +24,23 @@ SRC_URI_append_cm-x270 = "\
        file://0007-mmcsd_large_cards-r0.patch;patch=1 \
        file://0008-cm-x270-nand-simplify-name.patch;patch=1"
 
+SRC_URI_append_ts72xx = "\
+           file://ep93xx-gpio-interrupt-debounce.diff;patch=1 \
+           file://ep93xx-i2c-bus.diff;patch=1 \
+           file://ep93xx-i2c.diff;patch=1 \
+           file://ep93xx-leds.diff;patch=1 \
+           file://ep93xx-serial-uartbaud.diff;patch=1 \
+           file://ep93xx-serial-clocks.diff;patch=1 \
+           file://ep93xx-timer-accuracy.diff;patch=1 \
+           file://ep93xx-maverick-uniqid.patch;patch=1 \
+           file://ts72xx-nfbit-fix.patch;patch=1 \
+           file://ts72xx-machine-id-fix.patch;patch=1 \
+           file://ts72xx-watchdog.patch;patch=1 \
+           file://ts72xx-use-cpld-reset.patch;patch=1 \
+           "
+
+SRC_URI_append_mx31moboard = "http://mobots.epfl.ch/mx31moboard/linux-2.6.22-moboard.patch.bz2;patch=1"
+
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
 FILES_kernel-image_cm-x270 = ""