From 82ff5a0b8523ee185dc0858a4102532d89c47dc5 Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Sun, 12 Aug 2007 15:16:56 +0000
Subject: linux-omap : Move linux-omap1 to linux-omap. linux-omap should work
 for              OMAP{1,2,3} and davinci processors.

---
 packages/linux/linux-omap.inc              | 31 ++++++++++++++++++++++++++++++
 packages/linux/linux-omap1.inc             | 31 ------------------------------
 packages/linux/linux-omap1_2.6.12-rc2.bb   |  2 +-
 packages/linux/linux-omap1_2.6.18+git.bb   |  2 +-
 packages/linux/linux-omap1_2.6.18-omap1.bb |  2 +-
 packages/linux/linux-omap1_2.6.19-omap1.bb |  2 +-
 packages/linux/linux-omap1_2.6.20-omap1.bb |  2 +-
 7 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 packages/linux/linux-omap.inc
 delete mode 100644 packages/linux/linux-omap1.inc

(limited to 'packages')

diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc
new file mode 100644
index 0000000000..e2b168e454
--- /dev/null
+++ b/packages/linux/linux-omap.inc
@@ -0,0 +1,31 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for OMAP processors"
+LICENSE = "GPL"
+DEPENDS = "u-boot"
+
+COMPATIBLE_MACHINE = "omap5912osk"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "uImage"
+
+module_autoload_ohci-hcd_omap5912osk = "ohci-hcd"
+
+do_configure_prepend() {
+
+        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+	       install -m 0644 ${WORKDIR}/defconfig.eabi ${S}/.config
+        else
+	       install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+        fi
+
+        oe_runmake oldconfig
+}
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap1.inc
deleted file mode 100644
index e2b168e454..0000000000
--- a/packages/linux/linux-omap1.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for OMAP processors"
-LICENSE = "GPL"
-DEPENDS = "u-boot"
-
-COMPATIBLE_MACHINE = "omap5912osk"
-
-inherit kernel
-
-KERNEL_IMAGETYPE = "uImage"
-
-module_autoload_ohci-hcd_omap5912osk = "ohci-hcd"
-
-do_configure_prepend() {
-
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
-	       install -m 0644 ${WORKDIR}/defconfig.eabi ${S}/.config
-        else
-	       install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-        fi
-
-        oe_runmake oldconfig
-}
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 1b9a1b6de0..ea25bb8f19 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
 
 PR = "r4"
 
diff --git a/packages/linux/linux-omap1_2.6.18+git.bb b/packages/linux/linux-omap1_2.6.18+git.bb
index a097caa113..61edc96c39 100644
--- a/packages/linux/linux-omap1_2.6.18+git.bb
+++ b/packages/linux/linux-omap1_2.6.18+git.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
 
 PR = "r2"
 
diff --git a/packages/linux/linux-omap1_2.6.18-omap1.bb b/packages/linux/linux-omap1_2.6.18-omap1.bb
index 7c087e8cba..46f10dbe7b 100644
--- a/packages/linux/linux-omap1_2.6.18-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.18-omap1.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            http://www.muru.com/linux/omap/patches/patch-2.6.18-omap1.bz2;patch=1 \
diff --git a/packages/linux/linux-omap1_2.6.19-omap1.bb b/packages/linux/linux-omap1_2.6.19-omap1.bb
index 1734149180..3ce97aa87f 100644
--- a/packages/linux/linux-omap1_2.6.19-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.19-omap1.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2;patch=1 \
diff --git a/packages/linux/linux-omap1_2.6.20-omap1.bb b/packages/linux/linux-omap1_2.6.20-omap1.bb
index 770883fbb6..fe747a7a35 100644
--- a/packages/linux/linux-omap1_2.6.20-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.20-omap1.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
            http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2;patch=1 \
-- 
cgit 1.2.3-korg