[Buildroot] [PATCH 0/6] Microblaze fixes

[Buildroot] [PATCH 0/6] Microblaze fixes

[Waldemar Brodkorb]

The microblaze buildoot support is in a bad state. 
Startup of the resulting image in Qemu is killed by OOM-killer.
These patches resolves the issues and the resulting images for
little endian and big endian are working fine. 
Network support is working now, too.

Waldemar Brodkorb (6):
  use default binutils for microblaze
  use default gcc 4.8.2 for microblaze
  upstream glibc 2.18/2.19 works fine with microblaze
  disable eglibc, no time to test
  temporary hack to fix linking error
  update to 3.14

 .../{linux-3.13.config => linux-3.14.config}       |    1 +
 board/qemu/microblazebe-mmu/system.dts             |  367 --------------------
 .../{linux-3.13.config => linux-3.14.config}       |    1 +
 board/qemu/microblazeel-mmu/system.dts             |  367 --------------------
 board/qemu/microblazeel-mmu/xilinx-xemaclite.patch |   11 +
 configs/qemu_microblazebe_mmu_defconfig            |    8 +-
 configs/qemu_microblazeel_mmu_defconfig            |    8 +-
 linux/Config.in                                    |    2 -
 package/binutils/Config.in.host                    |    3 +-
 package/binutils/binutils.mk                       |    5 -
 package/gcc/Config.in.host                         |   12 +-
 package/gcc/gcc.mk                                 |    4 -
 package/glibc/2.18/microblaze-libgcc_eh.patch      |   18 +
 package/glibc/2.19/microblaze-libgcc_eh.patch      |   18 +
 package/glibc/Config.in                            |    2 +-
 package/glibc/glibc.mk                             |   12 -
 toolchain/toolchain-buildroot/Config.in            |    2 +-
 17 files changed, 63 insertions(+), 778 deletions(-)
 rename board/qemu/microblazebe-mmu/{linux-3.13.config => linux-3.14.config} (98%)
 delete mode 100644 board/qemu/microblazebe-mmu/system.dts
 rename board/qemu/microblazeel-mmu/{linux-3.13.config => linux-3.14.config} (98%)
 delete mode 100644 board/qemu/microblazeel-mmu/system.dts
 create mode 100644 board/qemu/microblazeel-mmu/xilinx-xemaclite.patch
 create mode 100644 package/glibc/2.18/microblaze-libgcc_eh.patch
 create mode 100644 package/glibc/2.19/microblaze-libgcc_eh.patch

-- 
1.7.10.4

[Buildroot] [PATCH 1/6] use default binutils for microblaze

[Waldemar Brodkorb]

Upstream binutils 2.24 works fine for microblaze, no need for
Xilinx Git.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/binutils/Config.in.host |    3 +--
 package/binutils/binutils.mk    |    5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 58738e8..25f0dc3 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -3,8 +3,8 @@ comment "Binutils Options"
 choice
 	prompt "Binutils Version"
 	depends on !BR2_arc
-	depends on !BR2_microblaze
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
+	default BR2_BINUTILS_VERSION_2_24 if BR2_microblaze
 	default BR2_BINUTILS_VERSION_2_22
 	help
 	  Select the version of binutils you wish to use.
@@ -50,7 +50,6 @@ config BR2_BINUTILS_VERSION
 	string
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
 	default "a934fe50786aa0dc0fb5da4754e7e07591c9cd8e" if BR2_arc
-	default "8351467c933d277ebea0c8d99ad2b65b5f7b6bc2" if BR2_microblaze
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index b5a2dc7..9cc4d28 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -28,11 +28,6 @@ BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils,$(BI
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
 endif
-ifeq ($(BR2_microblaze),y)
-BINUTILS_SITE = $(call github,Xilinx,binutils,$(BINUTILS_VERSION))
-BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
-BINUTILS_FROM_GIT = y
-endif
 BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
 BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
-- 
1.7.10.4

[Buildroot] [PATCH 1/6] use default binutils for microblaze

[Gustavo Zacarias]

On 04/13/2014 06:46 AM, Waldemar Brodkorb wrote:

> Upstream binutils 2.24 works fine for microblaze, no need for
> Xilinx Git.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

You could depend on !BR2_microblaze for older versions since they won't
work.
Otherwise:

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
(on Qemu)

Thanks.

[Buildroot] [PATCH 1/6] use default binutils for microblaze

[Peter Korsgaard]

>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > Upstream binutils 2.24 works fine for microblaze, no need for
 > Xilinx Git.

 > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Committed with the earlier versions disabled as suggested by Gustavo, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/6] use default gcc 4.8.2 for microblaze

[Waldemar Brodkorb]

Upstream gcc 4.8.2 works fine for microblaze, no need for
Xilinx Git.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/gcc/Config.in.host |   12 +++---------
 package/gcc/gcc.mk         |    4 ----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 4fd8ec9..0223577 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -8,7 +8,7 @@ choice
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
 	default BR2_GCC_VERSION_4_8_ARC if BR2_arc
-	default BR2_GCC_VERSION_4_9_MICROBLAZE if BR2_microblaze
+	default BR2_GCC_VERSION_4_8_X if BR2_microblaze
 	default BR2_GCC_VERSION_4_5_X if BR2_bfin
 	default BR2_GCC_VERSION_4_7_X
 	help
@@ -49,7 +49,7 @@ choice
 		bool "gcc 4.7.x"
 
 	config BR2_GCC_VERSION_4_8_X
-		depends on !BR2_microblaze && !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.8.x"
 
@@ -58,13 +58,8 @@ choice
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.8-arc"
 
-	config BR2_GCC_VERSION_4_9_MICROBLAZE
-		depends on BR2_microblaze
-		select BR2_GCC_NEEDS_MPC
-		bool "gcc 4.9-microblaze"
-
 	config BR2_GCC_VERSION_SNAP
-		depends on !BR2_microblaze && !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc snapshot"
 endchoice
@@ -97,7 +92,6 @@ config BR2_GCC_VERSION
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
 	default "4.8.2"     if BR2_GCC_VERSION_4_8_X
 	default "c6227bc154124e270f15793deddfa3fe18f7db54" if BR2_GCC_VERSION_4_8_ARC
-	default "b93bb009e021aba64dd4b8cdb0bbc5a176c55543" if BR2_GCC_VERSION_4_9_MICROBLAZE
 	default BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index dff6dce..bc79abc 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -22,10 +22,6 @@ GCC_SITE = ftp://www.at91.com/pub/buildroot/
 else ifeq ($(BR2_arc),y)
 GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_microblaze),y)
-GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
-GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else
 GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
 endif
 
-- 
1.7.10.4

[Buildroot] [PATCH 2/6] use default gcc 4.8.2 for microblaze

[Gustavo Zacarias]

On 04/13/2014 06:46 AM, Waldemar Brodkorb wrote:

> Upstream gcc 4.8.2 works fine for microblaze, no need for
> Xilinx Git.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
(on Qemu)

Thanks.

[Buildroot] [PATCH 2/6] use default gcc 4.8.2 for microblaze

[Peter Korsgaard]

>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > Upstream gcc 4.8.2 works fine for microblaze, no need for
 > Xilinx Git.

 > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Waldemar Brodkorb]

There is no need for Xilinx Git.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/glibc/Config.in |    2 +-
 package/glibc/glibc.mk  |   12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index a92b5ea..693a33e 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -8,7 +8,7 @@ choice
 		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
 		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
 		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
-		   BR2_x86_64
+		   BR2_x86_64 || BR2_microblaze
 
 config BR2_GLIBC_VERSION_2_18
        bool "2.18"
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 6579f46..d02ab7e 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -4,17 +4,6 @@
 #
 ################################################################################
 
-ifeq ($(BR2_microblaze),y)
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
-GLIBC_VERSION = 7f0bcce417c47aefad06ddfec7cd4ced3a4e10ff
-GLIBC_SITE = $(call github,Xilinx,eglibc,$(GLIBC_VERSION))
-GLIBC_SRC_SUBDIR = .
-else
-GLIBC_VERSION = b86835ca92a1942ed08d8b5ee47498e711feaddb
-GLIBC_SITE = $(call github,Xilinx,glibc,$(GLIBC_VERSION))
-GLIBC_SRC_SUBDIR = .
-endif
-else
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
 GLIBC_VERSION = 2.18-svnr23787
 GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
@@ -26,7 +15,6 @@ GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
 GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
 GLIBC_SRC_SUBDIR = .
 endif
-endif
 
 GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
 GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)
-- 
1.7.10.4

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Gustavo Zacarias]

On 04/13/2014 06:47 AM, Waldemar Brodkorb wrote:

> There is no need for Xilinx Git.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
(on Qemu)

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[William Welch]

Greetings,

When you say BR works fine for microblaze 'on QEMU', could you be more
specific?  little endian?  mmu? which 'defconfig' did you use with
buildroot?  Which version of QEMU, what command line?

I'd like to recreate your working setup and maybe that will give me a clue
to my troubles here...

I am trying to use the 'buildroot native toolchain' with a Spartan 6 little
endian microblaze MMU design, but I don't get very far with the native
toolchain. However, using the older 'external' toolchain boots linux fine.


thanks,

William



On Mon, Apr 21, 2014 at 10:03 AM, Gustavo Zacarias
<gustavo@zacarias.com.ar>wrote:

> On 04/13/2014 06:47 AM, Waldemar Brodkorb wrote:
>
> > There is no need for Xilinx Git.
> >
> > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
>
> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> (on Qemu)
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140428/56da4166/attachment.html>

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Gustavo Zacarias]

On 04/28/2014 04:08 PM, William Welch wrote:

> Greetings,
> 
> When you say BR works fine for microblaze 'on QEMU', could you be more
> specific?  little endian?  mmu? which 'defconfig' did you use with
> buildroot?  Which version of QEMU, what command line?
> 
> I'd like to recreate your working setup and maybe that will give me a
> clue to my troubles here...
> 
> I am trying to use the 'buildroot native toolchain' with a Spartan 6
> little endian microblaze MMU design, but I don't get very far with the
> native toolchain. However, using the older 'external' toolchain boots
> linux fine.
> 
> 
> thanks,
> 
> William

Hi.
It means all relevant buildroot qemu sample defconfigs boot to a login
prompt where you can login and get dhcp working on the emulated network
(if said config has networking).
For microblaze this means big and little endian with MMU, we don't have
a nommu configuration since i've never managed to get that working in a
satisfactory way.
And that's with Waldemar's patches, not as it is right now which broke
those qemu defconfigs when the toolchain was changed to the internal
backend.
I do not know if it's the toolchain to blame and/or some Qemu
limitation, i just know that Waldemar's patches fix it for what i have
at hand (no microblaze hardware, just emulation).
Regards.

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[William Welch]

Hi again,

Thank you for your help on this -- I should have said, that I am using the
'git' buildroot from earlier today ( a few hours ago), with no luck on the
native toolchain.  So am I correct, that, for example, using the 'git
buildroot', then ' make qemu_microblazeel_mmu_defconfig'  should build the
native toolchain and the resulting image should boot?  Or, maybe the
patches are not merged into the git tree yet?

I am not very skilled with qemu, so to confirm, are the directions in the
boards/qemu/microblazeel-mmu/readme.txt correct?  It is a little confusing,
since they mention the s3adsp1800, whereas the system.dts mentions a ML505
design.  Also the readme mentions qemu 1.7.0? I have 1.5.0 at the moment
but I can install 1.7.0 if required.

thank you,

William



On Mon, Apr 28, 2014 at 2:18 PM, Gustavo Zacarias
<gustavo@zacarias.com.ar>wrote:

> On 04/28/2014 04:08 PM, William Welch wrote:
>
> > Greetings,
> >
> > When you say BR works fine for microblaze 'on QEMU', could you be more
> > specific?  little endian?  mmu? which 'defconfig' did you use with
> > buildroot?  Which version of QEMU, what command line?
> >
> > I'd like to recreate your working setup and maybe that will give me a
> > clue to my troubles here...
> >
> > I am trying to use the 'buildroot native toolchain' with a Spartan 6
> > little endian microblaze MMU design, but I don't get very far with the
> > native toolchain. However, using the older 'external' toolchain boots
> > linux fine.
> >
> >
> > thanks,
> >
> > William
>
> Hi.
> It means all relevant buildroot qemu sample defconfigs boot to a login
> prompt where you can login and get dhcp working on the emulated network
> (if said config has networking).
> For microblaze this means big and little endian with MMU, we don't have
> a nommu configuration since i've never managed to get that working in a
> satisfactory way.
> And that's with Waldemar's patches, not as it is right now which broke
> those qemu defconfigs when the toolchain was changed to the internal
> backend.
> I do not know if it's the toolchain to blame and/or some Qemu
> limitation, i just know that Waldemar's patches fix it for what i have
> at hand (no microblaze hardware, just emulation).
> Regards.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140428/7ba03a0a/attachment.html>

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Gustavo Zacarias]

On 04/28/2014 04:45 PM, William Welch wrote:

> Hi again,
> 
> Thank you for your help on this -- I should have said, that I am using
> the 'git' buildroot from earlier today ( a few hours ago), with no luck
> on the native toolchain.  So am I correct, that, for example, using the
> 'git buildroot', then ' make qemu_microblazeel_mmu_defconfig'  should
> build the native toolchain and the resulting image should boot?  Or,
> maybe the patches are not merged into the git tree yet?
> 
> I am not very skilled with qemu, so to confirm, are the directions in
> the boards/qemu/microblazeel-mmu/readme.txt correct?  It is a little
> confusing, since they mention the s3adsp1800, whereas the system.dts
> mentions a ML505 design.  Also the readme mentions qemu 1.7.0? I have
> 1.5.0 at the moment but I can install 1.7.0 if required.
> 
> thank you,
> 
> William

Hi.
They are not merged yet, Waldemar was waiting for my gcc 4.9.x patches
to get merged (done) and is going to rebase when he has time probably.
The directions in the readme.txt are correct, i make it a habit of
testing them regularly.
I have seen different versions of Qemu failing to work properly, even if
newer or older, there's no rule for that, that's the reason i mention
the exact version there.
Unfortunately for the 2014.02 release when the toolchain changes were
shipped and the configs weren't updated so they are effectively broken
for the current toolchain (it may be that the current toolchain is
broken for real scenarios, i can't know).
Waldemar's last patch updates the qemu defconfigs to a nice and simpler
config without the need for an external dts and brings in networking
support as well.
For the "latest" i've used Qemu 2.0.0
And to make things nicer i've got a patchset that builds qemu within
buildroot to avoid the messy problem of different vesions available, it
just needs some proper docs i think and should get in, right guys? :)
Regards.

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Waldemar Brodkorb]

Hi William,

William Welch wrote,

> Hi again,
> 
> Thank you for your help on this -- I should have said, that I am using the
> 'git' buildroot from earlier today ( a few hours ago), with no luck on the
> native toolchain. ?So am I correct, that, for example, using the 'git
> buildroot', then ' make qemu_microblazeel_mmu_defconfig' ?should build the
> native toolchain and the resulting image should boot? ?Or, maybe the patches
> are not merged into the git tree yet?

It seems that they will be merged now. I had not the time to respin a
new patch set because I didn't know how to do it correctly ;)
On sunday I got a nice git workshop by a friend and now I am able to
do it right. May be I will add a patch to the manual.

The changes do not show up yet on
http://git.buildroot.net/buildroot. May be Peter did not pushed the
changes yesterday.
 
> I am not very skilled with qemu, so to confirm, are the directions in the
> boards/qemu/microblazeel-mmu/readme.txt correct? ?It is a little confusing,
> since they mention the s3adsp1800, whereas the system.dts mentions a ML505
> design. ?Also the readme mentions qemu 1.7.0? I have 1.5.0 at the moment but I
> can install 1.7.0 if required.

If you want to use Qemu with -initrd you should use Qemu 1.7.x or
above. I only tested the microblaze stuff with Qemu 1.7.x and 2.0.
There is no need for a separate system.dts, because the Qemu
provided dtb matches the emulated hardware the best.
The default is to emulate s3adsp1800, but ml605 could be used, too.
Networking does work better with s3adsp1800 emulation.
Both little endian and big endian targets are tested with default
configuration.

Some more Qemu microblaze stuff can be found here:
http://blog.waldemar-brodkorb.de/index.php?archives/10-English.html&serendipity[lang_selected]=en&serendipity[user_language]=en

Unfortunately I was again wrong with my assumption that gcc 4.9.0
solves the linking error with libgcc_eh. I accidently had my patches
applied while testing with gcc 4.9.0. 

There seems to be a fix in https://github.com/Xilinx/gcc, but I am
unsure how to get it extracted. The snapshot for the gcc used in
buildroot does not contain the git history and the short tag from
the directory (Xilinx-gcc-b93bb00) is not available as an object in
the git repository. I would use git bisect to find the required
patch to gcc to avoid the eglibc/glibc workaround, but I don't know
which branch and commit is used as the basis for the gcc tarball.

Anyone know this?

So the glibc patch is still required.

Have fun
 Waldemar
 
> thank you,
> 
> William
> 
> 
> 
> On Mon, Apr 28, 2014 at 2:18 PM, Gustavo Zacarias <gustavo@zacarias.com.ar>
> wrote:
> 
>     On 04/28/2014 04:08 PM, William Welch wrote:
> 
>     > Greetings,
>     >
>     > When you say BR works fine for microblaze 'on QEMU', could you be more
>     > specific? ?little endian? ?mmu? which 'defconfig' did you use with
>     > buildroot? ?Which version of QEMU, what command line?
>     >
>     > I'd like to recreate your working setup and maybe that will give me a
>     > clue to my troubles here...
>     >
>     > I am trying to use the 'buildroot native toolchain' with a Spartan 6
>     > little endian microblaze MMU design, but I don't get very far with the
>     > native toolchain. However, using the older 'external' toolchain boots
>     > linux fine.
>     >
>     >
>     > thanks,
>     >
>     > William
> 
>     Hi.
>     It means all relevant buildroot qemu sample defconfigs boot to a login
>     prompt where you can login and get dhcp working on the emulated network
>     (if said config has networking).
>     For microblaze this means big and little endian with MMU, we don't have
>     a nommu configuration since i've never managed to get that working in a
>     satisfactory way.
>     And that's with Waldemar's patches, not as it is right now which broke
>     those qemu defconfigs when the toolchain was changed to the internal
>     backend.
>     I do not know if it's the toolchain to blame and/or some Qemu
>     limitation, i just know that Waldemar's patches fix it for what i have
>     at hand (no microblaze hardware, just emulation).
>     Regards.
> 
> 
> 

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Gustavo Zacarias]

On 04/29/2014 04:18 AM, Waldemar Brodkorb wrote:

> It seems that they will be merged now. I had not the time to respin a
> new patch set because I didn't know how to do it correctly ;)
> On sunday I got a nice git workshop by a friend and now I am able to
> do it right. May be I will add a patch to the manual.
> 
> The changes do not show up yet on
> http://git.buildroot.net/buildroot. May be Peter did not pushed the
> changes yesterday.

Hi Waldemar, William.
It's in the process of being commited, i'm working with Peter on it.

> Some more Qemu microblaze stuff can be found here:
> http://blog.waldemar-brodkorb.de/index.php?archives/10-English.html&serendipity[lang_selected]=en&serendipity[user_language]=en
> 
> Unfortunately I was again wrong with my assumption that gcc 4.9.0
> solves the linking error with libgcc_eh. I accidently had my patches
> applied while testing with gcc 4.9.0. 
> 
> There seems to be a fix in https://github.com/Xilinx/gcc, but I am
> unsure how to get it extracted. The snapshot for the gcc used in
> buildroot does not contain the git history and the short tag from
> the directory (Xilinx-gcc-b93bb00) is not available as an object in
> the git repository. I would use git bisect to find the required
> patch to gcc to avoid the eglibc/glibc workaround, but I don't know
> which branch and commit is used as the basis for the gcc tarball.
> 
> Anyone know this?
> 
> So the glibc patch is still required.

I managed to track the issue down to
23c35173490ac2d6348a668dfc9c1a6eb62171f2 from xilinx-gcc git.
Basically that enables DWARF EH handling which is what's getting fixed
by including libgcc_eh.
It seems that gcc 4.9.0 with that patch ditches the new to patch glibc
(and possibly also eglibc). I'm testing that right now and will send
updated patches if that's true, in the meantime i've sent the glibc hack
patch conditional on microblaze (it's not commited yet).
The only "drawbrack" is that said patch doesn't apply cleanly to 4.8.x.
Regards.

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Mike Zick]

On Tue, 29 Apr 2014 10:14:09 -0300
Gustavo Zacarias <gustavo@zacarias.com.ar> wrote:

> > The changes do not show up yet on
> > http://git.buildroot.net/buildroot. May be Peter did not pushed the
> > changes yesterday. 
 
Ah, so -
The "Buildroot Gottcha" is back.

Compare the view of:
http://git.buildroot.net/buildroot
with:
http://git.buildroot.net/buildroot/

At least at this moment, they are different (again).

Mike

[Buildroot] [PATCH 3/6] upstream glibc 2.18/2.19 works fine with microblaze

[Peter Korsgaard]

>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > There is no need for Xilinx Git.
 > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/6] disable eglibc, no time to test

[Waldemar Brodkorb]

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 toolchain/toolchain-buildroot/Config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 42166d2..5a10b50 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -44,7 +44,7 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
 		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
 		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
-		   BR2_x86_64 || BR2_microblaze
+		   BR2_x86_64
 	depends on BR2_USE_MMU
 	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_USES_GLIBC
-- 
1.7.10.4

[Buildroot] [PATCH 4/6] disable eglibc, no time to test

[Gustavo Zacarias]

On 04/13/2014 06:47 AM, Waldemar Brodkorb wrote:

> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

It actually fails like you say in
https://sourceware.org/ml/libc-help/2014-04/msg00020.html
So basically:

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Probably easy to port the patch to eglibc though.
Regards.

[Buildroot] [PATCH 5/6] temporary hack to fix linking error

[Waldemar Brodkorb]

See here for more info:
https://sourceware.org/ml/libc-help/2014-04/msg00020.html

Still working on the issue.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/glibc/2.18/microblaze-libgcc_eh.patch |   18 ++++++++++++++++++
 package/glibc/2.19/microblaze-libgcc_eh.patch |   18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 package/glibc/2.18/microblaze-libgcc_eh.patch
 create mode 100644 package/glibc/2.19/microblaze-libgcc_eh.patch

diff --git a/package/glibc/2.18/microblaze-libgcc_eh.patch b/package/glibc/2.18/microblaze-libgcc_eh.patch
new file mode 100644
index 0000000..a8650df
--- /dev/null
+++ b/package/glibc/2.18/microblaze-libgcc_eh.patch
@@ -0,0 +1,18 @@
+diff -Nur glibc-2.19.orig/Makeconfig glibc-2.19/Makeconfig
+--- glibc-2.19.orig/Makeconfig	2014-02-07 10:04:38.000000000 +0100
++++ glibc-2.19/Makeconfig	2014-04-11 08:22:27.000000000 +0200
+@@ -559,12 +559,12 @@
+ # statically link programs.  When --disable-shared is used, we use
+ # -lgcc_eh since elf/static-stubs.o isn't sufficient.
+ ifeq (yes,$(build-shared))
+-static-gnulib = -lgcc $(static-gnulib-arch)
++static-gnulib = -lgcc -lgcc_eh $(static-gnulib-arch)
+ else
+ static-gnulib = -lgcc -lgcc_eh $(static-gnulib-arch)
+ endif
+ static-gnulib-tests := -lgcc -lgcc_eh $(libunwind)
+-libc.so-gnulib := -lgcc
++libc.so-gnulib := -lgcc -lgcc_eh
+ endif
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+ +postinit = $(addprefix $(csu-objpfx),crtn.o)
diff --git a/package/glibc/2.19/microblaze-libgcc_eh.patch b/package/glibc/2.19/microblaze-libgcc_eh.patch
new file mode 100644
index 0000000..a8650df
--- /dev/null
+++ b/package/glibc/2.19/microblaze-libgcc_eh.patch
@@ -0,0 +1,18 @@
+diff -Nur glibc-2.19.orig/Makeconfig glibc-2.19/Makeconfig
+--- glibc-2.19.orig/Makeconfig	2014-02-07 10:04:38.000000000 +0100
++++ glibc-2.19/Makeconfig	2014-04-11 08:22:27.000000000 +0200
+@@ -559,12 +559,12 @@
+ # statically link programs.  When --disable-shared is used, we use
+ # -lgcc_eh since elf/static-stubs.o isn't sufficient.
+ ifeq (yes,$(build-shared))
+-static-gnulib = -lgcc $(static-gnulib-arch)
++static-gnulib = -lgcc -lgcc_eh $(static-gnulib-arch)
+ else
+ static-gnulib = -lgcc -lgcc_eh $(static-gnulib-arch)
+ endif
+ static-gnulib-tests := -lgcc -lgcc_eh $(libunwind)
+-libc.so-gnulib := -lgcc
++libc.so-gnulib := -lgcc -lgcc_eh
+ endif
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+ +postinit = $(addprefix $(csu-objpfx),crtn.o)
-- 
1.7.10.4

[Buildroot] [PATCH 5/6] temporary hack to fix linking error

[Gustavo Zacarias]

On 04/13/2014 06:47 AM, Waldemar Brodkorb wrote:

> See here for more info:
> https://sourceware.org/ml/libc-help/2014-04/msg00020.html
> 
> Still working on the issue.

This patch works, but by it being temporary/hacky it should be
conditionally applied just for microblaze since you probably have no
idea how it can affect other architectures.

By the way, how is it that we're not interested in fixing things or
something like that?
(https://sourceware.org/ml/libc-help/2014-04/msg00027.html)
I'm using my (volunteer/spare) time looking at your patchset and testing
it, so i think that's not a fair assessment, and disabling eglibc
because "no time to test" and saying that at the same time sounds pretty
much like double-standards.
I'm not saying this to get you angry or anything like that, it's just
that you're stating it in a very public mailing list and it seems
utterly unfair to many BR contributors. Many people do what they can
when they can.

Now with that out of the way, care to respin this patch with the
consideration i mentioned above?
Regards.

[Buildroot] [PATCH 5/6] temporary hack to fix linking error

[Waldemar Brodkorb]

Hi Gustavo,
Gustavo Zacarias wrote,

> On 04/13/2014 06:47 AM, Waldemar Brodkorb wrote:
> 
> > See here for more info:
> > https://sourceware.org/ml/libc-help/2014-04/msg00020.html
> > 
> > Still working on the issue.
> 
> This patch works, but by it being temporary/hacky it should be
> conditionally applied just for microblaze since you probably have no
> idea how it can affect other architectures.
> 
> By the way, how is it that we're not interested in fixing things or
> something like that?
> (https://sourceware.org/ml/libc-help/2014-04/msg00027.html)
> I'm using my (volunteer/spare) time looking at your patchset and testing
> it, so i think that's not a fair assessment, and disabling eglibc
> because "no time to test" and saying that at the same time sounds pretty
> much like double-standards.
> I'm not saying this to get you angry or anything like that, it's just
> that you're stating it in a very public mailing list and it seems
> utterly unfair to many BR contributors. Many people do what they can
> when they can.

Okay, sorry. I thought that there is no interest in my patches,
because I got no feedback at all. Looking at the traffic on the
mailinglist nearly every patch set gets some feedback after 2-3
days. My bug report about the microblaze OOM got no feedback, too. 
I stop whining now, and start hacking.
 
> Now with that out of the way, care to respin this patch with the
> consideration i mentioned above?

I will respin the patches after your gcc 4.9 patch set gets
committed. I tested with gcc 4.9 and the workaround for glibc/eglibc
is not required anymore.

best regards
        Waldemar 

[Buildroot] [PATCH 5/6] temporary hack to fix linking error

[Gustavo Zacarias]

On 04/22/2014 02:49 PM, Waldemar Brodkorb wrote:
> Okay, sorry. I thought that there is no interest in my patches,
> because I got no feedback at all. Looking at the traffic on the
> mailinglist nearly every patch set gets some feedback after 2-3
> days. My bug report about the microblaze OOM got no feedback, too. 
> I stop whining now, and start hacking.

Hi.
Ok, cool, now we're talking! :)

> I will respin the patches after your gcc 4.9 patch set gets
> committed. I tested with gcc 4.9 and the workaround for glibc/eglibc
> is not required anymore.

Great.
Only the gcc patch would need a respin i think, the rest can be
committed as they are.
Thanks.
Regards.

[Buildroot] [PATCH 6/6] update to 3.14

[Waldemar Brodkorb]

* fix networking in Qemu using a small patch
* disable DTS, because linux.bin does not include any DTB the
  default Qemu included DTB is used and this is okay and works fine

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 .../{linux-3.13.config => linux-3.14.config}       |    1 +
 board/qemu/microblazebe-mmu/system.dts             |  367 --------------------
 .../{linux-3.13.config => linux-3.14.config}       |    1 +
 board/qemu/microblazeel-mmu/system.dts             |  367 --------------------
 board/qemu/microblazeel-mmu/xilinx-xemaclite.patch |   11 +
 configs/qemu_microblazebe_mmu_defconfig            |    8 +-
 configs/qemu_microblazeel_mmu_defconfig            |    8 +-
 linux/Config.in                                    |    2 -
 8 files changed, 21 insertions(+), 744 deletions(-)
 rename board/qemu/microblazebe-mmu/{linux-3.13.config => linux-3.14.config} (98%)
 delete mode 100644 board/qemu/microblazebe-mmu/system.dts
 rename board/qemu/microblazeel-mmu/{linux-3.13.config => linux-3.14.config} (98%)
 delete mode 100644 board/qemu/microblazeel-mmu/system.dts
 create mode 100644 board/qemu/microblazeel-mmu/xilinx-xemaclite.patch

diff --git a/board/qemu/microblazebe-mmu/linux-3.13.config b/board/qemu/microblazebe-mmu/linux-3.14.config
similarity index 98%
rename from board/qemu/microblazebe-mmu/linux-3.13.config
rename to board/qemu/microblazebe-mmu/linux-3.14.config
index c2ef789..d7e3235 100644
--- a/board/qemu/microblazebe-mmu/linux-3.13.config
+++ b/board/qemu/microblazebe-mmu/linux-3.14.config
@@ -36,6 +36,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
diff --git a/board/qemu/microblazebe-mmu/system.dts b/board/qemu/microblazebe-mmu/system.dts
deleted file mode 100644
index 3f85df2..0000000
--- a/board/qemu/microblazebe-mmu/system.dts
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Device Tree Generator version: 1.1
- *
- * (C) Copyright 2007-2008 Xilinx, Inc.
- * (C) Copyright 2007-2009 Michal Simek
- *
- * Michal SIMEK <monstr@monstr.eu>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * CAUTION: This file is automatically generated by libgen.
- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
- *
- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
- */
-
-/dts-v1/;
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "xlnx,microblaze";
-	hard-reset-gpios = <&LEDs_8Bit 2 1>;
-	model = "testing";
-	DDR2_SDRAM: memory at 90000000 {
-		device_type = "memory";
-		reg = < 0x90000000 0x10000000 >;
-	} ;
-	aliases {
-		ethernet0 = &Hard_Ethernet_MAC;
-		serial0 = &RS232_Uart_1;
-	} ;
-	chosen {
-		bootargs = "console=ttyUL0,115200 highres=on";
-		linux,stdout-path = "/plb at 0/serial at 84000000";
-	} ;
-	cpus {
-		#address-cells = <1>;
-		#cpus = <0x1>;
-		#size-cells = <0>;
-		microblaze_0: cpu at 0 {
-			clock-frequency = <125000000>;
-			compatible = "xlnx,microblaze-7.10.d";
-			d-cache-baseaddr = <0x90000000>;
-			d-cache-highaddr = <0x9fffffff>;
-			d-cache-line-size = <0x10>;
-			d-cache-size = <0x2000>;
-			device_type = "cpu";
-			i-cache-baseaddr = <0x90000000>;
-			i-cache-highaddr = <0x9fffffff>;
-			i-cache-line-size = <0x10>;
-			i-cache-size = <0x2000>;
-			model = "microblaze,7.10.d";
-			reg = <0>;
-			timebase-frequency = <125000000>;
-			xlnx,addr-tag-bits = <0xf>;
-			xlnx,allow-dcache-wr = <0x1>;
-			xlnx,allow-icache-wr = <0x1>;
-			xlnx,area-optimized = <0x0>;
-			xlnx,cache-byte-size = <0x2000>;
-			xlnx,d-lmb = <0x1>;
-			xlnx,d-opb = <0x0>;
-			xlnx,d-plb = <0x1>;
-			xlnx,data-size = <0x20>;
-			xlnx,dcache-addr-tag = <0xf>;
-			xlnx,dcache-always-used = <0x1>;
-			xlnx,dcache-byte-size = <0x2000>;
-			xlnx,dcache-line-len = <0x4>;
-			xlnx,dcache-use-fsl = <0x1>;
-			xlnx,debug-enabled = <0x1>;
-			xlnx,div-zero-exception = <0x1>;
-			xlnx,dopb-bus-exception = <0x0>;
-			xlnx,dynamic-bus-sizing = <0x1>;
-			xlnx,edge-is-positive = <0x1>;
-			xlnx,family = "virtex5";
-			xlnx,endianness = <0x1>;
-			xlnx,fpu-exception = <0x1>;
-			xlnx,fsl-data-size = <0x20>;
-			xlnx,fsl-exception = <0x0>;
-			xlnx,fsl-links = <0x0>;
-			xlnx,i-lmb = <0x1>;
-			xlnx,i-opb = <0x0>;
-			xlnx,i-plb = <0x1>;
-			xlnx,icache-always-used = <0x1>;
-			xlnx,icache-line-len = <0x4>;
-			xlnx,icache-use-fsl = <0x1>;
-			xlnx,ill-opcode-exception = <0x1>;
-			xlnx,instance = "microblaze_0";
-			xlnx,interconnect = <0x1>;
-			xlnx,interrupt-is-edge = <0x0>;
-			xlnx,iopb-bus-exception = <0x0>;
-			xlnx,mmu-dtlb-size = <0x4>;
-			xlnx,mmu-itlb-size = <0x2>;
-			xlnx,mmu-tlb-access = <0x3>;
-			xlnx,mmu-zones = <0x10>;
-			xlnx,number-of-pc-brk = <0x1>;
-			xlnx,number-of-rd-addr-brk = <0x0>;
-			xlnx,number-of-wr-addr-brk = <0x0>;
-			xlnx,opcode-0x0-illegal = <0x1>;
-			xlnx,pvr = <0x2>;
-			xlnx,pvr-user1 = <0x0>;
-			xlnx,pvr-user2 = <0x0>;
-			xlnx,reset-msr = <0x0>;
-			xlnx,sco = <0x0>;
-			xlnx,unaligned-exceptions = <0x1>;
-			xlnx,use-barrel = <0x1>;
-			xlnx,use-dcache = <0x1>;
-			xlnx,use-div = <0x1>;
-			xlnx,use-ext-brk = <0x1>;
-			xlnx,use-ext-nm-brk = <0x1>;
-			xlnx,use-extended-fsl-instr = <0x0>;
-			xlnx,use-fpu = <0x2>;
-			xlnx,use-hw-mul = <0x2>;
-			xlnx,use-icache = <0x1>;
-			xlnx,use-interrupt = <0x1>;
-			xlnx,use-mmu = <0x3>;
-			xlnx,use-msr-instr = <0x1>;
-			xlnx,use-pcmp-instr = <0x1>;
-		} ;
-	} ;
-	mb_plb: plb at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
-		ranges ;
-		FLASH: flash at a0000000 {
-			bank-width = <2>;
-			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
-			reg = < 0xa0000000 0x2000000 >;
-			xlnx,family = "virtex5";
-			xlnx,include-datawidth-matching-0 = <0x1>;
-			xlnx,include-datawidth-matching-1 = <0x0>;
-			xlnx,include-datawidth-matching-2 = <0x0>;
-			xlnx,include-datawidth-matching-3 = <0x0>;
-			xlnx,include-negedge-ioregs = <0x0>;
-			xlnx,include-plb-ipif = <0x1>;
-			xlnx,include-wrbuf = <0x1>;
-			xlnx,max-mem-width = <0x10>;
-			xlnx,mch-native-dwidth = <0x20>;
-			xlnx,mch-plb-clk-period-ps = <0x1f40>;
-			xlnx,mch-splb-awidth = <0x20>;
-			xlnx,mch0-accessbuf-depth = <0x10>;
-			xlnx,mch0-protocol = <0x0>;
-			xlnx,mch0-rddatabuf-depth = <0x10>;
-			xlnx,mch1-accessbuf-depth = <0x10>;
-			xlnx,mch1-protocol = <0x0>;
-			xlnx,mch1-rddatabuf-depth = <0x10>;
-			xlnx,mch2-accessbuf-depth = <0x10>;
-			xlnx,mch2-protocol = <0x0>;
-			xlnx,mch2-rddatabuf-depth = <0x10>;
-			xlnx,mch3-accessbuf-depth = <0x10>;
-			xlnx,mch3-protocol = <0x0>;
-			xlnx,mch3-rddatabuf-depth = <0x10>;
-			xlnx,mem0-width = <0x10>;
-			xlnx,mem1-width = <0x20>;
-			xlnx,mem2-width = <0x20>;
-			xlnx,mem3-width = <0x20>;
-			xlnx,num-banks-mem = <0x1>;
-			xlnx,num-channels = <0x0>;
-			xlnx,priority-mode = <0x0>;
-			xlnx,synch-mem-0 = <0x0>;
-			xlnx,synch-mem-1 = <0x0>;
-			xlnx,synch-mem-2 = <0x0>;
-			xlnx,synch-mem-3 = <0x0>;
-			xlnx,synch-pipedelay-0 = <0x2>;
-			xlnx,synch-pipedelay-1 = <0x2>;
-			xlnx,synch-pipedelay-2 = <0x2>;
-			xlnx,synch-pipedelay-3 = <0x2>;
-			xlnx,tavdv-ps-mem-0 = <0x1adb0>;
-			xlnx,tavdv-ps-mem-1 = <0x3a98>;
-			xlnx,tavdv-ps-mem-2 = <0x3a98>;
-			xlnx,tavdv-ps-mem-3 = <0x3a98>;
-			xlnx,tcedv-ps-mem-0 = <0x1adb0>;
-			xlnx,tcedv-ps-mem-1 = <0x3a98>;
-			xlnx,tcedv-ps-mem-2 = <0x3a98>;
-			xlnx,tcedv-ps-mem-3 = <0x3a98>;
-			xlnx,thzce-ps-mem-0 = <0x88b8>;
-			xlnx,thzce-ps-mem-1 = <0x1b58>;
-			xlnx,thzce-ps-mem-2 = <0x1b58>;
-			xlnx,thzce-ps-mem-3 = <0x1b58>;
-			xlnx,thzoe-ps-mem-0 = <0x1b58>;
-			xlnx,thzoe-ps-mem-1 = <0x1b58>;
-			xlnx,thzoe-ps-mem-2 = <0x1b58>;
-			xlnx,thzoe-ps-mem-3 = <0x1b58>;
-			xlnx,tlzwe-ps-mem-0 = <0x88b8>;
-			xlnx,tlzwe-ps-mem-1 = <0x0>;
-			xlnx,tlzwe-ps-mem-2 = <0x0>;
-			xlnx,tlzwe-ps-mem-3 = <0x0>;
-			xlnx,twc-ps-mem-0 = <0x2af8>;
-			xlnx,twc-ps-mem-1 = <0x3a98>;
-			xlnx,twc-ps-mem-2 = <0x3a98>;
-			xlnx,twc-ps-mem-3 = <0x3a98>;
-			xlnx,twp-ps-mem-0 = <0x11170>;
-			xlnx,twp-ps-mem-1 = <0x2ee0>;
-			xlnx,twp-ps-mem-2 = <0x2ee0>;
-			xlnx,twp-ps-mem-3 = <0x2ee0>;
-			xlnx,xcl0-linesize = <0x4>;
-			xlnx,xcl0-writexfer = <0x1>;
-			xlnx,xcl1-linesize = <0x4>;
-			xlnx,xcl1-writexfer = <0x1>;
-			xlnx,xcl2-linesize = <0x4>;
-			xlnx,xcl2-writexfer = <0x1>;
-			xlnx,xcl3-linesize = <0x4>;
-			xlnx,xcl3-writexfer = <0x1>;
-		} ;
-		Hard_Ethernet_MAC: xps-ll-temac at 81c00000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "xlnx,compound";
-			ranges ;
-			ethernet at 81c00000 {
-				compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
-				device_type = "network";
-				interrupt-parent = <&xps_intc_0>;
-				interrupts = < 5 2 >;
-				llink-connected = <&PIM3>;
-				local-mac-address = [ 00 0a 35 00 00 00 ];
-				reg = < 0x81c00000 0x40 >;
-				xlnx,bus2core-clk-ratio = <0x1>;
-				xlnx,phy-type = <0x1>;
-				xlnx,phyaddr = <0x1>;
-				xlnx,rxcsum = <0x0>;
-				xlnx,rxfifo = <0x1000>;
-				xlnx,temac-type = <0x0>;
-				xlnx,txcsum = <0x0>;
-				xlnx,txfifo = <0x1000>;
-			} ;
-		} ;
-		IIC_EEPROM: i2c at 81600000 {
-			compatible = "xlnx,xps-iic-2.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 6 2 >;
-			reg = < 0x81600000 0x10000 >;
-			xlnx,clk-freq = <0x7735940>;
-			xlnx,family = "virtex5";
-			xlnx,gpo-width = <0x1>;
-			xlnx,iic-freq = <0x186a0>;
-			xlnx,scl-inertial-delay = <0x0>;
-			xlnx,sda-inertial-delay = <0x0>;
-			xlnx,ten-bit-adr = <0x0>;
-		} ;
-		LEDs_8Bit: gpio at 81400000 {
-			compatible = "xlnx,xps-gpio-1.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 7 2 >;
-			reg = < 0x81400000 0x10000 >;
-			xlnx,all-inputs = <0x0>;
-			xlnx,all-inputs-2 = <0x0>;
-			xlnx,dout-default = <0x0>;
-			xlnx,dout-default-2 = <0x0>;
-			xlnx,family = "virtex5";
-			xlnx,gpio-width = <0x8>;
-			xlnx,interrupt-present = <0x1>;
-			xlnx,is-bidir = <0x1>;
-			xlnx,is-bidir-2 = <0x1>;
-			xlnx,is-dual = <0x0>;
-			xlnx,tri-default = <0xffffffff>;
-			xlnx,tri-default-2 = <0xffffffff>;
-			#gpio-cells = <2>;
-			gpio-controller;
-		} ;
-
-		gpio-leds {
-			compatible = "gpio-leds";
-
-			heartbeat {
-				label = "Heartbeat";
-				gpios = <&LEDs_8Bit 4 1>;
-				linux,default-trigger = "heartbeat";
-			};
-
-			yellow {
-				label = "Yellow";
-				gpios = <&LEDs_8Bit 5 1>;
-			};
-
-			red {
-				label = "Red";
-				gpios = <&LEDs_8Bit 6 1>;
-			};
-
-			green {
-				label = "Green";
-				gpios = <&LEDs_8Bit 7 1>;
-			};
-		} ;
-		RS232_Uart_1: serial at 84000000 {
-			clock-frequency = <125000000>;
-			compatible = "xlnx,xps-uartlite-1.00.a";
-			current-speed = <115200>;
-			device_type = "serial";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 8 0 >;
-			port-number = <0>;
-			reg = < 0x84000000 0x10000 >;
-			xlnx,baudrate = <0x1c200>;
-			xlnx,data-bits = <0x8>;
-			xlnx,family = "virtex5";
-			xlnx,odd-parity = <0x0>;
-			xlnx,use-parity = <0x0>;
-		} ;
-		SysACE_CompactFlash: sysace at 83600000 {
-			compatible = "xlnx,xps-sysace-1.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 4 2 >;
-			reg = < 0x83600000 0x10000 >;
-			xlnx,family = "virtex5";
-			xlnx,mem-width = <0x10>;
-		} ;
-		debug_module: debug at 84400000 {
-			compatible = "xlnx,mdm-1.00.d";
-			reg = < 0x84400000 0x10000 >;
-			xlnx,family = "virtex5";
-			xlnx,interconnect = <0x1>;
-			xlnx,jtag-chain = <0x2>;
-			xlnx,mb-dbg-ports = <0x1>;
-			xlnx,uart-width = <0x8>;
-			xlnx,use-uart = <0x1>;
-			xlnx,write-fsl-ports = <0x0>;
-		} ;
-		mpmc at 90000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "xlnx,mpmc-4.02.a";
-			ranges ;
-			PIM3: sdma at 84600180 {
-				compatible = "xlnx,ll-dma-1.00.a";
-				interrupt-parent = <&xps_intc_0>;
-				interrupts = < 2 2 1 2 >;
-				reg = < 0x84600180 0x80 >;
-			} ;
-		} ;
-		xps_intc_0: interrupt-controller at 81800000 {
-			#interrupt-cells = <0x2>;
-			compatible = "xlnx,xps-intc-1.00.a";
-			interrupt-controller ;
-			reg = < 0x81800000 0x10000 >;
-			xlnx,kind-of-intr = <0x100>;
-			xlnx,num-intr-inputs = <0x9>;
-		} ;
-		xps_timer_1: timer at 83c00000 {
-			compatible = "xlnx,xps-timer-1.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 3 2 >;
-			reg = < 0x83c00000 0x10000 >;
-			xlnx,count-width = <0x20>;
-			xlnx,family = "virtex5";
-			xlnx,gen0-assert = <0x1>;
-			xlnx,gen1-assert = <0x1>;
-			xlnx,one-timer-only = <0x0>;
-			xlnx,trig0-assert = <0x1>;
-			xlnx,trig1-assert = <0x1>;
-		} ;
-	} ;
-}  ;
diff --git a/board/qemu/microblazeel-mmu/linux-3.13.config b/board/qemu/microblazeel-mmu/linux-3.14.config
similarity index 98%
rename from board/qemu/microblazeel-mmu/linux-3.13.config
rename to board/qemu/microblazeel-mmu/linux-3.14.config
index 7426f1f..d31faf6 100644
--- a/board/qemu/microblazeel-mmu/linux-3.13.config
+++ b/board/qemu/microblazeel-mmu/linux-3.14.config
@@ -35,6 +35,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
diff --git a/board/qemu/microblazeel-mmu/system.dts b/board/qemu/microblazeel-mmu/system.dts
deleted file mode 100644
index 3f85df2..0000000
--- a/board/qemu/microblazeel-mmu/system.dts
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Device Tree Generator version: 1.1
- *
- * (C) Copyright 2007-2008 Xilinx, Inc.
- * (C) Copyright 2007-2009 Michal Simek
- *
- * Michal SIMEK <monstr@monstr.eu>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * CAUTION: This file is automatically generated by libgen.
- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
- *
- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
- */
-
-/dts-v1/;
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "xlnx,microblaze";
-	hard-reset-gpios = <&LEDs_8Bit 2 1>;
-	model = "testing";
-	DDR2_SDRAM: memory at 90000000 {
-		device_type = "memory";
-		reg = < 0x90000000 0x10000000 >;
-	} ;
-	aliases {
-		ethernet0 = &Hard_Ethernet_MAC;
-		serial0 = &RS232_Uart_1;
-	} ;
-	chosen {
-		bootargs = "console=ttyUL0,115200 highres=on";
-		linux,stdout-path = "/plb at 0/serial at 84000000";
-	} ;
-	cpus {
-		#address-cells = <1>;
-		#cpus = <0x1>;
-		#size-cells = <0>;
-		microblaze_0: cpu at 0 {
-			clock-frequency = <125000000>;
-			compatible = "xlnx,microblaze-7.10.d";
-			d-cache-baseaddr = <0x90000000>;
-			d-cache-highaddr = <0x9fffffff>;
-			d-cache-line-size = <0x10>;
-			d-cache-size = <0x2000>;
-			device_type = "cpu";
-			i-cache-baseaddr = <0x90000000>;
-			i-cache-highaddr = <0x9fffffff>;
-			i-cache-line-size = <0x10>;
-			i-cache-size = <0x2000>;
-			model = "microblaze,7.10.d";
-			reg = <0>;
-			timebase-frequency = <125000000>;
-			xlnx,addr-tag-bits = <0xf>;
-			xlnx,allow-dcache-wr = <0x1>;
-			xlnx,allow-icache-wr = <0x1>;
-			xlnx,area-optimized = <0x0>;
-			xlnx,cache-byte-size = <0x2000>;
-			xlnx,d-lmb = <0x1>;
-			xlnx,d-opb = <0x0>;
-			xlnx,d-plb = <0x1>;
-			xlnx,data-size = <0x20>;
-			xlnx,dcache-addr-tag = <0xf>;
-			xlnx,dcache-always-used = <0x1>;
-			xlnx,dcache-byte-size = <0x2000>;
-			xlnx,dcache-line-len = <0x4>;
-			xlnx,dcache-use-fsl = <0x1>;
-			xlnx,debug-enabled = <0x1>;
-			xlnx,div-zero-exception = <0x1>;
-			xlnx,dopb-bus-exception = <0x0>;
-			xlnx,dynamic-bus-sizing = <0x1>;
-			xlnx,edge-is-positive = <0x1>;
-			xlnx,family = "virtex5";
-			xlnx,endianness = <0x1>;
-			xlnx,fpu-exception = <0x1>;
-			xlnx,fsl-data-size = <0x20>;
-			xlnx,fsl-exception = <0x0>;
-			xlnx,fsl-links = <0x0>;
-			xlnx,i-lmb = <0x1>;
-			xlnx,i-opb = <0x0>;
-			xlnx,i-plb = <0x1>;
-			xlnx,icache-always-used = <0x1>;
-			xlnx,icache-line-len = <0x4>;
-			xlnx,icache-use-fsl = <0x1>;
-			xlnx,ill-opcode-exception = <0x1>;
-			xlnx,instance = "microblaze_0";
-			xlnx,interconnect = <0x1>;
-			xlnx,interrupt-is-edge = <0x0>;
-			xlnx,iopb-bus-exception = <0x0>;
-			xlnx,mmu-dtlb-size = <0x4>;
-			xlnx,mmu-itlb-size = <0x2>;
-			xlnx,mmu-tlb-access = <0x3>;
-			xlnx,mmu-zones = <0x10>;
-			xlnx,number-of-pc-brk = <0x1>;
-			xlnx,number-of-rd-addr-brk = <0x0>;
-			xlnx,number-of-wr-addr-brk = <0x0>;
-			xlnx,opcode-0x0-illegal = <0x1>;
-			xlnx,pvr = <0x2>;
-			xlnx,pvr-user1 = <0x0>;
-			xlnx,pvr-user2 = <0x0>;
-			xlnx,reset-msr = <0x0>;
-			xlnx,sco = <0x0>;
-			xlnx,unaligned-exceptions = <0x1>;
-			xlnx,use-barrel = <0x1>;
-			xlnx,use-dcache = <0x1>;
-			xlnx,use-div = <0x1>;
-			xlnx,use-ext-brk = <0x1>;
-			xlnx,use-ext-nm-brk = <0x1>;
-			xlnx,use-extended-fsl-instr = <0x0>;
-			xlnx,use-fpu = <0x2>;
-			xlnx,use-hw-mul = <0x2>;
-			xlnx,use-icache = <0x1>;
-			xlnx,use-interrupt = <0x1>;
-			xlnx,use-mmu = <0x3>;
-			xlnx,use-msr-instr = <0x1>;
-			xlnx,use-pcmp-instr = <0x1>;
-		} ;
-	} ;
-	mb_plb: plb at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
-		ranges ;
-		FLASH: flash at a0000000 {
-			bank-width = <2>;
-			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
-			reg = < 0xa0000000 0x2000000 >;
-			xlnx,family = "virtex5";
-			xlnx,include-datawidth-matching-0 = <0x1>;
-			xlnx,include-datawidth-matching-1 = <0x0>;
-			xlnx,include-datawidth-matching-2 = <0x0>;
-			xlnx,include-datawidth-matching-3 = <0x0>;
-			xlnx,include-negedge-ioregs = <0x0>;
-			xlnx,include-plb-ipif = <0x1>;
-			xlnx,include-wrbuf = <0x1>;
-			xlnx,max-mem-width = <0x10>;
-			xlnx,mch-native-dwidth = <0x20>;
-			xlnx,mch-plb-clk-period-ps = <0x1f40>;
-			xlnx,mch-splb-awidth = <0x20>;
-			xlnx,mch0-accessbuf-depth = <0x10>;
-			xlnx,mch0-protocol = <0x0>;
-			xlnx,mch0-rddatabuf-depth = <0x10>;
-			xlnx,mch1-accessbuf-depth = <0x10>;
-			xlnx,mch1-protocol = <0x0>;
-			xlnx,mch1-rddatabuf-depth = <0x10>;
-			xlnx,mch2-accessbuf-depth = <0x10>;
-			xlnx,mch2-protocol = <0x0>;
-			xlnx,mch2-rddatabuf-depth = <0x10>;
-			xlnx,mch3-accessbuf-depth = <0x10>;
-			xlnx,mch3-protocol = <0x0>;
-			xlnx,mch3-rddatabuf-depth = <0x10>;
-			xlnx,mem0-width = <0x10>;
-			xlnx,mem1-width = <0x20>;
-			xlnx,mem2-width = <0x20>;
-			xlnx,mem3-width = <0x20>;
-			xlnx,num-banks-mem = <0x1>;
-			xlnx,num-channels = <0x0>;
-			xlnx,priority-mode = <0x0>;
-			xlnx,synch-mem-0 = <0x0>;
-			xlnx,synch-mem-1 = <0x0>;
-			xlnx,synch-mem-2 = <0x0>;
-			xlnx,synch-mem-3 = <0x0>;
-			xlnx,synch-pipedelay-0 = <0x2>;
-			xlnx,synch-pipedelay-1 = <0x2>;
-			xlnx,synch-pipedelay-2 = <0x2>;
-			xlnx,synch-pipedelay-3 = <0x2>;
-			xlnx,tavdv-ps-mem-0 = <0x1adb0>;
-			xlnx,tavdv-ps-mem-1 = <0x3a98>;
-			xlnx,tavdv-ps-mem-2 = <0x3a98>;
-			xlnx,tavdv-ps-mem-3 = <0x3a98>;
-			xlnx,tcedv-ps-mem-0 = <0x1adb0>;
-			xlnx,tcedv-ps-mem-1 = <0x3a98>;
-			xlnx,tcedv-ps-mem-2 = <0x3a98>;
-			xlnx,tcedv-ps-mem-3 = <0x3a98>;
-			xlnx,thzce-ps-mem-0 = <0x88b8>;
-			xlnx,thzce-ps-mem-1 = <0x1b58>;
-			xlnx,thzce-ps-mem-2 = <0x1b58>;
-			xlnx,thzce-ps-mem-3 = <0x1b58>;
-			xlnx,thzoe-ps-mem-0 = <0x1b58>;
-			xlnx,thzoe-ps-mem-1 = <0x1b58>;
-			xlnx,thzoe-ps-mem-2 = <0x1b58>;
-			xlnx,thzoe-ps-mem-3 = <0x1b58>;
-			xlnx,tlzwe-ps-mem-0 = <0x88b8>;
-			xlnx,tlzwe-ps-mem-1 = <0x0>;
-			xlnx,tlzwe-ps-mem-2 = <0x0>;
-			xlnx,tlzwe-ps-mem-3 = <0x0>;
-			xlnx,twc-ps-mem-0 = <0x2af8>;
-			xlnx,twc-ps-mem-1 = <0x3a98>;
-			xlnx,twc-ps-mem-2 = <0x3a98>;
-			xlnx,twc-ps-mem-3 = <0x3a98>;
-			xlnx,twp-ps-mem-0 = <0x11170>;
-			xlnx,twp-ps-mem-1 = <0x2ee0>;
-			xlnx,twp-ps-mem-2 = <0x2ee0>;
-			xlnx,twp-ps-mem-3 = <0x2ee0>;
-			xlnx,xcl0-linesize = <0x4>;
-			xlnx,xcl0-writexfer = <0x1>;
-			xlnx,xcl1-linesize = <0x4>;
-			xlnx,xcl1-writexfer = <0x1>;
-			xlnx,xcl2-linesize = <0x4>;
-			xlnx,xcl2-writexfer = <0x1>;
-			xlnx,xcl3-linesize = <0x4>;
-			xlnx,xcl3-writexfer = <0x1>;
-		} ;
-		Hard_Ethernet_MAC: xps-ll-temac at 81c00000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "xlnx,compound";
-			ranges ;
-			ethernet at 81c00000 {
-				compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
-				device_type = "network";
-				interrupt-parent = <&xps_intc_0>;
-				interrupts = < 5 2 >;
-				llink-connected = <&PIM3>;
-				local-mac-address = [ 00 0a 35 00 00 00 ];
-				reg = < 0x81c00000 0x40 >;
-				xlnx,bus2core-clk-ratio = <0x1>;
-				xlnx,phy-type = <0x1>;
-				xlnx,phyaddr = <0x1>;
-				xlnx,rxcsum = <0x0>;
-				xlnx,rxfifo = <0x1000>;
-				xlnx,temac-type = <0x0>;
-				xlnx,txcsum = <0x0>;
-				xlnx,txfifo = <0x1000>;
-			} ;
-		} ;
-		IIC_EEPROM: i2c at 81600000 {
-			compatible = "xlnx,xps-iic-2.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 6 2 >;
-			reg = < 0x81600000 0x10000 >;
-			xlnx,clk-freq = <0x7735940>;
-			xlnx,family = "virtex5";
-			xlnx,gpo-width = <0x1>;
-			xlnx,iic-freq = <0x186a0>;
-			xlnx,scl-inertial-delay = <0x0>;
-			xlnx,sda-inertial-delay = <0x0>;
-			xlnx,ten-bit-adr = <0x0>;
-		} ;
-		LEDs_8Bit: gpio at 81400000 {
-			compatible = "xlnx,xps-gpio-1.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 7 2 >;
-			reg = < 0x81400000 0x10000 >;
-			xlnx,all-inputs = <0x0>;
-			xlnx,all-inputs-2 = <0x0>;
-			xlnx,dout-default = <0x0>;
-			xlnx,dout-default-2 = <0x0>;
-			xlnx,family = "virtex5";
-			xlnx,gpio-width = <0x8>;
-			xlnx,interrupt-present = <0x1>;
-			xlnx,is-bidir = <0x1>;
-			xlnx,is-bidir-2 = <0x1>;
-			xlnx,is-dual = <0x0>;
-			xlnx,tri-default = <0xffffffff>;
-			xlnx,tri-default-2 = <0xffffffff>;
-			#gpio-cells = <2>;
-			gpio-controller;
-		} ;
-
-		gpio-leds {
-			compatible = "gpio-leds";
-
-			heartbeat {
-				label = "Heartbeat";
-				gpios = <&LEDs_8Bit 4 1>;
-				linux,default-trigger = "heartbeat";
-			};
-
-			yellow {
-				label = "Yellow";
-				gpios = <&LEDs_8Bit 5 1>;
-			};
-
-			red {
-				label = "Red";
-				gpios = <&LEDs_8Bit 6 1>;
-			};
-
-			green {
-				label = "Green";
-				gpios = <&LEDs_8Bit 7 1>;
-			};
-		} ;
-		RS232_Uart_1: serial at 84000000 {
-			clock-frequency = <125000000>;
-			compatible = "xlnx,xps-uartlite-1.00.a";
-			current-speed = <115200>;
-			device_type = "serial";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 8 0 >;
-			port-number = <0>;
-			reg = < 0x84000000 0x10000 >;
-			xlnx,baudrate = <0x1c200>;
-			xlnx,data-bits = <0x8>;
-			xlnx,family = "virtex5";
-			xlnx,odd-parity = <0x0>;
-			xlnx,use-parity = <0x0>;
-		} ;
-		SysACE_CompactFlash: sysace at 83600000 {
-			compatible = "xlnx,xps-sysace-1.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 4 2 >;
-			reg = < 0x83600000 0x10000 >;
-			xlnx,family = "virtex5";
-			xlnx,mem-width = <0x10>;
-		} ;
-		debug_module: debug at 84400000 {
-			compatible = "xlnx,mdm-1.00.d";
-			reg = < 0x84400000 0x10000 >;
-			xlnx,family = "virtex5";
-			xlnx,interconnect = <0x1>;
-			xlnx,jtag-chain = <0x2>;
-			xlnx,mb-dbg-ports = <0x1>;
-			xlnx,uart-width = <0x8>;
-			xlnx,use-uart = <0x1>;
-			xlnx,write-fsl-ports = <0x0>;
-		} ;
-		mpmc at 90000000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "xlnx,mpmc-4.02.a";
-			ranges ;
-			PIM3: sdma at 84600180 {
-				compatible = "xlnx,ll-dma-1.00.a";
-				interrupt-parent = <&xps_intc_0>;
-				interrupts = < 2 2 1 2 >;
-				reg = < 0x84600180 0x80 >;
-			} ;
-		} ;
-		xps_intc_0: interrupt-controller at 81800000 {
-			#interrupt-cells = <0x2>;
-			compatible = "xlnx,xps-intc-1.00.a";
-			interrupt-controller ;
-			reg = < 0x81800000 0x10000 >;
-			xlnx,kind-of-intr = <0x100>;
-			xlnx,num-intr-inputs = <0x9>;
-		} ;
-		xps_timer_1: timer at 83c00000 {
-			compatible = "xlnx,xps-timer-1.00.a";
-			interrupt-parent = <&xps_intc_0>;
-			interrupts = < 3 2 >;
-			reg = < 0x83c00000 0x10000 >;
-			xlnx,count-width = <0x20>;
-			xlnx,family = "virtex5";
-			xlnx,gen0-assert = <0x1>;
-			xlnx,gen1-assert = <0x1>;
-			xlnx,one-timer-only = <0x0>;
-			xlnx,trig0-assert = <0x1>;
-			xlnx,trig1-assert = <0x1>;
-		} ;
-	} ;
-}  ;
diff --git a/board/qemu/microblazeel-mmu/xilinx-xemaclite.patch b/board/qemu/microblazeel-mmu/xilinx-xemaclite.patch
new file mode 100644
index 0000000..756bfae
--- /dev/null
+++ b/board/qemu/microblazeel-mmu/xilinx-xemaclite.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+--- linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c	2014-03-31 05:40:15.000000000 +0200
++++ linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c	2014-04-11 22:53:42.000000000 +0200
+@@ -1249,6 +1249,7 @@
+ 	{ .compatible = "xlnx,opb-ethernetlite-1.01.b", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-1.00.a", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-2.00.a", },
++	{ .compatible = "xlnx,xps-ethernetlite-2.00.b", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-2.01.a", },
+ 	{ .compatible = "xlnx,xps-ethernetlite-3.00.a", },
+ 	{ /* end of list */ },
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index f74a3a1..15c3ca1 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -12,9 +12,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.14.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
-BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
+BR2_LINUX_KERNEL_USE_CUSTOM_DTS=n
+BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 3a66d1b..6a59707 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -12,9 +12,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.14.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
-BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
+BR2_LINUX_KERNEL_USE_CUSTOM_DTS=n
+BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch"
diff --git a/linux/Config.in b/linux/Config.in
index c40dcd0..cb0506f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -210,8 +210,6 @@ config BR2_LINUX_KERNEL_LINUX_BIN
 	bool "linux.bin"
 	depends on BR2_microblaze
 	select BR2_LINUX_KERNEL_UBOOT_IMAGE
-	select BR2_LINUX_KERNEL_DTS_SUPPORT
-	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 
 config BR2_LINUX_KERNEL_VMLINUX_BIN
 	bool "vmlinux.bin"
-- 
1.7.10.4

[Buildroot] [PATCH 6/6] update to 3.14

[Gustavo Zacarias]

On 04/13/2014 06:47 AM, Waldemar Brodkorb wrote:

> * fix networking in Qemu using a small patch
> * disable DTS, because linux.bin does not include any DTB the
>   default Qemu included DTB is used and this is okay and works fine
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
(on Qemu)

Some detail nitpicking below:

> --- a/configs/qemu_microblazebe_mmu_defconfig
> +++ b/configs/qemu_microblazebe_mmu_defconfig
> +BR2_LINUX_KERNEL_USE_CUSTOM_DTS=n

It's the default so you can just delete it.

> +BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch"

Should use a separate copy of the patch for BE in the BE dir even if
it's the same.

> diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
> index 3a66d1b..6a59707 100644
> --- a/configs/qemu_microblazeel_mmu_defconfig
> +++ b/configs/qemu_microblazeel_mmu_defconfig
> +BR2_LINUX_KERNEL_USE_CUSTOM_DTS=n

Ditto above.
Thanks.