diff options
author | Philip Balister <philip@balister.org> | 2008-06-26 14:25:49 +0000 |
---|---|---|
committer | Philip Balister <philip@balister.org> | 2008-06-26 14:25:49 +0000 |
commit | d032555264023e95a5e9847be6133dd1d8c974c8 (patch) | |
tree | 390599e37a07d5b836a27f9afeeb1d132cea7591 | |
parent | 40b978626b9884ba8f821e702d34d437249d9762 (diff) |
linux-xilinx-slab : Modify kernel bb file for xilinx based ppc boards using
secretlab.cs git repo so they compile. The resulting kernel
may not work, but creating images needs a buildable kernel
bb file. With this commit console image for the xlinix-ml403
dev board builds.
-rw-r--r-- | conf/machine/xilinx-ml403.conf | 2 | ||||
-rw-r--r-- | packages/linux/linux-ml403-slab-2.6.x_git.bb | 80 | ||||
-rw-r--r-- | packages/linux/linux-xilinx-slab/.mtn2git_empty (renamed from packages/linux/linux-ml403-slab-2.6.x/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/linux/linux-xilinx-slab/xilinx-ml403_defconfig (renamed from packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig) | 0 | ||||
-rw-r--r-- | packages/linux/linux-xilinx-slab_git.bb | 48 |
5 files changed, 49 insertions, 81 deletions
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf index 9b51b87a7f..219d1f301e 100644 --- a/conf/machine/xilinx-ml403.conf +++ b/conf/machine/xilinx-ml403.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc405" -PREFERRED_PROVIDER_virtual/kernel = "linux-ml403-slab-2.6.x" +PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab" MACHINE_FEATURES = "kernel26 ext2" diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb deleted file mode 100644 index ad823c2aa6..0000000000 --- a/packages/linux/linux-ml403-slab-2.6.x_git.bb +++ /dev/null @@ -1,80 +0,0 @@ -#Kernel for the xilinx-ml403 board using SecretLabs git tree -# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved -# Released under the MIT license (see packages/COPYING) -SECTION = "kernel" -DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board" -LICENSE = "GPL" -PR = "r2" -PV = "2.6+git${SRCDATE}" - -COMPATIBLE_MACHINE = "xilinx-ml403" - -SRC_URI = "file://xilinx-ml403_defconfig " - -inherit kernel xilinx-bsp - -S = "${WORKDIR}/linux-2.6" - - -FILES_kernel-image = "/boot/zImage.elf" - -export OS = "Linux" -ARCH = "ppc" -KERNEL_IMAGETYPE = "zImage" -KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf" - -#make sure git-native gets build before as -python __anonymous () { - - import bb - - - depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" - depends = depends + " git-native:do_populate_staging" - bb.data.setVarFlag('do_fetch', 'depends', depends, d) - -} - - -do_fetch () { - - cd ${WORKDIR} - ${STAGING_BINDIR_NATIVE}/git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - cd linux-2.6 - ${STAGING_BINDIR_NATIVE}/git clone git://git.secretlab.ca/git/linux-2.6-virtex.git master -} - - - -do_configure() { - - install -m 644 ${WORKDIR}/xilinx-ml403_defconfig ${S}/.config - make ARCH=${ARCH} oldconfig -} - -do_stage_append () { -#need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ - - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ -} - - - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \ - ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} -} - -#seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?) -#so we need to copy the kernel image where kernel.bbclass expects it to be -do_install_prepend() { - install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \ - arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -} diff --git a/packages/linux/linux-ml403-slab-2.6.x/.mtn2git_empty b/packages/linux/linux-xilinx-slab/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-ml403-slab-2.6.x/.mtn2git_empty +++ b/packages/linux/linux-xilinx-slab/.mtn2git_empty diff --git a/packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig b/packages/linux/linux-xilinx-slab/xilinx-ml403_defconfig index 3babe21954..3babe21954 100644 --- a/packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig +++ b/packages/linux/linux-xilinx-slab/xilinx-ml403_defconfig diff --git a/packages/linux/linux-xilinx-slab_git.bb b/packages/linux/linux-xilinx-slab_git.bb new file mode 100644 index 0000000000..df71fee865 --- /dev/null +++ b/packages/linux/linux-xilinx-slab_git.bb @@ -0,0 +1,48 @@ +#Kernel for the xilinx-ml403 board using SecretLabs git tree +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +SECTION = "kernel" +DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board" +LICENSE = "GPL" + +SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c" + +PR = "r3" +PV = "2.6.25+2.6.26+${PR}+git${SRCREV}" + +COMPATIBLE_MACHINE = "xilinx-ml403" + +#inherit kernel xilinx-bsp +inherit kernel + +S = "${WORKDIR}/git" + + +FILES_kernel-image = "/boot/zImage.elf" + +export OS = "Linux" +ARCH = "ppc" +KERNEL_IMAGETYPE = "zImage" +KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf" + +SRC_URI = "\ + git://git.secretlab.ca/git/linux-2.6-virtex.git;protocol=git \ + " + +do_configure() { + + make ARCH=${ARCH} ml403_defconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \ + ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +#seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?) +#so we need to copy the kernel image where kernel.bbclass expects it to be +#do_install_prepend() { +# install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \ +# arch/${ARCH}/boot/${KERNEL_IMAGETYPE} +#} |