diff options
| author | Tom Rini <trini@ti.com> | 2014-05-06 14:55:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-06 14:55:27 -0400 |
| commit | 33b0f7b5e6665aa77ece288392774b8026a15660 (patch) | |
| tree | 482624854a899cda934a3dc8271e30386fa77547 /include | |
| parent | a1a1f6e938a9de13c353064ba80eb705ba7422e9 (diff) | |
| parent | d1d37b5cab119096bb60c686eff7ea39cfebed25 (diff) | |
| download | u-boot-imx-33b0f7b5e6665aa77ece288392774b8026a15660.zip u-boot-imx-33b0f7b5e6665aa77ece288392774b8026a15660.tar.gz u-boot-imx-33b0f7b5e6665aa77ece288392774b8026a15660.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/microblaze-generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 486787e..06b7e94 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -71,7 +71,7 @@ /* ethernet */ #undef CONFIG_SYS_ENET -#if defined(XILINX_EMACLITE_BASEADDR) +#if defined(XILINX_EMACLITE_BASEADDR) || defined(CONFIG_OF_CONTROL) # define CONFIG_XILINX_EMACLITE 1 # define CONFIG_SYS_ENET #endif |