[PATCH 0/6] Beagleboard xM support

[PATCH 0/6] Beagleboard xM support

[Darren Hart]

The following patches provide initial support for the Beagleboard. They update
the x-load and u-boot recipes, modify the beagleboard machine config, and add
README.hardware documentation for the Beagleboard.

The kernel config still needs to be updated to support the onboard NIC of the
xM. Graphics and audio have not been tested. With the basic functionality in
place, hopefully others will be encouraged to participate in fleshing out
Beagleboard support in Poky.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: dvhart/beagle
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle

Thanks,
    Darren Hart <dvhart@linux.intel.com>
---


Darren Hart (6):
  x-load: us TI upstream repository, update recipes accordingly
  u-boot: Add a new upstream u-boot recipe
  beagleboard: add x-load and u-boot depends
  overo: use the new upstream u-boot recipe
  u-boot-omap3: remove in favor of upstream u-boot
  README.hardware: add beagleboard documentation

 README.hardware                                    |   71 +++++++++++++
 .../conf/distro/include/poky-default-revisions.inc |    3 +-
 meta/conf/machine/beagleboard.conf                 |    3 +
 meta/conf/machine/overo.conf                       |    2 +-
 .../uboot/u-boot-omap3-git/beagleboard/name.patch  |   14 ---
 meta/recipes-bsp/uboot/u-boot-omap3_git.bb         |   18 ----
 meta/recipes-bsp/uboot/u-boot.inc                  |    3 +-
 meta/recipes-bsp/uboot/u-boot_git.bb               |   21 ++++
 meta/recipes-bsp/x-load/files/signGP.c             |  108 --------------------
 meta/recipes-bsp/x-load/signgp-native.bb           |   14 ---
 .../x-load/x-load-git/beagleboard/armv7-a.patch    |   11 --
 .../x-load/x-load-git/beagleboard/name.patch       |   16 ++--
 .../x-load/x-load-git/omap3evm/armv7-a.patch       |   11 --
 .../x-load/x-load-git/overo/armv7-a.patch          |   11 --
 meta/recipes-bsp/x-load/x-load.inc                 |    5 +-
 meta/recipes-bsp/x-load/x-load_git.bb              |   19 ++--
 16 files changed, 118 insertions(+), 212 deletions(-)
 delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
 delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3_git.bb
 create mode 100644 meta/recipes-bsp/uboot/u-boot_git.bb
 delete mode 100644 meta/recipes-bsp/x-load/files/signGP.c
 delete mode 100644 meta/recipes-bsp/x-load/signgp-native.bb
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch

[PATCH 1/6] x-load: us TI upstream repository, update recipes accordingly

[Darren Hart]

TI is now maintaining an upstream x-loader git repository and
sakoman will no longer be maintained. Current upstream
includes signGP and incorporates it into the Makefile. The new
Makefile ift target builds the universal MLO binary. The armv7-a
patch is included.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 meta/recipes-bsp/x-load/files/signGP.c             |  108 --------------------
 meta/recipes-bsp/x-load/signgp-native.bb           |   14 ---
 .../x-load/x-load-git/beagleboard/armv7-a.patch    |   11 --
 .../x-load/x-load-git/beagleboard/name.patch       |   16 ++--
 .../x-load/x-load-git/omap3evm/armv7-a.patch       |   11 --
 .../x-load/x-load-git/overo/armv7-a.patch          |   11 --
 meta/recipes-bsp/x-load/x-load.inc                 |    5 +-
 meta/recipes-bsp/x-load/x-load_git.bb              |   19 ++--
 9 files changed, 19 insertions(+), 178 deletions(-)
 delete mode 100644 meta/recipes-bsp/x-load/files/signGP.c
 delete mode 100644 meta/recipes-bsp/x-load/signgp-native.bb
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index b2609c5..9af94c6 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -188,7 +188,7 @@ SRCREV_pn-xserver-kdrive-glamo ??= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
 SRCREV_pn-xserver-xf86-dri-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
 SRCREV_pn-xserver-xf86-dri2-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
 SRCREV_pn-xvideo-tests ??= "270"
-SRCREV_pn-x-load ??= "65ed00323f3807197a83abc75d62ed2a8d3f60de"
+SRCREV_pn-x-load ??= "6f3a26101303051e0f91b6213735b68ce804e94e"
 SRCDATE_yaffs2-utils-native ??= "20071107"
 SRCDATE_yaffs2-utils ??= "20071107"
 SRCREV_pn-zaurusd ??= "358"
diff --git a/meta/recipes-bsp/x-load/files/signGP.c b/meta/recipes-bsp/x-load/files/signGP.c
deleted file mode 100644
index 9325064..0000000
--- a/meta/recipes-bsp/x-load/files/signGP.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *    Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- *    Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the
- *    distribution.
- *
- *    Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-*/
-
-
-//
-// signGP.c
-// Read the x-load.bin file and write out the x-load.bin.ift file.
-// The signed image is the original pre-pended with the size of the image
-// and the load address.  If not entered on command line, file name is
-// assumed to be x-load.bin in current directory and load address is
-// 0x40200800.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <malloc.h>
-
-
-main(int argc, char *argv[])
-{
-	int	i;
-	char	ifname[FILENAME_MAX], ofname[FILENAME_MAX], ch;
-	FILE	*ifile, *ofile;
-	unsigned long	loadaddr, len;
-	struct stat	sinfo;
-
-
-	// Default to x-load.bin and 0x40200800.
-	strcpy(ifname, "x-load.bin");
-	loadaddr = 0x40200800;
-
-	if ((argc == 2) || (argc == 3))
-		strcpy(ifname, argv[1]);
-
-	if (argc == 3)
-		loadaddr = strtol(argv[2], NULL, 16);
-
-	// Form the output file name.
-	strcpy(ofname, ifname);
-	strcat(ofname, ".ift");
-
-	// Open the input file.
-	ifile = fopen(ifname, "rb");
-	if (ifile == NULL) {
-		printf("Cannot open %s\n", ifname);
-		exit(0);
-	}
-
-	// Get file length.
-	stat(ifname, &sinfo);
-	len = sinfo.st_size;
-
-	// Open the output file and write it.
-	ofile = fopen(ofname, "wb");
-	if (ofile == NULL) {
-		printf("Cannot open %s\n", ofname);
-		fclose(ifile);
-		exit(0);
-	}
-
-	// Pad 1 sector of zeroes.
-	//ch = 0x00;
-	//for (i=0; i<0x200; i++)
-	//	fwrite(&ch, 1, 1, ofile);
-
-	fwrite(&len, 1, 4, ofile);
-	fwrite(&loadaddr, 1, 4, ofile);
-	for (i=0; i<len; i++) {
-		fread(&ch, 1, 1, ifile);
-		fwrite(&ch, 1, 1, ofile);
-	}
-
-	fclose(ifile);
-	fclose(ofile);
-}
diff --git a/meta/recipes-bsp/x-load/signgp-native.bb b/meta/recipes-bsp/x-load/signgp-native.bb
deleted file mode 100644
index ae8c8f9..0000000
--- a/meta/recipes-bsp/x-load/signgp-native.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "BSD"
-DESCRIPTION = "Tool to sign omap3 x-loader images"
-
-inherit native
-SRC_URI = "file://signGP.c"
-
-do_compile() {
-	${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/signGP.c -o signGP
-}
-
-do_install() {
-	install -d ${D}${bindir}/
-	install -m 0755 signGP ${D}${bindir}/
-}
diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
deleted file mode 100644
index 3131cda..0000000
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- git/cpu/omap3/config.mk-orig	2008-05-27 16:46:45.000000000 -0700
-+++ git/cpu/omap3/config.mk	2008-05-29 12:50:49.000000000 -0700
-@@ -23,7 +23,7 @@
- PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
- 	-msoft-float
- 
--PLATFORM_CPPFLAGS += -march=armv7a
-+PLATFORM_CPPFLAGS += -march=armv7-a
- # =========================================================================
- #
- # Supply options according to compiler version
diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
index 98dcbae..d0fb996 100644
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
+++ b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
@@ -1,14 +1,16 @@
---- git/Makefile-orig	2008-07-29 22:31:03.000000000 -0700
-+++ git/Makefile	2008-07-29 22:34:36.000000000 -0700
-@@ -152,9 +152,9 @@ omap3evm_config :	unconfig
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -225,8 +225,9 @@ omap3evm_config :	unconfig
  overo_config :	unconfig
- 	@./mkconfig $(@:_config=) arm omap3 overo
+ 	@$(MKCONFIG) $(@:_config=) arm omap3 overo
  
 -omap3530beagle_config :    unconfig
+-	@$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
 +beagleboard_config :    unconfig
- 
--	@./mkconfig $(@:_config=) arm omap3 omap3530beagle
++	@$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
 +	@./mkconfig omap3530beagle arm omap3 omap3530beagle
  
  #########################################################################
- 
+ ## OMAP4 (ARM-CortexA9) Systems
diff --git a/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
deleted file mode 100644
index 3131cda..0000000
--- a/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- git/cpu/omap3/config.mk-orig	2008-05-27 16:46:45.000000000 -0700
-+++ git/cpu/omap3/config.mk	2008-05-29 12:50:49.000000000 -0700
-@@ -23,7 +23,7 @@
- PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
- 	-msoft-float
- 
--PLATFORM_CPPFLAGS += -march=armv7a
-+PLATFORM_CPPFLAGS += -march=armv7-a
- # =========================================================================
- #
- # Supply options according to compiler version
diff --git a/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
deleted file mode 100644
index 3131cda..0000000
--- a/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- git/cpu/omap3/config.mk-orig	2008-05-27 16:46:45.000000000 -0700
-+++ git/cpu/omap3/config.mk	2008-05-29 12:50:49.000000000 -0700
-@@ -23,7 +23,7 @@
- PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
- 	-msoft-float
- 
--PLATFORM_CPPFLAGS += -march=armv7a
-+PLATFORM_CPPFLAGS += -march=armv7-a
- # =========================================================================
- #
- # Supply options according to compiler version
diff --git a/meta/recipes-bsp/x-load/x-load.inc b/meta/recipes-bsp/x-load/x-load.inc
index 7073b13..a98ec8f 100644
--- a/meta/recipes-bsp/x-load/x-load.inc
+++ b/meta/recipes-bsp/x-load/x-load.inc
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 inherit deploy
 
-DEPENDS = "signgp-native"
+DEPENDS = ""
 
 PARALLEL_MAKE=""
 
@@ -24,11 +24,10 @@ do_compile () {
 	unset CPPFLAGS
 	oe_runmake distclean
 	oe_runmake ${XLOAD_MACHINE}
-	oe_runmake
+	oe_runmake ift
 }
 
 do_deploy () {
-	signGP ${S}/x-load.bin
 	install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE}
 	install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE}
 
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb
index f124e2b..fc2927e 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -2,24 +2,19 @@ require x-load.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}"
 
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://README;beginline=1;endline=25;md5=ef08d08cb99057bbb5b9d6d0c5a4396f"
+
 PV = "1.42+${PR}+git${SRCPV}"
-PR="r12"
+PR="r13"
 
-SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
+#SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
+#SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"
+SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git"
 
 SRC_URI_append_beagleboard = " \
                               file://name.patch;patch=1 \
-                              file://armv7-a.patch;patch=1 \
-                             "
-
-SRC_URI_append_omap3evm = " \
-                              file://armv7-a.patch;patch=1 \
                              "
-
-SRC_URI_append_overo = " \
-                              file://armv7-a.patch;patch=1 \
-                             "
-
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.7.1

[PATCH 3/6] beagleboard: add x-load and u-boot depends

[Darren Hart]

The Beagleboard xM requires x-load and u-boot to be installed
on the MMC as it has no NAND (as of rev B and onward).

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/machine/beagleboard.conf |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf
index cb6417b..34fc6f2 100644
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta/conf/machine/beagleboard.conf
@@ -12,6 +12,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 #Ship all kernel modules till the board support has matured enough
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
+# Allow for MMC booting (required by the NAND-less Beagleboard XM)
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
+
 #include conf/machine/include/tune-arm1136jf-s.inc
 include conf/machine/include/tune-cortexa8.inc
 
-- 
1.7.1

[PATCH 2/6] u-boot: Add a new upstream u-boot recipe

[Darren Hart]

uboot-omap3 appears to be fairly stale (last commit in April 2010) while
the upstream u-boot is making regular tagged releases. Add a new recipe
using the upstream u-boot repository.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../conf/distro/include/poky-default-revisions.inc |    1 +
 meta/recipes-bsp/uboot/u-boot.inc                  |    3 +-
 meta/recipes-bsp/uboot/u-boot_git.bb               |   21 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-bsp/uboot/u-boot_git.bb

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 9af94c6..4c7895c 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -172,6 +172,7 @@ SRCREV_pn-trace-cmd ??= ${TRACECMDREV}
 SRCREV_pn-kernelshark ??= ${TRACECMDREV}
 SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
 SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80"
+SRCREV_pn-u-boot ??= "v2010.12"
 SRCREV_pn-ubootchart ??= "10"
 SRCREV_pn-webkit-gtk ??= "62027"
 SRCREV_pn-web-webkit ??= "130"
diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 889f621..6363474 100644
--- a/meta/recipes-bsp/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
@@ -9,7 +9,8 @@ inherit deploy
 
 PARALLEL_MAKE=""
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+# GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS=''"
 
 UBOOT_MACHINE ?= "${MACHINE}_config"
 UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
diff --git a/meta/recipes-bsp/uboot/u-boot_git.bb b/meta/recipes-bsp/uboot/u-boot_git.bb
new file mode 100644
index 0000000..16a1dbe
--- /dev/null
+++ b/meta/recipes-bsp/uboot/u-boot_git.bb
@@ -0,0 +1,21 @@
+require u-boot.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b \
+                    file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
+
+PV = "v2010.12+${PR}+git${SRCPV}"
+PR="r0"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
+
+UBOOT_MACHINE_beagleboard = "omap3_beagle_config"
+UBOOT_MACHINE_overo = "omap3_overo_config"
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "(beagleboard|overo)"
-- 
1.7.1

[PATCH 4/6] overo: use the new upstream u-boot recipe

[Darren Hart]

In preparation to remove the u-boot-omap3 recipe, update the overo
machine to use the new upstream u-boot recipe.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/machine/overo.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/machine/overo.conf b/meta/conf/machine/overo.conf
index 9fefd73..5271db6 100644
--- a/meta/conf/machine/overo.conf
+++ b/meta/conf/machine/overo.conf
@@ -18,7 +18,7 @@ SERIAL_CONSOLE = "115200 ttyS2"
 
 IMAGE_FSTYPES += "tar.bz2 jffs2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
-EXTRA_IMAGEDEPENDS += "u-boot-omap3 x-load"
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 #XSERVER = "xserver-xorg \
-- 
1.7.1

[PATCH 5/6] u-boot-omap3: remove in favor of upstream u-boot

[Darren Hart]

This repository is stale, the u-boot_git.bb recipe uses the upstream
repository. Remaining machines using this recipe have already been
converted to using u-boot_git.bb.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../uboot/u-boot-omap3-git/beagleboard/name.patch  |   14 --------------
 meta/recipes-bsp/uboot/u-boot-omap3_git.bb         |   18 ------------------
 2 files changed, 0 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
 delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3_git.bb

diff --git a/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch b/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
deleted file mode 100644
index ac03e47..0000000
--- a/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- git/Makefile.orig	2008-07-25 16:21:22.000000000 -0700
-+++ git/Makefile	2008-07-27 06:49:08.000000000 -0700
-@@ -2582,8 +2582,8 @@ SMN42_config	:	unconfig
- #########################################################################
- ## ARM CORTEX Systems
- #########################################################################
--omap3530beagle_config :	unconfig
--	@$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
-+beagleboard_config :	unconfig
-+	@$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
- 
- overo_config	:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm omap3 overo
-
diff --git a/meta/recipes-bsp/uboot/u-boot-omap3_git.bb b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
deleted file mode 100644
index c0a7738..0000000
--- a/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require u-boot.inc
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}"
-
-PV = "2008.10-rc2+${PR}+git${SRCPV}"
-PR="r2"
-
-SRC_URI = "git://gitorious.org/u-boot-omap3/mainline.git;branch=master;protocol=git"
-
-UBOOT_MACHINE_beagleboard = "omap3_beagle_config"
-UBOOT_MACHINE_omap3evm = "omap3_evm_config"
-UBOOT_MACHINE_overo = "omap3_overo_config"
-
-S = "${WORKDIR}/git"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "(beagleboard|omap3evm|overo)"
-- 
1.7.1

[PATCH 6/6] README.hardware: add beagleboard documentation

[Darren Hart]

Document the install and boot process for the Beagleboard xM with
provisions for the C4. I need someone with a C4 board to validate
the steps.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
CC: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 README.hardware |   71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 0 deletions(-)

diff --git a/README.hardware b/README.hardware
index fe384b3..4698441 100644
--- a/README.hardware
+++ b/README.hardware
@@ -26,6 +26,7 @@ The following boards are supported by Poky:
   * Marvell PXA3xx Zylonite (zylonite)
   * Logic iMX31 Lite Kit (mx31litekit)
   * Phytec phyCORE-iMX31 (mx31phy)
+  * Texas Instruments Beagleboard (beagleboard)
 
 For more information see board's section below. The Poky MACHINE setting
 corresponding to the board is given in brackets.
@@ -509,3 +510,73 @@ USB Device:
 
   For more details on the USB-ZIP scenario, see the syslinux documentation:
   http://git.kernel.org/?p=boot/syslinux/syslinux.git;a=blob_plain;f=doc/usbkey.txt;hb=HEAD
+
+
+Texas Instruments Beagleboard (beagleboard)
+===========================================
+
+The Beagleboard is an ARM Cortex-A8 development board with USB, DVI-D, S-Video,
+2D/3D accelerated graphics, audio, serial, JTAG, and SD/MMC. The xM adds a
+faster CPU, more RAM, an ethernet port, more USB ports, microSD, and removes
+the NAND flash. The beagleboard MACHINE is tested on the following platforms:
+
+  o Beagleboard xM
+
+TODO: need someone with a Beagleboard C4 to verify these instructions.
+
+Due to the lack of NAND on the xM, the install and boot process varies a bit
+between boards.  The C4 can run the x-loader and u-boot binaries from NAND or
+the SD, while the xM can only run them from the SD. The following instructions
+apply to both the C4 and the xM, but te C4 can skip step 2 (as noted below),
+and may require modification of the NAND environment.
+
+  1. Partition and format an SD card:
+     # fdisk -lu /dev/mmcblk0
+     
+     Disk /dev/mmcblk0: 3951 MB, 3951034368 bytes
+     255 heads, 63 sectors/track, 480 cylinders, total 7716864 sectors
+     Units = sectors of 1 * 512 = 512 bytes
+     
+             Device Boot      Start         End      Blocks  Id System
+     /dev/mmcblk0p1   *          63      144584       72261   c Win95 FAT32 (LBA)
+     /dev/mmcblk0p2          144585      465884      160650  83 Linux
+
+     # mkfs.vfat -F 16 -n "boot" /dev/mmcblk0p1
+     # mke2fs -j -L "root" /dev/mmcblk0p2
+
+   The following assumes the SD card partition 1 and 2 are mounted at
+   /media/boot and /media/root respectively. The files referenced here
+   are made available after the build in build/tmp/deploy/images.
+
+  2. Install the boot loaders
+     This step can be omitted for the C4 as it can have the x-loader and
+     u-boot installed in NAND.
+
+     # cp MLO-beagleboard /media/boot/MLO
+     # cp u-boot-beagleboard.bin /media/boot/u-boot.bin
+
+  3. Install the root filesystem
+     # tar x -C /media/root -f poky-image-$IMAGE_TYPE-beagleboard.tar.bz2
+     # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz
+
+  4. Install the kernel uImage
+     # cp uImage-beagleboard.bin /media/boot/uImage
+
+  5. Prepare a u-boot script to simplify the boot process
+     The Beagleboard can be made to boot at this point from the u-boot command
+     shell. To automate this process, generate a user.scr script as follows.
+
+     Install uboot-mkimage (from uboot-mkimage on Ubuntu or uboot-tools on Fedora).
+
+     Prepare a script config:
+
+     # (cat << EOF
+     setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; bootm 0x80300000'
+     setenv bootargs 'console=tty0 console=ttyS2,115200n8 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 ro'
+     boot
+     EOF
+     ) > serial-boot.cmd
+     # mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Poky Minimal" -d ./serial-boot.cmd ./user.scr
+     # cp user.scr /media/boot
+
+   6. Unmount the SD partitions and boot the Beagleboard
-- 
1.7.1

Re: [PATCH 0/6] Beagleboard xM support

[Bruce Ashfield]

On Wed, Jan 19, 2011 at 4:30 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> The following patches provide initial support for the Beagleboard. They update
> the x-load and u-boot recipes, modify the beagleboard machine config, and add
> README.hardware documentation for the Beagleboard.
>
> The kernel config still needs to be updated to support the onboard NIC of the
> xM. Graphics and audio have not been tested. With the basic functionality in
> place, hopefully others will be encouraged to participate in fleshing out
> Beagleboard support in Poky.

Darren,

Looks good. So just so I'm clear, you'll be following up with a kernel
config fragment and/or a BSP branch ? Or am I somehow just
not seeing it in your series ?

Cheers,

Bruce

>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>  Branch: dvhart/beagle
>  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle
>
> Thanks,
>    Darren Hart <dvhart@linux.intel.com>
> ---
>
>
> Darren Hart (6):
>  x-load: us TI upstream repository, update recipes accordingly
>  u-boot: Add a new upstream u-boot recipe
>  beagleboard: add x-load and u-boot depends
>  overo: use the new upstream u-boot recipe
>  u-boot-omap3: remove in favor of upstream u-boot
>  README.hardware: add beagleboard documentation
>
>  README.hardware                                    |   71 +++++++++++++
>  .../conf/distro/include/poky-default-revisions.inc |    3 +-
>  meta/conf/machine/beagleboard.conf                 |    3 +
>  meta/conf/machine/overo.conf                       |    2 +-
>  .../uboot/u-boot-omap3-git/beagleboard/name.patch  |   14 ---
>  meta/recipes-bsp/uboot/u-boot-omap3_git.bb         |   18 ----
>  meta/recipes-bsp/uboot/u-boot.inc                  |    3 +-
>  meta/recipes-bsp/uboot/u-boot_git.bb               |   21 ++++
>  meta/recipes-bsp/x-load/files/signGP.c             |  108 --------------------
>  meta/recipes-bsp/x-load/signgp-native.bb           |   14 ---
>  .../x-load/x-load-git/beagleboard/armv7-a.patch    |   11 --
>  .../x-load/x-load-git/beagleboard/name.patch       |   16 ++--
>  .../x-load/x-load-git/omap3evm/armv7-a.patch       |   11 --
>  .../x-load/x-load-git/overo/armv7-a.patch          |   11 --
>  meta/recipes-bsp/x-load/x-load.inc                 |    5 +-
>  meta/recipes-bsp/x-load/x-load_git.bb              |   19 ++--
>  16 files changed, 118 insertions(+), 212 deletions(-)
>  delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
>  delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3_git.bb
>  create mode 100644 meta/recipes-bsp/uboot/u-boot_git.bb
>  delete mode 100644 meta/recipes-bsp/x-load/files/signGP.c
>  delete mode 100644 meta/recipes-bsp/x-load/signgp-native.bb
>  delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
>  delete mode 100644 meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
>  delete mode 100644 meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 0/6] Beagleboard xM support

[Darren Hart]

On 01/19/2011 07:21 PM, Bruce Ashfield wrote:
> On Wed, Jan 19, 2011 at 4:30 PM, Darren Hart<dvhart@linux.intel.com>  wrote:
>> The following patches provide initial support for the Beagleboard. They update
>> the x-load and u-boot recipes, modify the beagleboard machine config, and add
>> README.hardware documentation for the Beagleboard.
>>
>> The kernel config still needs to be updated to support the onboard NIC of the
>> xM. Graphics and audio have not been tested. With the basic functionality in
>> place, hopefully others will be encouraged to participate in fleshing out
>> Beagleboard support in Poky.
>
> Darren,
>
> Looks good. So just so I'm clear, you'll be following up with a kernel
> config fragment and/or a BSP branch ? Or am I somehow just
> not seeing it in your series ?

Right, I thought it was worth getting this all in now while it was hot 
and still in sync with master. I'm hoping to get time this week to get 
the necessary kernel changes for Ethernet support knocked out (should be 
trivial... but... you know).

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 0/6] Beagleboard xM support

[Saul Wold]

On 01/19/2011 01:30 PM, Darren Hart wrote:
> The following patches provide initial support for the Beagleboard. They update
> the x-load and u-boot recipes, modify the beagleboard machine config, and add
> README.hardware documentation for the Beagleboard.
>
> The kernel config still needs to be updated to support the onboard NIC of the
> xM. Graphics and audio have not been tested. With the basic functionality in
> place, hopefully others will be encouraged to participate in fleshing out
> Beagleboard support in Poky.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: dvhart/beagle
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/beagle
>
> Thanks,
>      Darren Hart<dvhart@linux.intel.com>
> ---
>
>
> Darren Hart (6):
>    x-load: us TI upstream repository, update recipes accordingly
>    u-boot: Add a new upstream u-boot recipe
>    beagleboard: add x-load and u-boot depends
>    overo: use the new upstream u-boot recipe
>    u-boot-omap3: remove in favor of upstream u-boot
>    README.hardware: add beagleboard documentation
>
>   README.hardware                                    |   71 +++++++++++++
>   .../conf/distro/include/poky-default-revisions.inc |    3 +-
>   meta/conf/machine/beagleboard.conf                 |    3 +
>   meta/conf/machine/overo.conf                       |    2 +-
>   .../uboot/u-boot-omap3-git/beagleboard/name.patch  |   14 ---
>   meta/recipes-bsp/uboot/u-boot-omap3_git.bb         |   18 ----
>   meta/recipes-bsp/uboot/u-boot.inc                  |    3 +-
>   meta/recipes-bsp/uboot/u-boot_git.bb               |   21 ++++
>   meta/recipes-bsp/x-load/files/signGP.c             |  108 --------------------
>   meta/recipes-bsp/x-load/signgp-native.bb           |   14 ---
>   .../x-load/x-load-git/beagleboard/armv7-a.patch    |   11 --
>   .../x-load/x-load-git/beagleboard/name.patch       |   16 ++--
>   .../x-load/x-load-git/omap3evm/armv7-a.patch       |   11 --
>   .../x-load/x-load-git/overo/armv7-a.patch          |   11 --
>   meta/recipes-bsp/x-load/x-load.inc                 |    5 +-
>   meta/recipes-bsp/x-load/x-load_git.bb              |   19 ++--
>   16 files changed, 118 insertions(+), 212 deletions(-)
>   delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
>   delete mode 100644 meta/recipes-bsp/uboot/u-boot-omap3_git.bb
>   create mode 100644 meta/recipes-bsp/uboot/u-boot_git.bb
>   delete mode 100644 meta/recipes-bsp/x-load/files/signGP.c
>   delete mode 100644 meta/recipes-bsp/x-load/signgp-native.bb
>   delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
>   delete mode 100644 meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
>   delete mode 100644 meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Pulled into Master

Thanks
	Sau!