Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into...

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

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4686b89..0a91784 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -19,7 +19,6 @@
 /*
  * Environment settings
  */
-#define        CONFIG_SYS_MALLOC_LEN           (128 * 1024)
 #define        CONFIG_BOOTCOMMAND                                              \
        "if fatload mmc 0 0xa0000000 uImage; then "                     \
                "bootm 0xa0000000; "                                    \
@@ -41,11 +40,10 @@
  */
 
 /* I2C support */
-#ifdef CONFIG_SYS_I2C
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
 #define CONFIG_SYS_I2C_PXA
 #define CONFIG_PXA_STD_I2C
 #define CONFIG_PXA_PWR_I2C
-#define CONFIG_SYS_I2C_SPEED           100000
 #endif
 
 /* LCD support */
@@ -69,8 +67,6 @@
 #define        CONFIG_BOOTP_BOOTFILESIZE
 #endif
 
-#define        CONFIG_SYS_DEVICE_NULLDEV       1
-
 /*
  * Clock Configuration
  */
@@ -85,7 +81,6 @@
 #define        CONFIG_SYS_DRAM_BASE            0xa0000000      /* CS0 */
 #define        CONFIG_SYS_DRAM_SIZE            0x04000000      /* 64 MB DRAM */
 
-#define        CONFIG_SYS_LOAD_ADDR            PHYS_SDRAM_1
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define        CONFIG_SYS_INIT_SP_ADDR         0x5c010000