[PATCH 0/5][PULL] meta-xilinx powerpc bsp

[PATCH 0/5][PULL] meta-xilinx powerpc bsp

[Adrian Alonso]

Several fixes for meta-xilinx powerpc bsp support

Pull URL: git://git.pokylinux.org/meta-xilinx.git
  Branch: powerpc-support
  Browse: http://git.pokylinux.org/cgit.cgi/meta-xilinx/log/?h=powerpc-support

Thanks,
    Adrian Alonso <aalonso@secretlab.ca>
---


Adrian Alonso (5):
  virtex4: add u-boot image to rootfs
  virtex5: add u-boot image to rootfs
  u-boot-xilinx: fix missing license definition
  openssl: Fix files search path
  linux-xilinx: update kernel version

 conf/machine/virtex4.conf                          |    2 +
 conf/machine/virtex5.conf                          |    2 +
 recipes-bsp/uboot/u-boot-xilinx_git.bb             |    6 +-
 ...enssl-linux-gnueabi-powerpc-configuration.patch |    0
 .../openssl/openssl_0.9.8p.bbappend                |    5 +-
 recipes-kernel/linux/linux-xilinx_git.bb           |    8 +-
 recipes-kernel/linux/linux.inc                     |   95 ++++++++++++++++++++
 7 files changed, 109 insertions(+), 9 deletions(-)
 rename recipes-connectivity/openssl/{openssl-0.9.8p => files}/openssl-linux-gnueabi-powerpc-configuration.patch (100%)
 create mode 100644 recipes-kernel/linux/linux.inc

-- 
1.7.4

[PATCH 1/5] virtex4: add u-boot image to rootfs

[Adrian Alonso]

* Add u-boot image to EXTRA_IMAGEDEPENDS
  Trigger u-boot elf built and to be exported to hardware
  project path (see xilinx-boot.bbclass).

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
---
 conf/machine/virtex4.conf |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/conf/machine/virtex4.conf b/conf/machine/virtex4.conf
index f9643cb..114b4b7 100644
--- a/conf/machine/virtex4.conf
+++ b/conf/machine/virtex4.conf
@@ -13,6 +13,8 @@ require conf/machine/include/tune-ppc405.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx"
 PREFERRED_VERSION_u-boot_virtex4 = "u-boot-xilinx"
+# Add u-boot image
+EXTRA_IMAGEDEPENDS += "u-boot-xilinx"
 
 KERNEL_IMAGETYPE = "uImage"
 
-- 
1.7.4

[PATCH 2/5] virtex5: add u-boot image to rootfs

[Adrian Alonso]

* Add u-boot image to EXTRA_IMAGEDEPENDS
  Trigger u-boot elf built and to be exported to hardware
  project path (see xilinx-boot.bbclass).

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
---
 conf/machine/virtex5.conf |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/conf/machine/virtex5.conf b/conf/machine/virtex5.conf
index 232ab6a..b9ea61e 100644
--- a/conf/machine/virtex5.conf
+++ b/conf/machine/virtex5.conf
@@ -13,6 +13,8 @@ require conf/machine/include/tune-ppc440.inc
 #ASSUME_PROVIDED += "virtual/kernel"
 PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx"
 PREFERRED_VERSION_u-boot_virtex5 = "u-boot-xilinx"
+# Add u-boot image
+EXTRA_IMAGEDEPENDS += "u-boot-xilinx"
 
 KERNEL_IMAGETYPE = "uImage"
 
-- 
1.7.4

[PATCH 3/5] u-boot-xilinx: fix missing license definition

[Adrian Alonso]

* Fix missing LICENSE definition
* Update u-boot-xilinx preferred version (sync with xilinx repo).
* Increase PR

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
---
 recipes-bsp/uboot/u-boot-xilinx_git.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/uboot/u-boot-xilinx_git.bb b/recipes-bsp/uboot/u-boot-xilinx_git.bb
index 49f5ad4..2483c4b 100644
--- a/recipes-bsp/uboot/u-boot-xilinx_git.bb
+++ b/recipes-bsp/uboot/u-boot-xilinx_git.bb
@@ -1,12 +1,14 @@
 require recipes-bsp/uboot/u-boot.inc
-PR = "r7"
+PR = "r8"
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
+LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2'"
 BRANCH="master"
-TAG="e094f2479ea339d7f48b6826f06f0be4984d9a98"
+#TAG="e094f2479ea339d7f48b6826f06f0be4984d9a98"
+TAG="d49297009f402a20dd59b21212975dd3d79ee6fd"
 SRC_URI = "git://git.xilinx.com/u-boot-xlnx.git;branch=${BRANCH};protocol=git \
            file://uboot-remove-inline-qualifier-from-show_boot_progres.patch \
            file://ml405-add-uartlite-config-options.patch \
-- 
1.7.4

[PATCH 4/5] openssl: Fix files search path

[Adrian Alonso]

* Fix FILESPATH, recipe not finding layer patch
  rename PN to files

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
---
 ...enssl-linux-gnueabi-powerpc-configuration.patch |    0
 .../openssl/openssl_0.9.8p.bbappend                |    5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename recipes-connectivity/openssl/{openssl-0.9.8p => files}/openssl-linux-gnueabi-powerpc-configuration.patch (100%)

diff --git a/recipes-connectivity/openssl/openssl-0.9.8p/openssl-linux-gnueabi-powerpc-configuration.patch b/recipes-connectivity/openssl/files/openssl-linux-gnueabi-powerpc-configuration.patch
similarity index 100%
rename from recipes-connectivity/openssl/openssl-0.9.8p/openssl-linux-gnueabi-powerpc-configuration.patch
rename to recipes-connectivity/openssl/files/openssl-linux-gnueabi-powerpc-configuration.patch
diff --git a/recipes-connectivity/openssl/openssl_0.9.8p.bbappend b/recipes-connectivity/openssl/openssl_0.9.8p.bbappend
index 381f31c..91f7a85 100644
--- a/recipes-connectivity/openssl/openssl_0.9.8p.bbappend
+++ b/recipes-connectivity/openssl/openssl_0.9.8p.bbappend
@@ -1,5 +1,4 @@
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
-SRC_URI_append += "file://openssl-linux-gnueabi-powerpc-configuration.patch \
-                  "
+SRC_URI_append += "file://openssl-linux-gnueabi-powerpc-configuration.patch"
-- 
1.7.4

[PATCH 5/5] linux-xilinx: update kernel version

[Adrian Alonso]

* Sync kernel version to 2.6.37 from xilinx repo
* Add linux.inc to meta-xilinx layer (deprecated in main layer).
* Increase PR

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
---
 recipes-kernel/linux/linux-xilinx_git.bb |    8 +-
 recipes-kernel/linux/linux.inc           |   95 ++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 recipes-kernel/linux/linux.inc

diff --git a/recipes-kernel/linux/linux-xilinx_git.bb b/recipes-kernel/linux/linux-xilinx_git.bb
index 1d15437..8ef2d5a 100644
--- a/recipes-kernel/linux/linux-xilinx_git.bb
+++ b/recipes-kernel/linux/linux-xilinx_git.bb
@@ -1,4 +1,4 @@
-require recipes-kernel/linux/linux.inc
+require linux.inc
 
 DESCRIPTION = "Linux kernel for Xilinx platforms"
 
@@ -10,9 +10,9 @@ DEFAULT_PREFERENCE_virtex5 = "1"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-TAG="xilinx_v2.6.37-rc4"
-PV = "2.6.37.4"
-PR = "r5"
+TAG="xilinx_v2.6.37"
+PV = "2.6.37"
+PR = "r6"
 
 SRCREV = "${TAG}"
 SRC_URI = "git://git.xilinx.com/linux-2.6-xlnx.git;protocol=git \
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
new file mode 100644
index 0000000..f0b47da
--- /dev/null
+++ b/recipes-kernel/linux/linux.inc
@@ -0,0 +1,95 @@
+DESCRIPTION = "Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel
+require linux-dtb.inc
+
+DEPENDS_append_em-x270 = " mtd-utils "
+
+RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
+
+# Specify the commandline for your device
+
+#boot from mmc
+CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
+#boot from nfs
+#CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0"
+
+do_configure_prepend() {
+        echo "" > ${S}/.config
+
+        #
+        # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
+        #
+        if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
+                install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+                echo "CONFIG_LOGO=y"                    >> ${S}/.config
+                echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
+        fi
+
+        #
+        # oabi / eabi support
+        #
+        if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
+                echo "CONFIG_AEABI=y"                   >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"             >> ${S}/.config
+        else
+                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+        fi
+
+        echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+
+        sed -e '/CONFIG_AEABI/d' \
+            -e '/CONFIG_OABI_COMPAT=/d' \
+            -e '/CONFIG_CMDLINE=/d' \
+            -e '/CONFIG_LOGO=/d' \
+            -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
+            < '${WORKDIR}/defconfig' >>'${S}/.config'
+
+        #
+        # root-over-nfs-over-usb-eth support. Limited, but should cover some cases.
+        # Enable this by setting a proper CMDLINE_NFSROOT_USB.
+        #
+        if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
+                oenote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
+                sed -e '/CONFIG_INET/d' \
+                    -e '/CONFIG_IP_PNP=/d' \
+                    -e '/CONFIG_USB_GADGET=/d' \
+                    -e '/CONFIG_USB_GADGET_SELECTED=/d' \
+                    -e '/CONFIG_USB_ETH=/d' \
+                    -e '/CONFIG_NFS_FS=/d' \
+                    -e '/CONFIG_ROOT_NFS=/d' \
+                    -e '/CONFIG_CMDLINE=/d' \
+                    -i ${S}/.config
+                echo "CONFIG_INET=y"                     >> ${S}/.config
+                echo "CONFIG_IP_PNP=y"                   >> ${S}/.config
+                echo "CONFIG_USB_GADGET=y"               >> ${S}/.config
+                echo "CONFIG_USB_GADGET_SELECTED=y"      >> ${S}/.config
+                echo "CONFIG_USB_ETH=y"                  >> ${S}/.config
+                echo "CONFIG_NFS_FS=y"                   >> ${S}/.config
+                echo "CONFIG_ROOT_NFS=y"                 >> ${S}/.config
+                echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config
+        fi
+        yes '' | oe_runmake oldconfig
+}
+
+
+
+do_install_prepend() {
+        if [ -f arch/${ARCH}/boot/Image ] && [ ! -f arch/${ARCH}/boot/uImage ]; then
+             ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage
+        fi
+
+        if test -e arch/${ARCH}/boot/images/uImage ; then
+             ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage
+        fi
+
+        if test -e arch/${ARCH}/kernel/vmlinux.lds ; then
+             ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux
+        fi
+}
+
-- 
1.7.4

Re: [PATCH 0/5][PULL] meta-xilinx powerpc bsp

[Saul Wold]

On 03/01/2011 02:30 PM, Adrian Alonso wrote:
> Several fixes for meta-xilinx powerpc bsp support
>
> Pull URL: git://git.pokylinux.org/meta-xilinx.git
>    Branch: powerpc-support
>    Browse: http://git.pokylinux.org/cgit.cgi/meta-xilinx/log/?h=powerpc-support
>
> Thanks,
>      Adrian Alonso<aalonso@secretlab.ca>
> ---
>
>
> Adrian Alonso (5):
>    virtex4: add u-boot image to rootfs
>    virtex5: add u-boot image to rootfs
>    u-boot-xilinx: fix missing license definition
>    openssl: Fix files search path
>    linux-xilinx: update kernel version
>
>   conf/machine/virtex4.conf                          |    2 +
>   conf/machine/virtex5.conf                          |    2 +
>   recipes-bsp/uboot/u-boot-xilinx_git.bb             |    6 +-
>   ...enssl-linux-gnueabi-powerpc-configuration.patch |    0
>   .../openssl/openssl_0.9.8p.bbappend                |    5 +-
>   recipes-kernel/linux/linux-xilinx_git.bb           |    8 +-
>   recipes-kernel/linux/linux.inc                     |   95 ++++++++++++++++++++
>   7 files changed, 109 insertions(+), 9 deletions(-)
>   rename recipes-connectivity/openssl/{openssl-0.9.8p =>  files}/openssl-linux-gnueabi-powerpc-configuration.patch (100%)
>   create mode 100644 recipes-kernel/linux/linux.inc
>
Merged these into meta-xilinx

Thanks
	Sau!