diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-06 22:46:38 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-06 22:46:38 +0300 |
commit | 6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch) | |
tree | 3c560d567a76e9850e0195fb892d7e1fbaeed198 /include/configs/ti_am335x_common.h | |
parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
download | u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.xz |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'include/configs/ti_am335x_common.h')
-rw-r--r-- | include/configs/ti_am335x_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 19e1e2249e..4b3981b9b0 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -27,7 +27,6 @@ #ifndef CONFIG_SPL_BUILD /* Network defines. */ -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #endif |