diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-03-20 22:04:29 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-03-20 22:04:29 +0100 |
| commit | 312a6c016a2d81aa3fbc605f5c0c315b6a4e3464 (patch) | |
| tree | 3b7675802858da0878f6d8713b4d032696a96880 /include/configs/mx7_common.h | |
| parent | e4fb863f6dec0002069d57422ebe3ce3af69a273 (diff) | |
| parent | e25a0656bac63c5fcd20ef4313dc09c409fc512d (diff) | |
Merge branch 'next'
Diffstat (limited to 'include/configs/mx7_common.h')
| -rw-r--r-- | include/configs/mx7_common.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index a627456d93..dcc53f0f53 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -27,7 +27,6 @@ /* Enable iomux-lpsr support */ #define CONFIG_IOMUX_LPSR -#define CONFIG_IMX_FIXED_IVT_OFFSET /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) @@ -38,8 +37,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_FSL_CLK - #define CONFIG_LOADADDR 0x80800000 #define CONFIG_SYS_TEXT_BASE 0x87800000 @@ -79,7 +76,6 @@ /* UART */ #define CONFIG_MXC_UART -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* MMC */ #define CONFIG_MMC |