Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / include / configs / tqma6.h

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 895cd03..1efe9d5 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -9,6 +9,8 @@
 #define __CONFIG_H
 
 #include <linux/kconfig.h>
+#include <linux/stringify.h>
+
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
 /* common IMX6 SPL configuration */
@@ -34,17 +36,12 @@
 
 /* I2C Configs */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_SPEED           100000
 
 /* I2C EEPROM (M24C64) */
-#define CONFIG_SYS_I2C_EEPROM_ADDR                     0x50
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                 2
 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS          5 /* 32 Bytes */
 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS      20
 
 #if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 #define TQMA6_PFUZE100_I2C_BUS         2
@@ -63,17 +60,12 @@
 
 #define CONFIG_ARP_TIMEOUT             200UL
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * SZ_1M)
-
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
 #define TQMA6_UBOOT_OFFSET             SZ_1K
 #define TQMA6_UBOOT_SECTOR_START       0x2
 #define TQMA6_UBOOT_SECTOR_COUNT       0x7fe
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #define TQMA6_FDT_OFFSET               (2 * SZ_1M)
 #define TQMA6_FDT_SECTOR_START         0x1000
 #define TQMA6_FDT_SECTOR_COUNT         0x800