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/controlcenterdc.h | |
| parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
| parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'include/configs/controlcenterdc.h')
| -rw-r--r-- | include/configs/controlcenterdc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 00e5c8f794..0c36ea6610 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -112,8 +112,6 @@ */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 - #define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "ccdc.img" |