diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-13 20:58:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-13 20:58:49 -0500 |
| commit | 85432c69da37144c2ae7b7e5539a142b218cdc81 (patch) | |
| tree | 98b06f362e50134c6763380f2c0196f7938d1d97 /include | |
| parent | f39abbbc531eb7b246d83dbb765e65afcc0989f8 (diff) | |
| parent | 7da4fb9235dd242036bed16c9ea6ad07b60b7ba1 (diff) | |
Merge branch '2019-12-13-master-imports'
- Assorted minor fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index 8b37b58747..52c02185f4 100644 --- a/include/common.h +++ b/include/common.h @@ -15,7 +15,6 @@ #ifndef __ASSEMBLY__ /* put C only stuff in this section */ -typedef unsigned char uchar; typedef volatile unsigned long vu_long; typedef volatile unsigned short vu_short; typedef volatile unsigned char vu_char; diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 844d2688d9..fbe431b9c9 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -63,10 +63,8 @@ #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ -#define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_PHY_TI /* * Default to using SPI for environment, etc. |