diff options
author | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
commit | 40253dd12a64086885097d253b665c9876635e76 (patch) | |
tree | ab93904ec84b33c1e9336baa8eae710dd957683f /include/configs/bf609-ezkit.h | |
parent | 8182b41994f0b1824c31652d64171ffa596517fc (diff) | |
parent | e662573822d24dcdc079d29ff397cb8bacf97b27 (diff) | |
download | blackbird-obmc-uboot-40253dd12a64086885097d253b665c9876635e76.tar.gz blackbird-obmc-uboot-40253dd12a64086885097d253b665c9876635e76.zip |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
include/configs/axs101.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/bf609-ezkit.h')
-rw-r--r-- | include/configs/bf609-ezkit.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 0e353b9941..b5d4847523 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -75,7 +75,6 @@ #define CONFIG_DW_ALTDESCRIPTOR #define CONFIG_CMD_MII #define CONFIG_MII -#define CONFIG_PHYLIB /* i2c Settings */ #define CONFIG_SYS_I2C |