diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabresd.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index a2ab77a..6f5d69b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -201,7 +201,7 @@ #define CONFIG_ENV_IS_IN_MMC #if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_ENV_OFFSET (768 * 1024) +#define CONFIG_ENV_OFFSET (896 * 1024) #endif /* Framebuffer */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 598ab9a..824f29d 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -48,18 +48,23 @@ #endif /* I2C Configs */ +#ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C +#endif +#ifdef CONFIG_CMD_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 +#endif -/* PMIC */ +#ifndef CONFIG_DM_PMIC #define CONFIG_POWER #define CONFIG_POWER_I2C #define CONFIG_POWER_PFUZE100 -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#endif /* USB Configs */ #ifdef CONFIG_CMD_USB |