diff options
| -rw-r--r-- | packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb | 3 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko.inc | 101 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko_2.6.22.5.bb | 3 |
3 files changed, 9 insertions, 98 deletions
diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb index e1686eada9..6be1a2382f 100644 --- a/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb +++ b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb @@ -1,4 +1,5 @@ require linux.inc +require linux-openmoko.inc DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" VANILLA_VERSION = "2.6.23" @@ -10,7 +11,7 @@ KERNEL_RELEASE = "2.6.23.1" KERNEL_VERSION = "${KERNEL_RELEASE}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r1" +PR = "r2" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index e6e41cfc08..fc4a547fd7 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -1,100 +1,9 @@ -SECTION = "kernel" -AUTHOR = "Harald Welte <laforge@openmoko.org>" -HOMEPAGE = "http://www.openmoko.org" -LICENSE = "GPL" -DEPENDS += "u-boot-mkimage-openmoko-native" +# extra stuff we need for openmoko that is not in linux.inc -inherit kernel - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-openmoko" -DEFCONFIG = "defconfig-${VANILLA_VERSION}-${MACHINE}" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - file://${DEFCONFIG} \ - file://logo_linux_clut224.ppm" -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -FILES_kernel-image = "" -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old -} - -do_configure() { - install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm - - if [ ! -e ${WORKDIR}/${DEFCONFIG} ]; then - die "No default configuration for ${MACHINE} available." - fi - - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - - if [ "${TARGET_OS}" = "linux-gnueabi" ]; then - echo "CONFIG_AEABI=y" >> ${S}/.config - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else - echo "# CONFIG_AEABI is not set" >> ${S}/.config - echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config - fi - - sed -e '/CONFIG_AEABI/d' \ - -e '/CONFIG_OABI_COMPAT=/d' \ - -e '/CONFIG_CMDLINE=/d' \ - -e '/CONFIG_MTD_MTDRAM_SA1100=/d' \ - -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \ - -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \ - -e '/CONFIG_MTDRAM_ABS_POS=/d' \ - '${WORKDIR}/${DEFCONFIG}' >>'${S}/.config' - - yes '' | oe_runmake oldconfig -} - -############################################################### -# put into deploy directory and append u-boot header -# -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - 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/2)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin +do_deploy_append() { + mv ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz + mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.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 - rm -f linux.bin.gz } -do_deploy[dirs] = "${S}" - -addtask prepatch before do_patch after do_unpack -addtask deploy before do_package after do_install - diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index 7241d59183..239400df15 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -1,4 +1,5 @@ require linux.inc +require linux-openmoko.inc DESCRIPTION = "Linux 2.6.x kernel for FIC SmartPhones shipping w/ OpenMoko" VANILLA_VERSION = "2.6.22" @@ -8,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r4" +PR = "r5" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" |