diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-27 15:49:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-27 20:34:12 -0400 |
| commit | e4a94ce4ac77396b181663c0493c50bc2d5b9143 (patch) | |
| tree | 7564e2d5e7e24841a763460f7eaf91409abd0312 /configs/odroid-c2_defconfig | |
| parent | 378f9134eba4665ea94a63653393d25418665fda (diff) | |
| parent | 3c27b6ad540828c44a62d209030df5ba86896df0 (diff) | |
| download | u-boot-e4a94ce4ac77396b181663c0493c50bc2d5b9143.tar.gz | |
Merge git://git.denx.de/u-boot-dm
For odroid-c2 (arch-meson) for now disable designware eth as meson
now needs to do some harder GPIO work.
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
lib/efi_loader/efi_disk.c
Modified:
configs/odroid-c2_defconfig
Diffstat (limited to 'configs/odroid-c2_defconfig')
| -rw-r--r-- | configs/odroid-c2_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index a771b20f5f..483d4900b7 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2" CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_ETH=y -CONFIG_ETH_DESIGNWARE=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_MESON=y CONFIG_DEBUG_UART_BASE=0xc81004c0 |