[PATCH 0/4] Remove references to routerstationpro

[PATCH 0/4] Remove references to routerstationpro

[Paul Eggleton]

The routerstationpro reference BSP has been replaced with the EdgeRouter
Lite (edgerouter) for 1.6; the routerstationpro BSP is now preserved in
a new meta-yocto-bsp-old layer on git.yoctoproject.org. This series
removes / replaces references to the old BSP in poky / meta-yocto.


The following changes since commit 828b6754c205fe6e5cd5f44d1ff50da304b3273d:

  util-linux: fix parallel build issue (2014-04-04 14:18:44 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib paule/rspro-remove
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/rspro-remove

Paul Eggleton (4):
  routerstationpro: drop
  local.conf.sample: drop routerstationpro in favour of edgerouter
  README.hardware: drop routerstationpro in favour of edgerouter
  README.hardware: tweak edgerouter instructions

 README.hardware                                    | 195 ++-------------------
 meta-yocto-bsp/conf/machine/routerstationpro.conf  |  27 ---
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |   6 -
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   5 -
 meta-yocto/conf/local.conf.sample                  |   2 +-
 5 files changed, 20 insertions(+), 215 deletions(-)
 delete mode 100644 meta-yocto-bsp/conf/machine/routerstationpro.conf

-- 
1.9.0

[PATCH 1/4] routerstationpro: drop

[Paul Eggleton]

This has been moved to meta-yocto-bsp-old; edgerouter replaces it as the
MIPS reference platform going forward.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-yocto-bsp/conf/machine/routerstationpro.conf  | 27 ----------------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  6 -----
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |  5 ----
 3 files changed, 38 deletions(-)
 delete mode 100644 meta-yocto-bsp/conf/machine/routerstationpro.conf

diff --git a/meta-yocto-bsp/conf/machine/routerstationpro.conf b/meta-yocto-bsp/conf/machine/routerstationpro.conf
deleted file mode 100644
index 281d3f6..0000000
--- a/meta-yocto-bsp/conf/machine/routerstationpro.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-#@TYPE: Machine
-#@NAME: mti_malta32_be MIPS
-#@DESCRIPTION: mti_malta32_be
-
-require conf/machine/include/tune-mips32.inc
-
-MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial"
-
-KERNEL_IMAGETYPE = "vmlinux"
-KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
-KERNEL_IMAGE_STRIP_EXTRA_SECTIONS  = ".comment"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-XSERVER ?= "xserver-xorg \
-            xf86-input-evdev \
-            xf86-video-fbdev"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-USE_VT ?= "0"
-
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-
-IMAGE_FSTYPES ?= "jffs2 tar.bz2"
-
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 c24ffb8..41fd575 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
@@ -1,6 +1,5 @@
 KBRANCH_genericx86  = "standard/common-pc/base"
 KBRANCH_genericx86-64  = "standard/common-pc-64/base"
-KBRANCH_routerstationpro = "standard/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
 
 KMACHINE_genericx86 ?= "common-pc"
@@ -8,13 +7,8 @@ KMACHINE_genericx86-64 ?= "common-pc-64"
 
 SRCREV_machine_genericx86 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c"
 SRCREV_machine_genericx86-64 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c"
-SRCREV_machine_routerstationpro ?= "628fb65e665a4179b6df049563f47f521f9dfb4e"
 SRCREV_machine_mpc8315e-rdb ?= "2688f74bf2bb01ec355bbdd4b6fa00a0d39302de"
 
 COMPATIBLE_MACHINE_genericx86 = "genericx86"
 COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-
-# routerstationpro has a flash size of 16mb
-KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 0ff485f..13aa5d9 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,12 +1,7 @@
-KBRANCH_routerstationpro = "standard/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
 
 SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d"
-SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a"
 SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73"
 
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
 
-# routerstationpro has a flash size of 16mb
-KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216"
-- 
1.9.0

[PATCH 2/4] local.conf.sample: drop routerstationpro in favour of edgerouter

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-yocto/conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 539a1a4..0111801 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -52,7 +52,7 @@ PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
 #MACHINE ?= "genericx86"
 #MACHINE ?= "genericx86-64"
 #MACHINE ?= "mpc8315e-rdb"
-#MACHINE ?= "routerstationpro"
+#MACHINE ?= "edgerouter"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "qemux86"
-- 
1.9.0

[PATCH 3/4] README.hardware: drop routerstationpro in favour of edgerouter

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 README.hardware | 163 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 162 deletions(-)

diff --git a/README.hardware b/README.hardware
index 85f0330..3cdb7a2 100644
--- a/README.hardware
+++ b/README.hardware
@@ -47,7 +47,6 @@ Hardware Reference Boards
 The following boards are supported by the meta-yocto-bsp layer:
 
   * Freescale MPC8315E-RDB (mpc8315e-rdb)
-  * Ubiquiti Networks RouterStation Pro (routerstationpro)
 
 For more information see the board's section below. The appropriate MACHINE
 variable value corresponding to the board is given in brackets.
@@ -59,6 +58,7 @@ Consumer Devices
 The following consumer devices are supported by the meta-yocto-bsp layer:
 
   * Intel x86 based PCs and devices (genericx86)
+  * Ubiquiti Networks EdgeRouter Lite (edgerouter)
 
 For more information see the device's section below. The appropriate MACHINE
 variable value corresponding to the device is given in brackets.
@@ -240,167 +240,6 @@ Load the kernel and dtb (device tree blob), and boot the system as follows:
  => bootm 1000000 - 2000000
 
 
-Ubiquiti Networks RouterStation Pro (routerstationpro)
-======================================================
-
-The RouterStation Pro is an Atheros AR7161 MIPS-based board. Geared towards
-networking applications, it has all of the usual features as well as three
-type IIIA mini-PCI slots and an on-board 3-port 10/100/1000 Ethernet switch,
-in addition to the 10/100/1000 Ethernet WAN port which supports
-Power-over-Ethernet.
-
-Setup instructions
-------------------
-
-You will need the following:
-* A serial cable - female to female (or female to male + gender changer)
-  NOTE: cable must be straight through, *not* a null modem cable.
-* USB flash drive or hard disk that is able to be powered from the
-  board's USB port.
-* tftp server installed on your workstation
-
-NOTE: in the following instructions it is assumed that /dev/sdb corresponds
-to the USB disk when it is plugged into your workstation. If this is not the
-case in your setup then please be careful to substitute the correct device
-name in all commands where appropriate.
-
---- Preparation ---
-
-1) Build an image (e.g. core-image-minimal) using "routerstationpro" as the
-MACHINE
-
-2) Partition the USB drive so that primary partition 1 is type Linux (83).
-Minimum size depends on your root image size - core-image-minimal probably
-only needs 8-16MB, other images will need more.
-
-  # fdisk /dev/sdb
-  Command (m for help): p
-
-  Disk /dev/sdb: 4011 MB, 4011491328 bytes
-  124 heads, 62 sectors/track, 1019 cylinders, total 7834944 sectors
-  Units = sectors of 1 * 512 = 512 bytes
-  Sector size (logical/physical): 512 bytes / 512 bytes
-  I/O size (minimum/optimal): 512 bytes / 512 bytes
-  Disk identifier: 0x0009e87d
-
-     Device Boot      Start         End      Blocks   Id  System
-  /dev/sdb1              62     1952751      976345   83  Linux
-
-3) Format partition 1 on the USB as ext3
-
-  # mke2fs -j /dev/sdb1
-
-4) Mount partition 1 and then extract the contents of
-tmp/deploy/images/core-image-XXXX.tar.bz2 into it (preserving permissions).
-
-  # mount /dev/sdb1 /media/sdb1
-  # cd /media/sdb1
-  # tar -xvjpf tmp/deploy/images/core-image-XXXX.tar.bz2
-
-5) Unmount the USB drive and then plug it into the board's USB port
-
-6) Connect the board's 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/ttyUSB0 -b 115200
-
-7) Connect the network into eth0 (the one that is NOT the 3 port switch). If
-you are using power-over-ethernet then the board will power up at this point.
-
-8) Start up the board, watch the serial console. Hit Ctrl+C to abort the
-autostart if the board is configured that way (it is by default). The
-bootloader's fconfig command can be used to disable autostart and configure
-the IP settings if you need to change them (default IP is 192.168.1.20).
-
-9) Make the kernel (tmp/deploy/images/vmlinux-routerstationpro.bin) available
-on the tftp server.
-
-10) If you are going to write the kernel to flash (optional - see "Booting a
-kernel directly" below for the alternative), remove the current kernel and
-rootfs flash partitions. You can list the partitions using the following
-bootloader command:
-
-  RedBoot> fis list
-
-You can delete the existing kernel and rootfs with these commands:
-
-  RedBoot> fis delete kernel
-  RedBoot> fis delete rootfs
-
---- Booting a kernel directly ---
-
-1) Load the kernel using the following bootloader command:
-
-  RedBoot> load -m tftp -h <ip of tftp server> vmlinux-routerstationpro.bin
-
-You should see a message on it being successfully loaded.
-
-2) Execute the kernel:
-
-  RedBoot> exec -c "console=ttyS0,115200 root=/dev/sda1 rw rootdelay=2 board=UBNT-RSPRO"
-
-Note that specifying the command line with -c is important as linux-yocto does
-not provide a default command line.
-
---- Writing a kernel to flash ---
-
-1) Go to your tftp server and gzip the kernel you want in flash. It should
-halve the size.
-
-2) Load the kernel using the following bootloader command:
-
-  RedBoot> load -r -b 0x80600000 -m tftp -h <ip of tftp server> vmlinux-routerstationpro.bin.gz
-
-This should output something similar to the following:
-
-  Raw file loaded 0x80600000-0x8087c537, assumed entry at 0x80600000
-
-Calculate the length by subtracting the first number from the second number
-and then rounding the result up to the nearest 0x1000.
-
-3) Using the length calculated above, create a flash partition for the kernel:
-
-  RedBoot> fis create -b 0x80600000 -l 0x240000 kernel
-
-(change 0x240000 to your rounded length -- change "kernel" to whatever
-you want to name your kernel)
-
---- Booting a kernel from flash ---
-
-To boot the flashed kernel perform the following steps.
-
-1) At the bootloader prompt, load the kernel:
-
-  RedBoot> fis load -d -e kernel
-
-(Change the name "kernel" above if you chose something different earlier)
-
-(-e means 'elf', -d 'decompress')
-
-2) Execute the kernel using the exec command as above.
-
---- Automating the boot process ---
-
-After writing the kernel to flash and testing the load and exec commands
-manually, you can automate the boot process with a boot script.
-
-1) RedBoot> fconfig
-   (Answer the questions not specified here as they pertain to your environment)
-2) Run script at boot: true
-  Boot script: 
-  .. fis load -d -e kernel
-  .. exec
-  Enter script, terminate with empty line
-  >> fis load -d -e kernel
-  >> exec -c "console=ttyS0,115200 root=/dev/sda1 rw rootdelay=2 board=UBNT-RSPRO"
-  >> 
-3) Answer the remaining questions and write the changes to flash:
-  Update RedBoot non-volatile configuration - continue (y/n)? y
-  ... Erase from 0xbfff0000-0xc0000000: .
-  ... Program from 0x87ff0000-0x88000000 at 0xbfff0000: .
-4) Power cycle the board.
-
 EdgeRouter Lite(edgerouter)
 =====================================
 
-- 
1.9.0

[PATCH 4/4] README.hardware: tweak edgerouter instructions

[Paul Eggleton]

* You need a rollover cable for the serial port
* Some minor grammar / typo / formatting fixes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 README.hardware | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/README.hardware b/README.hardware
index 3cdb7a2..7d2b0f8 100644
--- a/README.hardware
+++ b/README.hardware
@@ -240,11 +240,12 @@ Load the kernel and dtb (device tree blob), and boot the system as follows:
  => bootm 1000000 - 2000000
 
 
-EdgeRouter Lite(edgerouter)
-=====================================
+Ubiquiti Networks 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.
+The EdgeRouter Lite is part of the EdgeMax series. It is a MIPS64 router
+(based on the Cavium Octeon processor) with 512MB of RAM, which uses an
+internal USB pendrive for storage.
 
 Setup instructions
 ------------------
@@ -252,8 +253,8 @@ 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
+* RJ45 -> serial ("rollover") cable connected from your PC to the CONSOLE
+  port on the board
 * Ethernet connected to the first ethernet port on the board
 
 --- Preparation ---
@@ -290,16 +291,17 @@ Load the kernel, and boot the system as follows:
 
 --- 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.
+NOTE: Since the USB disk is inside the edgerouter box, it's inconvenient to
+      plug and unplug the USB disk. So in the following instructions it is
+      assumed that you have already booted the device from NFS. Additionally,
+      since vmlinux is not contained in core-image-xxx by default, it is
+      necessary to copy it to the USB disk separately.
 
 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
+ 1. Boot from NFS root
+
+ 2. Mount the USB disk partition 2 and then extract the contents of
     tmp/deploy/core-image-XXXX.tar.bz2 into it.
 
     Before starting, copy core-image-minimal-xxx.tar.bz2 and vmlinux into
@@ -314,10 +316,12 @@ Load the kernel, and boot the system as follows:
     # reboot
 
  3. Reboot the board and press a key on the terminal when prompted to get to the U-Boot
-    command line
+    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.9.0