[v2 PATCH 0/7] poky/yocto-bsps: 3.10 and 3.14 updates

[v2 PATCH 0/7] poky/yocto-bsps: 3.10 and 3.14 updates

[Bruce Ashfield]

Richard/Saul,

Here's the resend of the 3.10 and 3.14 updates for the 3.14 kernel
and 3.10.34 update.

Outside of a few minor SRCREV changes, these are the same as the
v1 series.

Cheers,

Bruce

The following changes since commit 9f8d4e24f7c9b261597aaaa1a2085858a5178324:

  linux-libc-headers: remove 3.10 recipe (2014-03-31 13:49:58 -0400)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel-yocto
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-yocto

Bruce Ashfield (5):
  poky: set qemu BSPs preferred version to 3.14
  yocto-bsps: update reference BSPs to v3.10.34
  yocto-bsps: remove linux-yocto 3.8 bbappend
  yocto-bsps: edgerouter: explicitly set preferred version
  meta-yocto-bsp: populate 3.14 bbappend

Yang Wei (2):
  yocto-bsps: Add a new BSP to support edgerouter
  poky: add edgerouter information to README.hardware

 README.hardware                                    | 81 ++++++++++++++++++++++
 meta-yocto-bsp/conf/machine/edgerouter.conf        | 22 ++++++
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 10 +--
 .../recipes-kernel/linux/linux-yocto_3.14.bbappend | 17 +++++
 .../recipes-kernel/linux/linux-yocto_3.8.bbappend  | 19 -----
 meta-yocto/conf/distro/poky.conf                   | 14 ++--
 6 files changed, 132 insertions(+), 31 deletions(-)
 create mode 100644 meta-yocto-bsp/conf/machine/edgerouter.conf
 create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
 delete mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend

-- 
1.8.1.2

[PATCH 1/7] poky: set qemu BSPs preferred version to 3.14

[Bruce Ashfield]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto/conf/distro/poky.conf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index a68a6a1416b8..c5767250d324 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -19,13 +19,13 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_qemumips ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.10%"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
+PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.14%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.14%"
+PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.14%"
+PREFERRED_VERSION_linux-yocto_qemumips ?= "3.14%"
+PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.14%"
+PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.14%"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
-- 
1.8.1.2

[PATCH 2/7] yocto-bsps: update reference BSPs to v3.10.34

[Bruce Ashfield]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 56f566de4fc8..5ff899e1ca6e 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -7,11 +7,11 @@ KBRANCH_beagleboard = "standard/beagleboard"
 KMACHINE_genericx86 ?= "common-pc"
 KMACHINE_genericx86-64 ?= "common-pc-64"
 
-SRCREV_machine_genericx86 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
-SRCREV_machine_genericx86-64 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1"
-SRCREV_machine_routerstationpro ?= "e2c76467906116a42a020ed0c76a06af720e5cf1"
-SRCREV_machine_mpc8315e-rdb ?= "1ac2906d6d672f33e36c5add9b7d0e6277e34aaf"
-SRCREV_machine_beagleboard ?= "e231c6220163d3c2a41cb380e1f759e8b222303c"
+SRCREV_machine_genericx86 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c"
+SRCREV_machine_genericx86-64 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c"
+SRCREV_machine_routerstationpro ?= "628fb65e665a4179b6df049563f47f521f9dfb4e"
+SRCREV_machine_mpc8315e-rdb ?= "2688f74bf2bb01ec355bbdd4b6fa00a0d39302de"
+SRCREV_machine_beagleboard ?= "dbd7d0033e92dcec6682760982228e88df9982e2"
 
 COMPATIBLE_MACHINE_genericx86 = "genericx86"
 COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
-- 
1.8.1.2

[PATCH 3/7] yocto-bsps: remove linux-yocto 3.8 bbappend

[Bruce Ashfield]

Yocto 1.6 will support the LTSI 3.4/3.10 kernels and the 3.14 kernel. As
such, we remove the 3.8 linux-yocto recipes to keep our number of supported
kernels at three.

(From meta-yocto rev: 622c2582de7f413c7130c52fa143a06dde2bd353)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-kernel/linux/linux-yocto_3.8.bbappend     | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
deleted file mode 100644
index 216b384a4334..000000000000
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-KBRANCH_genericx86  = "standard/common-pc/base"
-KBRANCH_routerstationpro = "standard/routerstationpro"
-KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
-KBRANCH_beagleboard = "standard/beagleboard"
-
-SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine_routerstationpro ?= "4a94f39d429fa284ce69b13bb635b29b1319e372"
-SRCREV_machine_mpc8315e-rdb ?= "f467c72937de0e4a2a66e21b9855c4aee844f936"
-SRCREV_machine_beagleboard ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-
-COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-COMPATIBLE_MACHINE_genericx86 = "genericx86"
-
-# routerstationpro has a flash size of 16mb
-KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"
-
-KMACHINE_genericx86 = "common-pc"
-- 
1.8.1.2

[PATCH 4/7] yocto-bsps: Add a new BSP to support edgerouter

[Bruce Ashfield]

From: Yang Wei <Wei.Yang@windriver.com>

  The EdgeRouter Lite is part of the EdgeMax series. It is an MIPS64 router(Cavium Octeon)
  with 512MB of RAM, which uses a USB pendrive for storage.

  Setup instructions
  ------------------

  You will need the following:
  * NFS root setup on your workstation
  * TFTP server installed on your workstation
  * Straight-thru 9-conductor serial cable (DB9, M/F) connected from your
    PC to UART1
  * Ethernet connected to the first ethernet port on the board

The rest of the details can be found in the BSP kernel config, and README.hardware.

Signed-off-by: Yang Wei <Wei.Yang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto-bsp/conf/machine/edgerouter.conf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-yocto-bsp/conf/machine/edgerouter.conf

diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf
new file mode 100644
index 000000000000..f3ea33bb0d6b
--- /dev/null
+++ b/meta-yocto-bsp/conf/machine/edgerouter.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: Edgerouter
+#@DESCRIPTION: Edgerouter
+
+require conf/machine/include/tune-mips64.inc
+
+MACHINE_FEATURES = "pci ext2 ext3 serial"
+
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
+KERNEL_IMAGE_STRIP_EXTRA_SECTIONS  = ".comment"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+USE_VT ?= "0"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
+IMAGE_FSTYPES ?= "jffs2 tar.bz2"
+JFFS2_ERASEBLOCK = "0x10000"
-- 
1.8.1.2

[PATCH 5/7] yocto-bsps: edgerouter: explicitly set preferred version

[Bruce Ashfield]

Switch the edgerouter from linux-yocto-dev, to the 3.14 linux-yocto
BSP.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto-bsp/conf/machine/edgerouter.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf
index f3ea33bb0d6b..9cb84bc03780 100644
--- a/meta-yocto-bsp/conf/machine/edgerouter.conf
+++ b/meta-yocto-bsp/conf/machine/edgerouter.conf
@@ -10,7 +10,8 @@ KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
 KERNEL_IMAGE_STRIP_EXTRA_SECTIONS  = ".comment"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 USE_VT ?= "0"
-- 
1.8.1.2

[PATCH 6/7] poky: add edgerouter information to README.hardware

[Bruce Ashfield]

From: Yang Wei <Wei.Yang@windriver.com>

Adding the summary, preparation and boot information for the newly introduced
edgerouter BSP.

Signed-off-by: Yang Wei <Wei.Yang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 README.hardware | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/README.hardware b/README.hardware
index 607062b59ada..eccc7d3e6e76 100644
--- a/README.hardware
+++ b/README.hardware
@@ -492,3 +492,84 @@ manually, you can automate the boot process with a boot script.
   ... Program from 0x87ff0000-0x88000000 at 0xbfff0000: .
 4) Power cycle the board.
 
+EdgeRouter Lite(edgerouter)
+=====================================
+
+The EdgeRouter Lite is part of the EdgeMax series. It is an MIPS64 router(Cavium Octeon)
+with 512MB of RAM, which uses a USB pendrive for storage.
+
+Setup instructions
+------------------
+
+You will need the following:
+* NFS root setup on your workstation
+* TFTP server installed on your workstation
+* Straight-thru 9-conductor serial cable (DB9, M/F) connected from your 
+  PC to UART1
+* Ethernet connected to the first ethernet port on the board
+
+--- Preparation ---
+
+Build an image (e.g. core-image-minimal) using "edgerouter" as the MACHINE.
+In the following instruction it is based on core-image-minimal. Another target
+may be similiar with it.
+
+--- Booting from NFS root ---
+
+Load the kernel, and boot the system as follows:
+
+ 1. Get the kernel (vmlinux) file from the tmp/deploy/images/edgerouter
+    directory, and make them available on your TFTP server.
+
+ 2. Connect the board's first serial port to your workstation and then start up
+    your favourite serial terminal so that you will be able to interact with
+    the serial console. If you don't have a favourite, picocom is suggested:
+
+  $ picocom /dev/ttyS0 -b 115200
+
+ 3. Power up or reset the board and press a key on the terminal when prompted
+    to get to the U-Boot command line
+
+ 4. Set up the environment in U-Boot:
+
+ => setenv ipaddr <board ip>
+ => setenv serverip <tftp server ip>
+
+ 5. Download the kernel and boot:
+
+ => tftp tftp $loadaddr vmlinux
+ => bootoctlinux $loadaddr coremask=0x3 root=/dev/nfs rw nfsroot=<nfsroot ip>:<rootfs path> ip=<board ip>:<server ip>:<gateway ip>:<netmask>:edgerouter:eth0:off mtdparts=phys_mapped_flash:512k(boot0),512k(boot1),64k@3072k(eeprom)
+
+--- Booting from USB root ---
+
+NOTE: Since the USB disk is inside the edgerouter box, its inconvenient for us to
+      plug and unplug the USB disk. So in the following instructions I assume that
+	  you already boot the box from NFS. Additionally, since vmlinux is not installed
+	  to core-minal-image-xxx by default, so its neccessary for us to copy it to USB
+	  disk.
+
+Load the kernel, and boot the system as follows:
+ 1. Booting from NFS root
+
+ 2. Mount usb disk partition 2 and then extract the contens of
+    tmp/deploy/core-image-XXXX.tar.bz2 into it.
+
+    Before starting, copy core-image-minimal-xxx.tar.bz2 and vmlinux into
+    rootfs path on your workstation.
+
+    and then,
+  
+    # mount /dev/sda2 /media/sda2
+    # tar -xvjpf core-image-minimal-XXX.tar.bz2 -C /media/sda2
+    # cp vmlinux /media/sda2/boot/vmlinux
+    # umount /media/sda2
+    # reboot
+
+ 3. Reboot the board and press a key on the terminal when prompted to get to the U-Boot
+    command line
+    # reboot
+
+ 4. Load the kernel and boot:
+
+ => ext2load usb 0:2 $loadaddr boot/vmlinux
+ => bootoctlinux $loadaddr coremask=0x3 root=/dev/sda2 rw rootwait mtdparts=phys_mapped_flash:512k(boot0),512k(boot1),64k@3072k(eeprom)
-- 
1.8.1.2

[PATCH 7/7] meta-yocto-bsp: populate 3.14 bbappend

[Bruce Ashfield]

The 3.14 kernel supports the generic-x86, edgerouter and beaglebone black.

All other reference BSPs stay in the 3.10 kernel until boot and regression
testing can be performed.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto_3.14.bbappend      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
new file mode 100644
index 000000000000..e0964eb40a47
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -0,0 +1,17 @@
+KBRANCH_genericx86  = "standard/common-pc/base"
+KBRANCH_genericx86-64  = "standard/common-pc-64/base"
+KBRANCH_edgerouter = "standard/edgerouter"
+KBRANCH_beaglebone = "standard/beaglebone"
+
+KMACHINE_genericx86 ?= "common-pc"
+KMACHINE_genericx86-64 ?= "common-pc-64"
+
+SRCREV_machine_genericx86 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+SRCREV_machine_genericx86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+SRCREV_machine_edgerouter ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+SRCREV_machine_beaglebone ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+
+COMPATIBLE_MACHINE_genericx86 = "genericx86"
+COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
+COMPATIBLE_MACHINE_edgerouter = "edgerouter"
+COMPATIBLE_MACHINE_beaglebone = "beaglebone"
-- 
1.8.1.2

Re: [v2 PATCH 0/7] poky/yocto-bsps: 3.10 and 3.14 updates

[Paul Eggleton]

On Monday 31 March 2014 14:01:53 Bruce Ashfield wrote:
> Here's the resend of the 3.10 and 3.14 updates for the 3.14 kernel
> and 3.10.34 update.

It seems like we should be dropping routerstationpro at this point as well. 
I've started putting together patches to do this; the question is do we want 
to preserve the removed pieces in some additional external layer?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [v2 PATCH 0/7] poky/yocto-bsps: 3.10 and 3.14 updates

[Bruce Ashfield]

On 14-04-02 08:57 AM, Paul Eggleton wrote:
> On Monday 31 March 2014 14:01:53 Bruce Ashfield wrote:
>> Here's the resend of the 3.10 and 3.14 updates for the 3.14 kernel
>> and 3.10.34 update.
>
> It seems like we should be dropping routerstationpro at this point as well.
> I've started putting together patches to do this; the question is do we want
> to preserve the removed pieces in some additional external layer?

I know that I want them preserved somewhere.

What we have in the 3.4 and 3.10 kernels for those retired BSPs
continues to work fine (in the state that it was), and they'll continue
to get -stable updates as I maintain the trees. And I wouldn't say no if
someone sent a patch for a board.

Shoving them into a retirement home layer works for me, I just don't have
a compelling suggestion for the name of that layer.

Bruce

>
> Cheers,
> Paul
>