summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJan Lübbe <jluebbe@debian.org>2009-02-17 19:21:25 +0000
committerJan Lübbe <jluebbe@debian.org>2009-02-17 19:22:08 +0000
commitbd44960485fab4e5bf977fade48ef7693ade508d (patch)
treeed0ebc8e61c54759a2c61f1270583575a71397cf /packages
parentd76073e3a32b80a9bf801e27ca49ef33aee71ae6 (diff)
linux-openmoko: fix defconfig names
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/linux-openmoko-2.6.28_git.bb6
-rw-r--r--packages/linux/linux-openmoko-devel_git.bb6
-rw-r--r--packages/linux/linux-openmoko.inc4
3 files changed, 10 insertions, 6 deletions
diff --git a/packages/linux/linux-openmoko-2.6.28_git.bb b/packages/linux/linux-openmoko-2.6.28_git.bb
index 139cb3a12b..014d39df8a 100644
--- a/packages/linux/linux-openmoko-2.6.28_git.bb
+++ b/packages/linux/linux-openmoko-2.6.28_git.bb
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
OEV = "oe1"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
@@ -25,6 +25,10 @@ SRC_URI = "\
"
S = "${WORKDIR}/git"
+CONFIG_NAME_om-gta01 = "gta01-moredrivers-defconfig"
+CONFIG_NAME_om-gta02 = "gta02-packaging-defconfig"
+CONFIG_NAME_om-gta03 = "gta03_defconfig"
+
do_configure_prepend() {
install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 912d482413..110db3af4a 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
OEV = "oe0"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
@@ -17,6 +17,10 @@ SRC_URI = "\
"
S = "${WORKDIR}/git"
+CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
+CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
+CONFIG_NAME_om-gta03 = "gta03_defconfig"
+
do_configure_prepend() {
install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 7bb6cd76c3..522484184b 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -7,10 +7,6 @@ UBOOT_ENTRYPOINT = "30008000"
COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-gta03"
-CONFIG_NAME_om-gta01 = "gta01-moredrivers-defconfig"
-CONFIG_NAME_om-gta02 = "gta02-packaging-defconfig"
-
-CONFIG_NAME_om-gta03 = "gta03_defconfig"
KERNEL_IMAGETYPE_om-gta03 = "zImage"
CMDLINE = "unused -- bootloader passes ATAG list"