diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-02 16:00:10 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-02 16:00:10 +0100 |
| commit | 77524d2c9d81e97c54e704b65c8a02e4bec0f441 (patch) | |
| tree | 59a4ec271a84c57b4b5127d81ac97ea176ebff85 /include/configs/snapper9260.h | |
| parent | d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2 (diff) | |
| parent | d07e2b598a690d6eb75019b379fc4933affe3d2c (diff) | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/snapper9260.h')
| -rw-r--r-- | include/configs/snapper9260.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 5436bae15e..94a65c4d01 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -59,6 +59,7 @@ #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_RESET_PHY_R +#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_TFTP_PORT #define CONFIG_TFTP_TSIZE @@ -74,7 +75,6 @@ #define CONFIG_USB_STORAGE /* GPIOs and IO expander */ -#define CONFIG_AT91_LEGACY #define CONFIG_ATMEL_LEGACY #define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO_PULLUP 1 |