]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - include/configs/actux2.h
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
[karo-tx-uboot.git] / include / configs / actux2.h
index a3f5a4a43cb7b8b39ab82ac56a5ab99c2559418c..f0cbff79cae0101ec175153a9f51577b49b9804e 100644 (file)
@@ -4,23 +4,7 @@
  *
  * Configuration settings for the AcTux-2 board.
  *
- * 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+
  */
 
 #ifndef __CONFIG_H
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX2                  1
 
+#define        CONFIG_MACH_TYPE                1480
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 
-#define CFG_IXP425_CONSOLE             IXP425_UART2
+#define CONFIG_IXP_SERIAL
+#define CONFIG_SYS_IXP425_CONSOLE              IXP425_UART2
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTDELAY               5
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
+#define CONFIG_BOARD_EARLY_INIT_F      1
+#define CONFIG_SYS_LDSCRIPT    "board/actux2/u-boot.lds"
 
 /***************************************************************
  * U-boot generic defines start here.
  ***************************************************************/
-#undef CONFIG_USE_IRQ
-
 /* Size of malloc() pool */
-#define CFG_MALLOC_LEN                 (CONFIG_ENV_SIZE + 128*1024)
-/* size in bytes reserved for initial data */
-#define CFG_GBL_DATA_SIZE              128
+#define CONFIG_SYS_MALLOC_LEN                  (CONFIG_ENV_SIZE + 128*1024)
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
 #if defined(CONFIG_CMD_KGDB)
 # define CONFIG_KGDB_BAUDRATE          230400
-/* which serial port to use */
-# define CONFIG_KGDB_SER_INDEX         1
 #endif
 
 /* Miscellaneous configurable options */
-#define CFG_LONGHELP
-#define CFG_PROMPT                     "=> "
+#define CONFIG_SYS_LONGHELP
 /* Console I/O Buffer Size */
-#define CFG_CBSIZE                     256
+#define CONFIG_SYS_CBSIZE                      256
 /* Print Buffer Size */
-#define CFG_PBSIZE                     (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)
+#define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 /* max number of command args */
-#define CFG_MAXARGS                    16
+#define CONFIG_SYS_MAXARGS                     16
 /* Boot Argument Buffer Size */
-#define CFG_BARGSIZE                   CFG_CBSIZE
+#define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
 
-#define CFG_MEMTEST_START              0x00400000
-#define CFG_MEMTEST_END                        0x00800000
+#define CONFIG_SYS_MEMTEST_START               0x00400000
+#define CONFIG_SYS_MEMTEST_END                 0x00800000
 
-/* everything, incl board info, in Hz */
-#undef  CFG_CLKS_IN_HZ
-/* spec says 66.666 MHz, but it appears to be 33 */
-#define CFG_HZ                         3333333
+/* timer clock - 2* OSC_IN system clock */
+#define CONFIG_IXP425_TIMER_CLK                 66666666
 
 /* default load address */
-#define CFG_LOAD_ADDR                  0x00010000
+#define CONFIG_SYS_LOAD_ADDR                   0x00010000
 
 /* valid baudrates */
-#define CFG_BAUDRATE_TABLE             { 9600, 19200, 38400, 57600, \
+#define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, 57600, \
                                          115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE       1
 
-/*
- * Stack sizes
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE               (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-# define CONFIG_STACKSIZE_IRQ          (4*1024)        /* IRQ stack */
-# define CONFIG_STACKSIZE_FIQ          (4*1024)        /* FIQ stack */
-#endif
-
 /* Expansion bus settings */
-#define CFG_EXP_CS0                    0xbd113042
+#define CONFIG_SYS_EXP_CS0                     0xbd113042
 
 /* SDRAM settings */
 #define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM_1                   0x00000000
-#define CFG_DRAM_BASE                  0x00000000
+#define CONFIG_SYS_SDRAM_BASE                  0x00000000
 
 /* 16MB SDRAM */
-#define CFG_SDR_CONFIG                 0x3A
+#define CONFIG_SYS_SDR_CONFIG                  0x3A
 #define PHYS_SDRAM_1_SIZE              0x01000000
-#define CFG_SDRAM_REFRESH_CNT          0x81a
-#define CFG_SDR_MODE_CONFIG            0x1
-#define CFG_DRAM_SIZE                  0x01000000
+#define CONFIG_SYS_SDRAM_REFRESH_CNT           0x81a
+#define CONFIG_SYS_SDR_MODE_CONFIG             0x1
+#define CONFIG_SYS_DRAM_SIZE                   0x01000000
 
 /* FLASH organization */
-#define CFG_MAX_FLASH_BANKS            1
+#define CONFIG_SYS_TEXT_BASE           0x50000000
+#define CONFIG_SYS_MAX_FLASH_BANKS             1
 /* max number of sectors on one chip */
-#define CFG_MAX_FLASH_SECT             140
+#define CONFIG_SYS_MAX_FLASH_SECT              140
 #define PHYS_FLASH_1                   0x50000000
-#define CFG_FLASH_BANKS_LIST           { PHYS_FLASH_1 }
+#define CONFIG_SYS_FLASH_BANKS_LIST            { PHYS_FLASH_1 }
 
-#define CFG_FLASH_BASE                 PHYS_FLASH_1
-#define CFG_MONITOR_BASE               PHYS_FLASH_1
-#define CFG_MONITOR_LEN                        (256 << 10)
+#define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
+#define CONFIG_SYS_MONITOR_BASE                PHYS_FLASH_1
+#define CONFIG_SYS_MONITOR_LEN                 (256 << 10)
+#define CONFIG_BOARD_SIZE_LIMIT                        262144
 
 /* Use common CFI driver */
-#define CFG_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI
 #define CONFIG_FLASH_CFI_DRIVER
 /* no byte writes on IXP4xx */
-#define CFG_FLASH_CFI_WIDTH            FLASH_CFI_16BIT
+#define CONFIG_SYS_FLASH_CFI_WIDTH             FLASH_CFI_16BIT
 
 /* print 'E' for empty sector on flinfo */
-#define CFG_FLASH_EMPTY_INFO
+#define CONFIG_SYS_FLASH_EMPTY_INFO
 
 /* Ethernet */
 
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
-/* use separate flash sector with ucode images */
-#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE       0x50040000
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY address */
 #define        CONFIG_PHY_ADDR                 0x00
 /* MII PHY management */
 #define CONFIG_MII                     1
+/* fixed-speed switch without standard PHY registers on MII */
+#define CONFIG_MII_NPE0_FIXEDLINK       1
+#define CONFIG_MII_NPE0_SPEED           100
+#define CONFIG_MII_NPE0_FULLDUPLEX      1
+
 /* Number of ethernet rx buffers & descriptors */
-#define CFG_RX_ETH_BUFFER              16
+#define CONFIG_SYS_RX_ETH_BUFFER               16
 #define CONFIG_RESET_PHY_R             1
 /* ethernet switch connected to MII port */
 #define CONFIG_MII_ETHSWITCH           1
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Cache Configuration */
-#define CFG_CACHELINE_SIZE             32
+#define CONFIG_SYS_CACHELINE_SIZE              32
 
 /*
  * environment organization:
 #define        CONFIG_ENV_IS_IN_FLASH          1
 #define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x4000)
-#define CFG_USE_PPCENV                 1
+#define CONFIG_SYS_USE_PPCENV                  1
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       "npe_ucode=50040000\0"                                          \
        "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
        "kerneladdr=50050000\0"                                         \
+       "kernelfile=actux2/uImage\0"                                    \
+       "rootfile=actux2/rootfs\0"                                      \
        "rootaddr=50170000\0"                                           \
        "loadaddr=10000\0"                                              \
        "updateboot_ser=mw.b 10000 ff 40000;"                           \
        " loady ${loadaddr};"                                           \
        " run eraseboot writeboot\0"                                    \
        "updateboot_net=mw.b 10000 ff 40000;"                           \
-       " tftp ${loadaddr} u-boot.bin;"                                 \
+       " tftp ${loadaddr} actux2/u-boot.bin;"                          \
        " run eraseboot writeboot\0"                                    \
        "eraseboot=protect off 50000000 50003fff;"                      \
        " protect off 50006000 5003ffff;"                               \
        " erase 50006000 5003ffff\0"                                    \
        "writeboot=cp.b 10000 50000000 4000;"                           \
        " cp.b 16000 50006000 3a000\0"                                  \
-       "eraseenv=protect off 50004000 50005fff;"                       \
-       " erase 50004000 50005fff\0"                                    \
+       "updateucode=loady;"                                            \
+       " era ${npe_ucode} +${filesize};"                               \
+       " cp.b ${loadaddr} ${npe_ucode} ${filesize}\0"                  \
        "updateroot=tftp ${loadaddr} ${rootfile};"                      \
        " era ${rootaddr} +${filesize};"                                \
        " cp.b ${loadaddr} ${rootaddr} ${filesize}\0"                   \
        " tftpboot ${loadaddr} ${kernelfile};"                          \
        " bootm\0"
 
+/* additions for new relocation code, must be added to all boards */
+#define CONFIG_SYS_INIT_SP_ADDR                                                \
+       (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
+
 #endif /* __CONFIG_H */