[oe-commits] org.oe.dev linux-xilinx-slab : Modify kernel bb file for xilinx based ppc boards using

[crofton commit]

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.

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: a1c5133ec8dfc7768c8883c8aa89593ce01f57cb
ViewMTN: http://monotone.openembedded.org/revision/info/a1c5133ec8dfc7768c8883c8aa89593ce01f57cb
Files:
1
packages/linux/linux-ml403-slab-2.6.x
packages/linux/linux-xilinx-slab
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-xilinx-slab_git.bb
conf/machine/xilinx-ml403.conf
Diffs:

#
# mt diff -r5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c -ra1c5133ec8dfc7768c8883c8aa89593ce01f57cb
#
#
#
# rename "packages/linux/linux-ml403-slab-2.6.x"
#     to "packages/linux/linux-xilinx-slab"
# 
# rename "packages/linux/linux-ml403-slab-2.6.x_git.bb"
#     to "packages/linux/linux-xilinx-slab_git.bb"
# 
# patch "conf/machine/xilinx-ml403.conf"
#  from [6a5a1fcae1d1b17467cc67066deb5c97c1437fc8]
#    to [0e140654c8328017be93eae75e53f91d1209746f]
# 
# patch "packages/linux/linux-xilinx-slab_git.bb"
#  from [1dedc8ec0ccb14b25d9979db1e4af75c63668f9a]
#    to [b4322bd352236d2cf6ff13d326e765337da3772d]
#
============================================================
--- conf/machine/xilinx-ml403.conf	6a5a1fcae1d1b17467cc67066deb5c97c1437fc8
+++ conf/machine/xilinx-ml403.conf	0e140654c8328017be93eae75e53f91d1209746f
@@ -7,7 +7,7 @@ PACKAGE_EXTRA_ARCHS = "ppc405"
 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"
 
============================================================
--- packages/linux/linux-ml403-slab-2.6.x_git.bb	1dedc8ec0ccb14b25d9979db1e4af75c63668f9a
+++ packages/linux/linux-xilinx-slab_git.bb	b4322bd352236d2cf6ff13d326e765337da3772d
@@ -4,18 +4,20 @@ LICENSE = "GPL"
 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"
+SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
 
-SRC_URI = "file://xilinx-ml403_defconfig "
+PR = "r3"
+PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
 
-inherit kernel xilinx-bsp
+COMPATIBLE_MACHINE = "xilinx-ml403"
 
-S = "${WORKDIR}/linux-2.6"
+#inherit kernel xilinx-bsp
+inherit kernel
 
+S = "${WORKDIR}/git"
 
+
 FILES_kernel-image = "/boot/zImage.elf"
 
 export OS = "Linux"
@@ -23,49 +25,15 @@ KERNEL_OUTPUT = "arch/ppc/boot/images/zI
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
-#make sure git-native gets build before as
-python __anonymous () {
+SRC_URI = "\
+           git://git.secretlab.ca/git/linux-2.6-virtex.git;protocol=git \
+          "
 
-    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
+                make ARCH=${ARCH} ml403_defconfig
 }
 
-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 \
@@ -74,7 +42,7 @@ do_deploy() {
 
 #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}
+#}
-do_install_prepend() {
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
-                        arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-}