mx23evk: Set default environment to use zImage

[karo-tx-uboot.git] / include / configs / TQM834x.h

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index a7f11d3e96bee40bcf1dff530b4cafcefdd53b5f..15cf2bd793eb6620d3f673f110c128abedf2b51e 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -119,13 +103,12 @@
                                        | OR_GPCM_SCY_5 \
                                        | OR_GPCM_TRLX)
 
-#define CONFIG_SYS_PRELIM_OR_AM        0xc0000000      /* OR addr mask: 1 GiB */
+#define CONFIG_SYS_PRELIM_OR_AM                OR_AM_1GB /* OR addr mask: 1 GiB */
 
 #define CONFIG_SYS_OR0_PRELIM          (CONFIG_SYS_PRELIM_OR_AM  \
                                        | CONFIG_SYS_OR_TIMING_FLASH)
 
-                                       /* 1 GiB window size (2^(size + 1)) */
-#define CONFIG_SYS_LBLAWAR0_PRELIM     0x8000001D
+#define CONFIG_SYS_LBLAWAR0_PRELIM     (LBLAWAR_EN | LBLAWAR_1GB)
 
                                        /* Window base at flash base */
 #define CONFIG_SYS_LBLAWBAR0_PRELIM    CONFIG_SYS_FLASH_BASE
@@ -188,12 +171,11 @@
 /*
  * I2C
  */
-#define CONFIG_HARD_I2C                        /* I2C with hardware support */
-#undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
-#define CONFIG_FSL_I2C
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed: 400KHz */
-#define CONFIG_SYS_I2C_SLAVE           0x7F    /* slave address */
-#define CONFIG_SYS_I2C_OFFSET          0x3000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_FSL
+#define CONFIG_SYS_FSL_I2C_SPEED       400000
+#define CONFIG_SYS_FSL_I2C_SLAVE       0x7F
+#define CONFIG_SYS_FSL_I2C_OFFSET      0x3000
 
 /* I2C EEPROM, configuration for onboard EEPROMs 24C256 and 24C32 */
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x50    /* 1010000x */
@@ -334,15 +316,11 @@
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
-#define CONFIG_SYS_PROMPT      "=> "           /* Monitor Command Prompt */
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support */
 
 #define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
        #define CONFIG_SYS_CBSIZE       1024    /* Console I/O Buffer Size */
@@ -355,7 +333,6 @@
 #define CONFIG_SYS_MAXARGS     16      /* max number of command args */
                                /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_HZ          1000    /* decrementer freq: 1ms ticks */
 
 #undef CONFIG_WATCHDOG         /* watchdog disabled */
 
@@ -421,14 +398,14 @@
 
 /* DDR 0 - 512M */
 #define CONFIG_SYS_IBAT0L      (CONFIG_SYS_SDRAM_BASE \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT0U      (CONFIG_SYS_SDRAM_BASE \
                                | BATU_BL_256M \
                                | BATU_VS \
                                | BATU_VP)
 #define CONFIG_SYS_IBAT1L      (CONFIG_SYS_SDRAM_BASE + 0x10000000 \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT1U      (CONFIG_SYS_SDRAM_BASE + 0x10000000 \
                                | BATU_BL_256M \
@@ -437,7 +414,7 @@
 
 /* stack in DCACHE @ 512M (no backing mem) */
 #define CONFIG_SYS_IBAT2L      (CONFIG_SYS_INIT_RAM_ADDR \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT2U      (CONFIG_SYS_INIT_RAM_ADDR \
                                | BATU_BL_128K \
@@ -446,15 +423,16 @@
 
 /* PCI */
 #ifdef CONFIG_PCI
+#define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_SYS_IBAT3L      (CONFIG_SYS_PCI1_MEM_BASE \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT3U      (CONFIG_SYS_PCI1_MEM_BASE \
                                | BATU_BL_256M \
                                | BATU_VS \
                                | BATU_VP)
 #define CONFIG_SYS_IBAT4L      (CONFIG_SYS_PCI1_MMIO_BASE \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_MEMCOHERENCE \
                                | BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_IBAT4U      (CONFIG_SYS_PCI1_MMIO_BASE \
@@ -462,7 +440,7 @@
                                | BATU_VS \
                                | BATU_VP)
 #define CONFIG_SYS_IBAT5L      (CONFIG_SYS_PCI1_IO_BASE \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_CACHEINHIBIT \
                                | BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_IBAT5U      (CONFIG_SYS_PCI1_IO_BASE \
@@ -480,7 +458,7 @@
 
 /* IMMRBAR */
 #define CONFIG_SYS_IBAT6L      (CONFIG_SYS_IMMR \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_CACHEINHIBIT \
                                | BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_IBAT6U      (CONFIG_SYS_IMMR \
@@ -490,7 +468,7 @@
 
 /* FLASH */
 #define CONFIG_SYS_IBAT7L      (CONFIG_SYS_FLASH_BASE \
-                               | BATL_PP_10 \
+                               | BATL_PP_RW \
                                | BATL_CACHEINHIBIT \
                                | BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_IBAT7U      (CONFIG_SYS_FLASH_BASE \
@@ -517,7 +495,6 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
 /*