diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:23 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:23 +0200 |
commit | c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb (patch) | |
tree | 7c00728aa9d0c4cecf2d9203eebc093dbebbc07a /arch/arm/dts/zynq-microzed.dts | |
parent | 10dc77716f41979e03baf3b847b97dc7279ef30d (diff) | |
parent | 9f9d41bad16efe0674257b4efe4db1a399f93643 (diff) | |
download | u-boot-imx-c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb.zip u-boot-imx-c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb.tar.gz u-boot-imx-c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb.tar.bz2 |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/dts/zynq-microzed.dts')
-rw-r--r-- | arch/arm/dts/zynq-microzed.dts | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts index 6da71c1..c373a2c 100644 --- a/arch/arm/dts/zynq-microzed.dts +++ b/arch/arm/dts/zynq-microzed.dts @@ -11,4 +11,13 @@ / { model = "Zynq MicroZED Board"; compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000"; + + aliases { + serial0 = &uart1; + }; + + memory { + device_type = "memory"; + reg = <0 0x40000000>; + }; }; |