diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
| commit | 6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch) | |
| tree | 3c560d567a76e9850e0195fb892d7e1fbaeed198 /include/configs/siemens-am33x-common.h | |
| parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
| parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
| download | u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.zip u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.gz u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.bz2 | |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'include/configs/siemens-am33x-common.h')
| -rw-r--r-- | include/configs/siemens-am33x-common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index ed93117..d146ba5 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -171,7 +171,6 @@ */ #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 |