[PATCH 0/2] MPC8315E-RDB fixes v2

[PATCH 0/2] MPC8315E-RDB fixes v2

[Paul Eggleton]

Fix the default ethernet MAC addresses so that networking works at boot time,
and improve our setup instructions for this machine.

(Since v1, simplify things by removing the configurable MAC address
variables, as all of these boards should have the same MAC addresses from
the factory.)

Note, Bruce may choose to merge the kernel patch into the linux-yocto
repository itself.

The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:

  bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib paule/mpc8315erdb-fixes-2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/mpc8315erdb-fixes-2

Paul Eggleton (2):
  linux-yocto: fix ethernet at boot time on MPC8315E-RDB
  README.hardware: update MPC8315E-RDB instructions

 README.hardware                                    |   55 +++++++++++++++-----
 .../linux/linux-yocto/mpc8315e-rdb-dts.patch       |   27 ++++++++++
 .../linux/linux-yocto_2.6.37.bbappend              |    4 ++
 3 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch

-- 
1.7.4.1

[PATCH 1/2] linux-yocto: fix ethernet at boot time on MPC8315E-RDB

[Paul Eggleton]

The default MAC address in the device tree source for the two ethernet
ports on the MPC8315E-RDB is 00:00:00:00:00:00, however with the version of
u-boot supplied from the factory, the value in the device tree blob must
match the hardware or configuring the network at boot time will fail, and
thus booting from an NFS root will not work.

Newer versions of U-Boot support passing MAC address values through and
would not need this fix; however in the absence of a safe established
procedure for updating U-Boot on these boards this workaround will suffice
(and won't need to be backed out when we are able to upgrade U-Boot).

Addresses [YOCTO #1227]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../linux/linux-yocto/mpc8315e-rdb-dts.patch       |   27 ++++++++++++++++++++
 .../linux/linux-yocto_2.6.37.bbappend              |    4 +++
 2 files changed, 31 insertions(+), 0 deletions(-)
 create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch b/meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch
new file mode 100644
index 0000000..000fbb8
--- /dev/null
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch
@@ -0,0 +1,27 @@
+Set the default MAC addresses for the two ethernet ports on the
+MPC8315E-RDB to the factory default values, allowing ethernet to come up
+correctly during boot without upgrading U-Boot.
+
+Upstream-status: Pending
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+--- linux/arch/powerpc/boot/dts/mpc8315erdb.dts
++++ linux/arch/powerpc/boot/dts/mpc8315erdb.dts
+@@ -205,7 +205,7 @@
+ 			compatible = "gianfar";
+ 			reg = <0x24000 0x1000>;
+ 			ranges = <0x0 0x24000 0x1000>;
+-			local-mac-address = [ 00 00 00 00 00 00 ];
++			local-mac-address = [ 04 00 00 00 00 0A ];
+ 			interrupts = <32 0x8 33 0x8 34 0x8>;
+ 			interrupt-parent = <&ipic>;
+ 			tbi-handle = <&tbi0>;
+@@ -248,7 +248,7 @@
+ 			compatible = "gianfar";
+ 			reg = <0x25000 0x1000>;
+ 			ranges = <0x0 0x25000 0x1000>;
+-			local-mac-address = [ 00 00 00 00 00 00 ];
++			local-mac-address = [ 04 00 00 00 00 0B ];
+ 			interrupts = <35 0x8 36 0x8 37 0x8>;
+ 			interrupt-parent = <&ipic>;
+ 			tbi-handle = <&tbi1>;
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
index b12dcef..445ab92 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -13,3 +13,7 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
 COMPATIBLE_MACHINE_beagleboard = "beagleboard"
 COMPATIBLE_MACHINE_atom-pc = "atom-pc"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append_mpc8315e-rdb = " file://mpc8315e-rdb-dts.patch"
+
-- 
1.7.4.1

[PATCH 2/2] README.hardware: update MPC8315E-RDB instructions

[Paul Eggleton]

Update the instructions for setting up the MPC8315E-RDB so that they are
clearer, use correct filenames, match the other board instructions more
closely, and include a note about dealing with non-default MAC addresses.
Additionally, add a note about ordering MPC8315E-RDBA.

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

diff --git a/README.hardware b/README.hardware
index 3602957..d4f7b47 100644
--- a/README.hardware
+++ b/README.hardware
@@ -239,30 +239,57 @@ software development of network attached storage (NAS) and digital media server
 applications. The MPC8315E-RDB features the PowerQUICC II Pro processor, which
 includes a built-in security accelerator.
 
+(Note: you may find it easier to order MPC8315E-RDBA; this appears to be the
+same board in an enclosure with accessories. In any case it is fully
+compatible with the instructions given here.)
+
 Setup instructions
 ------------------
 
 You will need the following:
-* nfs root setup on your workstation
-* tftp server installed on your workstation
+* NFS root setup on your workstation
+* TFTP server installed on your workstation
+* Null modem cable connected from your workstation to the first serial port
+  on the board
+* Ethernet connected to the first ethernet port on the board
+
+--- Preparation ---
+
+Note: if you have altered your board's ethernet MAC address(es) from the
+defaults, or you need to do so because you want multiple boards on the same
+network, then you will need to change the values in the dts file (patch
+linux/arch/powerpc/boot/dts/mpc8315erdb.dts within the kernel source). If
+you have left them at the factory default then you shouldn't need to do
+anything here.
 
-Load the kernel and boot it as follows:
+--- Booting from NFS root ---
+
+Load the kernel and dtb (device tree blob), and boot the system as follows:
+
+ 1. Get the kernel (uImage-mpc8315e-rdb.bin) and dtb (uImage-mpc8315e-rdb.dtb)
+    files from the Poky build tmp/deploy 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/ttyUSB0 -b 115200
 
- 1. Get the kernel (uImage.mpc8315erdb) and dtb (mpc8315erdb.dtb) files from
-    the Poky build tmp/deploy directory, and make them available on your tftp
-    server.
+ 3. Power up or reset the board and press a key on the terminal when prompted
+    to get to the U-Boot command line
 
- 2. Set up the environment in U-Boot:
+ 4. Set up the environment in U-Boot:
 
- =>setenv ipaddr <board ip>
- =>setenv serverip <tftp server ip>
- =>setenv bootargs root=/dev/nfs rw nfsroot=<nfsroot ip>:<rootfs path> ip=<board ip>:<server ip>:<gateway ip>:255.255.255.0:mpc8315e:eth0:off console=ttyS0,115200
+ => setenv ipaddr <board ip>
+ => setenv serverip <tftp server ip>
+ => setenv bootargs root=/dev/nfs rw nfsroot=<nfsroot ip>:<rootfs path> ip=<board ip>:<server ip>:<gateway ip>:255.255.255.0:mpc8315e:eth0:off console=ttyS0,115200
 
- 3. Download kernel and dtb to boot kernel.
+ 5. Download the kernel and dtb, and boot:
 
- =>tftp 800000 uImage.mpc8315erdb
- =>tftp 780000 mpc8315erdb.dtb
- =>bootm 800000 - 780000
+ => tftp 800000 uImage-mpc8315e-rdb.bin
+ => tftp 780000 uImage-mpc8315e-rdb.dtb
+ => bootm 800000 - 780000
 
 
 Ubiquiti Networks RouterStation Pro (routerstationpro)
-- 
1.7.4.1

Re: [PATCH 0/2] MPC8315E-RDB fixes v2

[Bruce Ashfield]

On Fri, Jul 15, 2011 at 11:12 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> Fix the default ethernet MAC addresses so that networking works at boot time,
> and improve our setup instructions for this machine.
>
> (Since v1, simplify things by removing the configurable MAC address
> variables, as all of these boards should have the same MAC addresses from
> the factory.)
>
> Note, Bruce may choose to merge the kernel patch into the linux-yocto
> repository itself.

Acked. I will merge this into the repository myself, which means that only
patch 2/2 needs to go into meta-yocto (whoever is picking this up). I'll
follow up shortly with a kernel pull request and reference the yocto bug
ion that pull as well.

Thanks for the quick iteration to v2 on this one!

Bruce

>
> The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:
>
>  bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)
>
> are available in the git repository at:
>  git://git.pokylinux.org/poky-contrib paule/mpc8315erdb-fixes-2
>  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/mpc8315erdb-fixes-2
>
> Paul Eggleton (2):
>  linux-yocto: fix ethernet at boot time on MPC8315E-RDB
>  README.hardware: update MPC8315E-RDB instructions
>
>  README.hardware                                    |   55 +++++++++++++++-----
>  .../linux/linux-yocto/mpc8315e-rdb-dts.patch       |   27 ++++++++++
>  .../linux/linux-yocto_2.6.37.bbappend              |    4 ++
>  3 files changed, 72 insertions(+), 14 deletions(-)
>  create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch
>
> --
> 1.7.4.1
>
> _______________________________________________
> 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/2] MPC8315E-RDB fixes v2

[Saul Wold]

On 07/15/2011 08:12 AM, Paul Eggleton wrote:
> Fix the default ethernet MAC addresses so that networking works at boot time,
> and improve our setup instructions for this machine.
>
> (Since v1, simplify things by removing the configurable MAC address
> variables, as all of these boards should have the same MAC addresses from
> the factory.)
>
> Note, Bruce may choose to merge the kernel patch into the linux-yocto
> repository itself.
>
> The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:
>
>    bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib paule/mpc8315erdb-fixes-2
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/mpc8315erdb-fixes-2
>
> Paul Eggleton (2):
>    linux-yocto: fix ethernet at boot time on MPC8315E-RDB
>    README.hardware: update MPC8315E-RDB instructions
>
>   README.hardware                                    |   55 +++++++++++++++-----
>   .../linux/linux-yocto/mpc8315e-rdb-dts.patch       |   27 ++++++++++
>   .../linux/linux-yocto_2.6.37.bbappend              |    4 ++
>   3 files changed, 72 insertions(+), 14 deletions(-)
>   create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto/mpc8315e-rdb-dts.patch
>

This has been merged into poky/master via Bruce's Kernel SRCREV update 
and I merged the README.hardware.

Thanks
	Sau!