diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-20 09:23:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-20 09:23:42 -0400 |
| commit | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (patch) | |
| tree | cace59a042cbac70f6184d127ef503bcd3d590c1 /arch/arm/dts | |
| parent | f8c6390b668e02509296c9c7ce5073255e121456 (diff) | |
| parent | 43809cfa1baefb90958a17fa0d1ec67f6f9edaac (diff) | |
| download | blackbird-obmc-uboot-ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be.tar.gz blackbird-obmc-uboot-ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/socfpga_arria5_socdk.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socrates.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts index 9ac48a1683..726505821f 100644 --- a/arch/arm/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/dts/socfpga_arria5_socdk.dts @@ -21,7 +21,7 @@ }; aliases { - /* this allow the ethaddr uboot environmnet variable contents + /* this allow the ethaddr uboot environment variable contents * to be added to the gmac1 device tree blob. */ ethernet0 = &gmac1; diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index da134354d1..d4df1a14da 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -21,7 +21,7 @@ }; aliases { - /* this allow the ethaddr uboot environmnet variable contents + /* this allow the ethaddr uboot environment variable contents * to be added to the gmac1 device tree blob. */ ethernet0 = &gmac1; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index 591d96c412..d2ab3b3669 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -15,6 +15,11 @@ }; aliases { + /* + * This allows the ethaddr uboot environment variable + * contents to be added to the gmac1 device tree blob. + */ + ethernet0 = &gmac1; udc0 = &usb1; }; diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts index 32c6aad30d..739bbb7f3d 100644 --- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts +++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts @@ -16,7 +16,7 @@ aliases { /* - * This allows the ethaddr uboot environmnet variable + * This allows the ethaddr uboot environment variable * contents to be added to the gmac1 device tree blob. */ ethernet0 = &gmac1; |
