diff options
author | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 |
commit | 9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch) | |
tree | 40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /include/configs/ads5121.h | |
parent | 1c7015100a620582224f25eb057573a0fe147648 (diff) | |
parent | cd82919e6c8a73b363a26f34b734923844e52d1c (diff) | |
download | u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.gz u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'include/configs/ads5121.h')
-rw-r--r-- | include/configs/ads5121.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index f104e68..091da80 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -308,6 +308,7 @@ #define CONFIG_PHY_ADDR 0x1 #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_FEC_AN_TIMEOUT 1 +#define CONFIG_HAS_ETH0 /* * Configure on-board RTC @@ -478,10 +479,10 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_OF_SUPPORT_OLD_DEVICE_TREES 1 #define OF_CPU "PowerPC,5121@0" -#define OF_SOC "soc@80000000" -#define OF_SOC_OLD "soc5121@80000000" +#define OF_SOC_COMPAT "fsl,mpc5121-immr" #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc@80000000/serial@11300" |