]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - include/configs/colibri_pxa270.h
xtensa: clean up CONFIG_SYS_TEXT_ADDR
[people/ms/u-boot.git] / include / configs / colibri_pxa270.h
index 08bd276b440a9f9d59d3d58c8c404decd969b2b2..f3d15611609dfa2dd4db2ef4af04f653c6698f29 100644 (file)
@@ -2,68 +2,73 @@
  * Toradex Colibri PXA270 configuration file
  *
  * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
+ * Copyright (C) 2015-2016 Marcel Ziswiler <marcel@ziswiler.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef        __CONFIG_H
+#define        __CONFIG_H
 
 /*
  * High Level Board Configuration Options
  */
 #define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
-#define        CONFIG_SYS_TEXT_BASE            0x0
+/* Avoid overwriting factory configuration block */
+#define CONFIG_BOARD_SIZE_LIMIT                0x40000
+
+/* We will never enable dcache because we have to setup MMU first */
+#define CONFIG_SYS_DCACHE_OFF
+
+#define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
 
 /*
  * Environment settings
  */
 #define        CONFIG_ENV_OVERWRITE
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define        CONFIG_SYS_MALLOC_LEN           (128 * 1024)
 #define        CONFIG_ARCH_CPU_INIT
 #define        CONFIG_BOOTCOMMAND                                              \
-       "if mmc init && fatload mmc 0 0xa0000000 uImage; then "         \
+       "if fatload mmc 0 0xa0000000 uImage; then "                     \
                "bootm 0xa0000000; "                                    \
        "fi; "                                                          \
        "if usb reset && fatload usb 0 0xa0000000 uImage; then "        \
                "bootm 0xa0000000; "                                    \
        "fi; "                                                          \
-       "bootm 0x80000;"
-#define        CONFIG_BOOTARGS                 "console=tty0 console=ttyS0,115200"
+       "bootm 0xc0000;"
 #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
  */
-#include <config_cmd_default.h>
 
-#define        CONFIG_CMD_NET
-#define        CONFIG_CMD_ENV
-#undef CONFIG_CMD_IMLS
-#define        CONFIG_CMD_MMC
-#define        CONFIG_CMD_USB
-#define        CONFIG_CMD_FLASH
+/* 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
- *  chip on the Voipac PXA270 board
  */
 #ifdef CONFIG_CMD_NET
-#define        CONFIG_CMD_PING
-#define        CONFIG_CMD_DHCP
 
 #define        CONFIG_DRIVER_DM9000            1
 #define CONFIG_DM9000_BASE             0x08000000
 #define        CONFIG_BOOTP_HOSTNAME
 #endif
 
-/*
- * HUSH Shell Configuration
- */
-#define        CONFIG_SYS_HUSH_PARSER          1
-
-#define        CONFIG_SYS_LONGHELP
-#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
+#undef CONFIG_SYS_LONGHELP             /* Saves 10 KB */
 #define        CONFIG_SYS_DEVICE_NULLDEV       1
-#define        CONFIG_CMDLINE_EDITING          1
-#define        CONFIG_AUTO_COMPLETE            1
-
+#undef CONFIG_CMDLINE_EDITING          /* Saves 2.5 KB */
+#undef CONFIG_AUTO_COMPLETE            /* Saves 2.5 KB */
 
 /*
  * Clock Configuration
  */
 #ifdef CONFIG_CMD_FLASH
 #define        PHYS_FLASH_1                    0x00000000      /* Flash Bank #1 */
+#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)
 #define        CONFIG_SYS_MAX_FLASH_BANKS      1
 
 #define        CONFIG_SYS_FLASH_ERASE_TOUT     (25 * CONFIG_SYS_HZ)
 #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_SYS_ENV_IS_NOWHERE
 #endif
 
 #define        CONFIG_SYS_MONITOR_BASE         0x0
-#define        CONFIG_SYS_MONITOR_LEN          0x80000
+#define        CONFIG_SYS_MONITOR_LEN          0x40000
 
+/* Skip factory configuration block */
 #define        CONFIG_ENV_ADDR                 \
-                       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
+                       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN + 0x40000)
 #define        CONFIG_ENV_SIZE                 0x40000
 #define        CONFIG_ENV_SECT_SIZE            0x40000
-#define CONFIG_ENV_ADDR_REDUND         (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         (CONFIG_ENV_SIZE)
 
 /*
  * GPIO settings
  */
 #define        CONFIG_SYS_GPSR0_VAL    0x00000000
 #define        CONFIG_SYS_GPSR1_VAL    0x00020000
-#define        CONFIG_SYS_GPSR2_VAL    0x0002C000
+#define        CONFIG_SYS_GPSR2_VAL    0x0002c000
 #define        CONFIG_SYS_GPSR3_VAL    0x00000000
 
 #define        CONFIG_SYS_GPCR0_VAL    0x00000000
 #define        CONFIG_SYS_GPCR2_VAL    0x00000000
 #define        CONFIG_SYS_GPCR3_VAL    0x00000000
 
-#define        CONFIG_SYS_GPDR0_VAL    0x08000000
-#define        CONFIG_SYS_GPDR1_VAL    0x0002A981
-#define        CONFIG_SYS_GPDR2_VAL    0x0202FC00
-#define        CONFIG_SYS_GPDR3_VAL    0x00000000
+#define        CONFIG_SYS_GPDR0_VAL    0xc8008000
+#define        CONFIG_SYS_GPDR1_VAL    0xfc02a981
+#define        CONFIG_SYS_GPDR2_VAL    0x92c3ffff
+#define        CONFIG_SYS_GPDR3_VAL    0x0061e804
 
-#define        CONFIG_SYS_GAFR0_L_VAL  0x00100000
-#define        CONFIG_SYS_GAFR0_U_VAL  0x00C00010
-#define        CONFIG_SYS_GAFR1_L_VAL  0x999A901A
-#define        CONFIG_SYS_GAFR1_U_VAL  0xAAA00008
-#define        CONFIG_SYS_GAFR2_L_VAL  0xAAAAAAAA
-#define        CONFIG_SYS_GAFR2_U_VAL  0x0109A000
-#define        CONFIG_SYS_GAFR3_L_VAL  0x54000300
-#define        CONFIG_SYS_GAFR3_U_VAL  0x00024001
+#define        CONFIG_SYS_GAFR0_L_VAL  0x80100000
+#define        CONFIG_SYS_GAFR0_U_VAL  0xa5c00010
+#define        CONFIG_SYS_GAFR1_L_VAL  0x6992901a
+#define        CONFIG_SYS_GAFR1_U_VAL  0xaaa50008
+#define        CONFIG_SYS_GAFR2_L_VAL  0xaaaaaaaa
+#define        CONFIG_SYS_GAFR2_U_VAL  0x4109a002
+#define        CONFIG_SYS_GAFR3_L_VAL  0x54000310
+#define        CONFIG_SYS_GAFR3_U_VAL  0x00005401
 
 #define        CONFIG_SYS_PSSR_VAL     0x30
 
 /*
  * Memory settings
  */
-#define        CONFIG_SYS_MSC0_VAL     0x000095f2
-#define        CONFIG_SYS_MSC1_VAL     0x00007ff4
-#define        CONFIG_SYS_MSC2_VAL     0x00000000
-#define        CONFIG_SYS_MDCNFG_VAL   0x08000ac9
-#define        CONFIG_SYS_MDREFR_VAL   0x2013e01e
-#define        CONFIG_SYS_MDMRS_VAL    0x00320032
-#define        CONFIG_SYS_FLYCNFG_VAL  0x00000000
+#define        CONFIG_SYS_MSC0_VAL     0x9ee1c5f2
+#define        CONFIG_SYS_MSC1_VAL     0x9ee1f994
+#define        CONFIG_SYS_MSC2_VAL     0x9ee19ee1
+#define        CONFIG_SYS_MDCNFG_VAL   0x090009c9
+#define        CONFIG_SYS_MDREFR_VAL   0x2003a031
+#define        CONFIG_SYS_MDMRS_VAL    0x00220022
+#define        CONFIG_SYS_FLYCNFG_VAL  0x00010001
 #define        CONFIG_SYS_SXCNFG_VAL   0x40044004
 
 /*
  * PCMCIA and CF Interfaces
  */
-#define        CONFIG_SYS_MECR_VAL     0x00000001
-#define        CONFIG_SYS_MCMEM0_VAL   0x00014307
+#define        CONFIG_SYS_MECR_VAL     0x00000000
+#define        CONFIG_SYS_MCMEM0_VAL   0x00028307
 #define        CONFIG_SYS_MCMEM1_VAL   0x00014307
-#define        CONFIG_SYS_MCATT0_VAL   0x0001c787
+#define        CONFIG_SYS_MCATT0_VAL   0x00038787
 #define        CONFIG_SYS_MCATT1_VAL   0x0001c787
-#define        CONFIG_SYS_MCIO0_VAL    0x0001430f
+#define        CONFIG_SYS_MCIO0_VAL    0x0002830f
 #define        CONFIG_SYS_MCIO1_VAL    0x0001430f
 
 #include "pxa-common.h"
 
-#endif /* __CONFIG_H */
+#endif /* __CONFIG_H */