apalis/colibri imx6: provide proper fdtfile value

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

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 722ff525f538b45754f12bd586a4a12f2394d1de..d4802f9914c8d32e70925847abd79944c2c469ec 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Toradex Colibri PXA270 configuration file
  *
  * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- * Copyright (C) 2015 Marcel Ziswiler <marcel@ziswiler.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2015-2016 Marcel Ziswiler <marcel@ziswiler.com>
  */
 
 #ifndef        __CONFIG_H
@@ -14,8 +13,6 @@
  * High Level Board Configuration Options
  */
 #define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
-#define CONFIG_SYS_GENERIC_BOARD
-#define        CONFIG_SYS_TEXT_BASE            0x0
 /* Avoid overwriting factory configuration block */
 #define CONFIG_BOARD_SIZE_LIMIT                0x40000
 
@@ -33,35 +30,37 @@
                "bootm 0xa0000000; "                                    \
        "fi; "                                                          \
        "bootm 0xc0000;"
-#define        CONFIG_BOOTARGS                 "console=tty0 console=ttyS0,115200"
 #define        CONFIG_TIMESTAMP
-#define        CONFIG_BOOTDELAY                2       /* Autoboot delay */
 #define        CONFIG_CMDLINE_TAG
 #define        CONFIG_SETUP_MEMORY_TAGS
-#define        CONFIG_LZMA                     /* LZMA compression support */
-#define        CONFIG_OF_LIBFDT
 
 /*
  * Serial Console Configuration
  */
-#define        CONFIG_PXA_SERIAL
-#define        CONFIG_FFUART                   1
-#define CONFIG_CONS_INDEX              3
-#define        CONFIG_BAUDRATE                 115200
 
 /*
  * Bootloader Components Configuration
  */
-#define        CONFIG_CMD_ENV
-#define        CONFIG_CMD_MMC
-#define        CONFIG_CMD_USB
+
+/* I2C support */
+#ifdef CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_PXA
+#define CONFIG_PXA_STD_I2C
+#define CONFIG_PXA_PWR_I2C
+#define CONFIG_SYS_I2C_SPEED           100000
+#endif
+
+/* LCD support */
+#ifdef CONFIG_LCD
+#define CONFIG_PXA_LCD
+#define CONFIG_PXA_VGA
+#define CONFIG_LCD_LOGO
+#endif
 
 /*
  * Networking Configuration
  */
 #ifdef CONFIG_CMD_NET
-#define        CONFIG_CMD_PING
-#define        CONFIG_CMD_DHCP
 
 #define        CONFIG_DRIVER_DM9000            1
 #define CONFIG_DM9000_BASE             0x08000000
@@ -70,30 +69,9 @@
 #define        CONFIG_NET_RETRY_COUNT          10
 
 #define        CONFIG_BOOTP_BOOTFILESIZE
-#define        CONFIG_BOOTP_BOOTPATH
-#define        CONFIG_BOOTP_GATEWAY
-#define        CONFIG_BOOTP_HOSTNAME
 #endif
 
-/*
- * HUSH Shell Configuration
- */
-#define        CONFIG_SYS_HUSH_PARSER          1
-
-#undef CONFIG_SYS_LONGHELP             /* Saves 10 KB */
-#undef CONFIG_SYS_PROMPT
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT               "$ "
-#else
-#endif
-#define        CONFIG_SYS_CBSIZE               256
-#define        CONFIG_SYS_PBSIZE               \
-       (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define        CONFIG_SYS_MAXARGS              16
-#define        CONFIG_SYS_BARGSIZE             CONFIG_SYS_CBSIZE
 #define        CONFIG_SYS_DEVICE_NULLDEV       1
-#define        CONFIG_CMDLINE_EDITING          1
-#define        CONFIG_AUTO_COMPLETE            1
 
 /*
  * Clock Configuration
@@ -103,7 +81,6 @@
 /*
  * DRAM Map
  */
-#define        CONFIG_NR_DRAM_BANKS            1               /* We have 1 bank of DRAM */
 #define        PHYS_SDRAM_1                    0xa0000000      /* SDRAM Bank #1 */
 #define        PHYS_SDRAM_1_SIZE               0x04000000      /* 64 MB */
 
@@ -125,8 +102,6 @@
 #define        PHYS_FLASH_SIZE                 0x02000000      /* 32 MB */
 #define        CONFIG_SYS_FLASH_BASE           PHYS_FLASH_1
 
-#define        CONFIG_SYS_FLASH_CFI
-#define        CONFIG_FLASH_CFI_DRIVER         1
 #define        CONFIG_SYS_FLASH_CFI_WIDTH      FLASH_CFI_32BIT
 
 #define        CONFIG_SYS_MAX_FLASH_SECT       (4 + 255)
@@ -136,15 +111,6 @@
 #define        CONFIG_SYS_FLASH_WRITE_TOUT     (25 * CONFIG_SYS_HZ)
 #define        CONFIG_SYS_FLASH_LOCK_TOUT      (25 * CONFIG_SYS_HZ)
 #define        CONFIG_SYS_FLASH_UNLOCK_TOUT    (25 * CONFIG_SYS_HZ)
-
-#define        CONFIG_SYS_FLASH_USE_BUFFER_WRITE       1
-#define        CONFIG_SYS_FLASH_PROTECTION             1
-
-#define CONFIG_ENV_IS_IN_FLASH         1
-
-#else  /* No flash */
-#define        CONFIG_SYS_NO_FLASH
-#define        CONFIG_ENV_IS_NOWHERE
 #endif
 
 #define        CONFIG_SYS_MONITOR_BASE         0x0