diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-05-15 10:27:32 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-05-15 10:27:32 +0200 |
| commit | e7f9350525d73233d4eaf1793f8fe618e9fd4910 (patch) | |
| tree | 153366c61e17af4ecdd9f10be520f707d525157d /include/configs/microblaze-generic.h | |
| parent | 50c8d66d33651d7fca6a082a1eea6e537401a2f4 (diff) | |
| parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
| download | u-boot-imx-e7f9350525d73233d4eaf1793f8fe618e9fd4910.zip u-boot-imx-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.gz u-boot-imx-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/microblaze-generic.h')
| -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 |