diff options
| -rw-r--r-- | conf/distro/openmoko.conf | 11 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko.inc | 4 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko_2.6.24.bb | 11 |
3 files changed, 15 insertions, 11 deletions
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 62d2189c8a..2b7aea03b9 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -47,10 +47,13 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd" # override the PACKAGE_ARCH of certain packages for openmoko distro # # Same kernel runs on both these machines -PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}" +# Currently not used but left here in case someone wants to switch on +# quickly +#PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}" + # Same kernel so same usb PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}" diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index 4f1981c8b3..69d7845f04 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -1,9 +1,7 @@ # extra stuff we need for openmoko that is not in linux.inc do_deploy_append() { - mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz - mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin + ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_ARCH}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_ARCH}-latest.bin } RDEPENDS_kernel-image += "mtd-utils" diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb index 0a7b34ba30..b60a43efe4 100644 --- a/packages/linux/linux-openmoko_2.6.24.bb +++ b/packages/linux/linux-openmoko_2.6.24.bb @@ -11,10 +11,10 @@ KERNEL_VERSION = "${KERNEL_RELEASE}" # re-enabled this when feature is fully implemented in OE #SRCREV_FORMAT = "patches-rconfig" SRCREV_FORMAT = "patches" -CONFIG_REV = "4165" - +CONFIG_REV_fic-gta01 = "4251" +CONFIG_REV_fic-gta02 = "4251" PV = "${VANILLA_VERSION}+svnr${SRCREV}-r${CONFIG_REV}" -PR = "r4" +PR = "r5" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" @@ -55,11 +55,14 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss" # sd/mmc module_autoload_s3cmci = "s3cmci" +CONFIG_NAME_fic-gta01 = "gta01" +CONFIG_NAME_fic-gta02 = "gta02" + do_prepatch() { mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av mv patches patches.openmoko mv .pc .pc.old - mv ${WORKDIR}/config/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig + mv ${WORKDIR}/config/defconfig-${CONFIG_NAME} ${WORKDIR}/defconfig } addtask prepatch after do_unpack before do_patch |