diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 10:17:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 11:19:00 -0400 |
| commit | 1622559066d890f1b7622be0ede8a5d64de66ef3 (patch) | |
| tree | 3d7a01ff07bff410c6650eae19b704cd0419c254 /include/configs/mx6slevk.h | |
| parent | 0342e335ba887817ed401e77be324e064ea7031e (diff) | |
| parent | f479cec3b623778c26b23f66dc28cf33100ce089 (diff) | |
| download | u-boot-1622559066d890f1b7622be0ede8a5d64de66ef3.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/mx6slevk.h')
| -rw-r--r-- | include/configs/mx6slevk.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index f35d1265b0..2fff7995ea 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -27,19 +27,12 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR /* I2C Configs */ -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_PFUZE100 -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 - #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -143,7 +136,7 @@ /* Environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#if defined CONFIG_SYS_BOOT_SPINOR +#if defined CONFIG_SPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) |