diff options
| -rw-r--r-- | conf/distro/openmoko.conf | 28 | ||||
| -rw-r--r-- | conf/machine/fic-gta01.conf | 3 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 5 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko.inc | 8 |
4 files changed, 37 insertions, 7 deletions
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 8657b1140a..d8779a8da6 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -39,3 +39,31 @@ require conf/distro/include/preferred-openmoko-versions.inc # Bleeding-edge developers should add the following line to their local.conf: # require conf/distro/include/moko-autorev.inc +# 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}" +# Same touchscreen on both these machines +PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}" +SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0" +SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0" +# 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}" +# same kernel so same keymaps +PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" +# neod knows about both machines +PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" + +# Select packge versions we wash to use. +PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" +PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" + +# deploy gta01 and gta02 in ${MACHINE_CLASS} directory +DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" +DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" + diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index ffd3584da6..bd14df5814 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -5,7 +5,8 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index ac85afc48c..1760424fc8 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -5,7 +5,8 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" @@ -46,4 +47,4 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" include conf/machine/include/tune-arm920t.inc # build YAFFS2 -IMAGE_FSTYPES =+ "yaffs2" +IMAGE_FSTYPES ?= "jffs2 yaffs2" diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index d6b464c301..e6e41cfc08 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -83,13 +83,13 @@ do_configure() { # do_deploy() { install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE_CLASS}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE_CLASS}.tgz -C ${D} lib ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin + ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01/2)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin rm -f linux.bin.gz } |