]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - include/configs/VoVPN-GW.h
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / include / configs / VoVPN-GW.h
index 14057847b82e655994a786d5a81648e9bd689f95..1ceef113d643fccc0dd63b793fcd9157a76e3236 100644 (file)
@@ -4,20 +4,7 @@
  *
  * Support for the Elmeg VoVPN Gateway Module
  *
- * 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
@@ -29,6 +16,8 @@
 /* define busmode: 8260 */
 #undef CONFIG_BUSMODE_60x
 
+#define        CONFIG_SYS_TEXT_BASE            0xfff00000
+
 /* system clock rate (CLKIN) - equal to the 60x and local bus speed */
 #ifdef CONFIG_CLKIN_66MHz
 #define        CONFIG_8260_CLKIN               66666666        /* in Hz */
 #define CONFIG_LOADS_ECHO              1
 
 /* don't allow baudrate change */
-#undef CFG_LOADS_BAUD_CHANGE
-
-/* supported baudrates */
-#define CFG_BAUDRATE_TABLE             { 9600, 19200, 38400, 57600, 115200 }
+#undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
 /*
  * select ethernet configuration
 #define        CONFIG_ETHER_INDEX              1
 
 /* Marvell Switch SMI base addr */
-#define CFG_PHY_ADDR                   0x10
+#define CONFIG_SYS_PHY_ADDR                    0x10
 
 /* FCC1 RMII REFCLK is CLK10 */
-#define CFG_CMXFCR_VALUE               CMXFCR_TF1CS_CLK10
-#define CFG_CMXFCR_MASK                        (CMXFCR_FC1|CMXFCR_TF1CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE                CMXFCR_TF1CS_CLK10
+#define CONFIG_SYS_CMXFCR_MASK                 (CMXFCR_FC1|CMXFCR_TF1CS_MSK)
 
 /* BDs and buffers on 60x bus */
-#define CFG_CPMFCR_RAMTYPE             0
+#define CONFIG_SYS_CPMFCR_RAMTYPE              0
 
 /* Local Protect, Full duplex, Flowcontrol, RMII */
-#define CFG_FCC_PSMR                   (FCC_PSMR_LPB|FCC_PSMR_FDE|\
+#define CONFIG_SYS_FCC_PSMR                    (FCC_PSMR_LPB|FCC_PSMR_FDE|\
                                         FCC_PSMR_FCE|FCC_PSMR_RMII)
 
 /* bit-bang MII PHY management */
 #define CONFIG_BITBANGMII
 
 #define MDIO_PORT                      1               /* Port B */
-#define CFG_MDIO_PIN                   0x00002000      /* PB18 */
-#define CFG_MDC_PIN                    0x00001000      /* PB19 */
-#define MDIO_ACTIVE                    (iop->pdir |=  CFG_MDIO_PIN)
-#define MDIO_TRISTATE                  (iop->pdir &= ~CFG_MDIO_PIN)
-#define MDIO_READ                      ((iop->pdat &  CFG_MDIO_PIN) != 0)
-#define MDIO(bit)                      if(bit) iop->pdat |=  CFG_MDIO_PIN; \
-                                       else    iop->pdat &= ~CFG_MDIO_PIN
-#define MDC(bit)                       if(bit) iop->pdat |=  CFG_MDC_PIN; \
-                                       else    iop->pdat &= ~CFG_MDC_PIN
+
+#define MDIO_DECLARE           volatile ioport_t *iop = ioport_addr ( \
+                                       (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT )
+#define MDC_DECLARE            MDIO_DECLARE
+
+#define CONFIG_SYS_MDIO_PIN                    0x00002000      /* PB18 */
+#define CONFIG_SYS_MDC_PIN                     0x00001000      /* PB19 */
+#define MDIO_ACTIVE                    (iop->pdir |=  CONFIG_SYS_MDIO_PIN)
+#define MDIO_TRISTATE                  (iop->pdir &= ~CONFIG_SYS_MDIO_PIN)
+#define MDIO_READ                      ((iop->pdat &  CONFIG_SYS_MDIO_PIN) != 0)
+#define MDIO(bit)                      if(bit) iop->pdat |=  CONFIG_SYS_MDIO_PIN; \
+                                       else    iop->pdat &= ~CONFIG_SYS_MDIO_PIN
+#define MDC(bit)                       if(bit) iop->pdat |=  CONFIG_SYS_MDC_PIN; \
+                                       else    iop->pdat &= ~CONFIG_SYS_MDC_PIN
 #define MIIDELAY                       udelay(1)
 
 #endif
  * Command line configuration.
  */
 
-#define CONFIG_CMD_AUTOSCRIPT
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IMLS
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_RUN
+#define CONFIG_CMD_SAVEENV
+#define CONFIG_CMD_SOURCE
 
 
 /*
  */
 
 /* undef to save memory */
-#define        CFG_LONGHELP
+#define        CONFIG_SYS_LONGHELP
 
 /* monitor command prompt */
-#define        CFG_PROMPT                      "=> "
 
 /* console i/o buffer size */
 #if defined(CONFIG_CMD_KGDB)
-#define        CFG_CBSIZE                      1024
+#define        CONFIG_SYS_CBSIZE                       1024
 #else
-#define        CFG_CBSIZE                      256
+#define        CONFIG_SYS_CBSIZE                       256
 #endif
 
 /* 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
 
 /* memtest works on */
-#define CFG_MEMTEST_START              0x00100000
+#define CONFIG_SYS_MEMTEST_START               0x00100000
 /* 1 ... 15 MB in DRAM */
-#define CFG_MEMTEST_END                        0x00f00000
+#define CONFIG_SYS_MEMTEST_END                 0x00f00000
 /* full featured memtest */
-#define CFG_ALT_MEMTEST
+#define CONFIG_SYS_ALT_MEMTEST
 
 /* default load address */
-#define        CFG_LOAD_ADDR                   0x00100000
+#define        CONFIG_SYS_LOAD_ADDR                    0x00100000
 
 /* decrementer freq: 1 ms ticks        */
-#define        CFG_HZ                          1000
 
 /* configure flash */
-#define CFG_FLASH_BASE                 0xff800000
-#define CFG_MAX_FLASH_BANKS            1
-#define CFG_MAX_FLASH_SECT             64
-#define CFG_FLASH_SIZE                 8
-#undef CFG_FLASH_16BIT
-#define CFG_FLASH_ERASE_TOUT           240000
-#define CFG_FLASH_WRITE_TOUT           500
-#define CFG_FLASH_LOCK_TOUT            500
-#define CFG_FLASH_UNLOCK_TOUT          10000
-#define CFG_FLASH_PROTECTION
+#define CONFIG_SYS_FLASH_BASE                  0xff800000
+#define CONFIG_SYS_MAX_FLASH_BANKS             1
+#define CONFIG_SYS_MAX_FLASH_SECT              64
+#define CONFIG_SYS_FLASH_SIZE                  8
+#undef CONFIG_SYS_FLASH_16BIT
+#define CONFIG_SYS_FLASH_ERASE_TOUT            240000
+#define CONFIG_SYS_FLASH_WRITE_TOUT            500
+#define CONFIG_SYS_FLASH_LOCK_TOUT             500
+#define CONFIG_SYS_FLASH_UNLOCK_TOUT           10000
+#define CONFIG_SYS_FLASH_PROTECTION
 
 /* monitor in flash */
-#define CFG_MONITOR_OFFSET             0x00700000
+#define CONFIG_SYS_MONITOR_OFFSET              0x00700000
 
 /* environment in flash */
-#define CFG_ENV_IS_IN_FLASH            1
-#define CFG_ENV_ADDR                   (CFG_FLASH_BASE + 0x00020000)
-#define CFG_ENV_SIZE                   0x00020000
-#define CFG_ENV_SECT_SIZE              0x00020000
+#define CONFIG_ENV_IS_IN_FLASH         1
+#define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE + 0x00020000)
+#define CONFIG_ENV_SIZE                        0x00020000
+#define CONFIG_ENV_SECT_SIZE           0x00020000
 
 /*
  * Initial memory map for linux
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CFG_BOOTMAPSZ                  (8 << 20)
+#define CONFIG_SYS_BOOTMAPSZ                   (8 << 20)
 
 /* hard reset configuration words */
 #ifdef CONFIG_CLKIN_66MHz
-#define CFG_HRCW_MASTER                        0x04643050
+#define CONFIG_SYS_HRCW_MASTER                 0x04643050
 #else
 #error NO HRCW FOR 100MHZ SPECIFIED !!!
 #endif
-#define CFG_HRCW_SLAVE1                        0x00000000
-#define CFG_HRCW_SLAVE2                        0x00000000
-#define CFG_HRCW_SLAVE3                        0x00000000
-#define CFG_HRCW_SLAVE4                        0x00000000
-#define CFG_HRCW_SLAVE5                        0x00000000
-#define CFG_HRCW_SLAVE6                        0x00000000
-#define CFG_HRCW_SLAVE7                        0x00000000
+#define CONFIG_SYS_HRCW_SLAVE1                 0x00000000
+#define CONFIG_SYS_HRCW_SLAVE2                 0x00000000
+#define CONFIG_SYS_HRCW_SLAVE3                 0x00000000
+#define CONFIG_SYS_HRCW_SLAVE4                 0x00000000
+#define CONFIG_SYS_HRCW_SLAVE5                 0x00000000
+#define CONFIG_SYS_HRCW_SLAVE6                 0x00000000
+#define CONFIG_SYS_HRCW_SLAVE7                 0x00000000
 
 /* internal memory mapped register */
-#define CFG_IMMR                       0xF0000000
+#define CONFIG_SYS_IMMR                        0xF0000000
 
 /* definitions for initial stack pointer and data area (in DPRAM) */
-#define CFG_INIT_RAM_ADDR              CFG_IMMR
-#define CFG_INIT_RAM_END               0x2000
-#define CFG_GBL_DATA_SIZE              128
-#define CFG_GBL_DATA_OFFSET            (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
-#define CFG_INIT_SP_OFFSET             CFG_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_RAM_ADDR               CONFIG_SYS_IMMR
+#define CONFIG_SYS_INIT_RAM_SIZE               0x2000
+#define CONFIG_SYS_GBL_DATA_OFFSET             (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_OFFSET              CONFIG_SYS_GBL_DATA_OFFSET
 
 /*
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CFG_SDRAM_BASE _must_ start at 0
+ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CFG_SDRAM_BASE                 0x00000000
-#define CFG_SDRAM_SIZE                 (32*1024*1024)
-#define CFG_MONITOR_BASE               TEXT_BASE
-#define CFG_MONITOR_FLASH              (CFG_FLASH_BASE + CFG_MONITOR_OFFSET)
-#define CFG_MONITOR_LEN                        0x00020000
-#define CFG_MALLOC_LEN                 0x00020000
-
-/* boot flags */
-#define BOOTFLAG_COLD                  0x01    /* normal power-on */
-#define BOOTFLAG_WARM                  0x02    /* software reboot */
+#define CONFIG_SYS_SDRAM_BASE                  0x00000000
+#define CONFIG_SYS_SDRAM_SIZE                  (32*1024*1024)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_FLASH               (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_OFFSET)
+#define CONFIG_SYS_MONITOR_LEN                 0x00020000
+#define CONFIG_SYS_MALLOC_LEN                  0x00020000
 
 /* cache configuration */
-#define CFG_CACHELINE_SIZE             32      /* for MPC8260 */
+#define CONFIG_SYS_CACHELINE_SIZE              32      /* for MPC8260 */
 #if defined(CONFIG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT            5       /* log base 2 of above */
+#define CONFIG_SYS_CACHELINE_SHIFT             5       /* log base 2 of above */
 #endif
 
 /*
  *
  * HID1 has only read-only information - nothing to set.
  */
-#define CFG_HID0_INIT                  (HID0_ICE|HID0_DCE|\
+#define CONFIG_SYS_HID0_INIT                   (HID0_ICE|HID0_DCE|\
                                         HID0_ICFI|HID0_DCI|HID0_IFEM|HID0_ABE)
-#define CFG_HID0_FINAL                 (HID0_IFEM|HID0_ABE)
-#define CFG_HID2                       0
+#define CONFIG_SYS_HID0_FINAL                  (HID0_IFEM|HID0_ABE)
+#define CONFIG_SYS_HID2                        0
 
 /* RMR - reset mode register - turn on checkstop reset enable */
-#define CFG_RMR                                RMR_CSRE
+#define CONFIG_SYS_RMR                         RMR_CSRE
 
 /* BCR - bus configuration */
-#define CFG_BCR                                0x00000000
+#define CONFIG_SYS_BCR                         0x00000000
 
 /* SIUMCR - siu module configuration */
-#define CFG_SIUMCR                     0x4905c000
+#define CONFIG_SYS_SIUMCR                      0x4905c000
 
 /* SYPCR - system protection control */
 #if defined(CONFIG_WATCHDOG)
-#define CFG_SYPCR                      0xffffff87
+#define CONFIG_SYS_SYPCR                       0xffffff87
 #else
-#define CFG_SYPCR                      0xffffff83
+#define CONFIG_SYS_SYPCR                       0xffffff83
 #endif
 
 /* TMCNTSC - time counter status and control */
 /* clear interrupts XXX jse */
-/*#define CFG_TMCNTSC                  (TMCNTSC_SEC|TMCNTSC_ALR) */
-#define CFG_TMCNTSC                    (TMCNTSC_SEC|TMCNTSC_ALR|\
+/*#define CONFIG_SYS_TMCNTSC                   (TMCNTSC_SEC|TMCNTSC_ALR) */
+#define CONFIG_SYS_TMCNTSC                     (TMCNTSC_SEC|TMCNTSC_ALR|\
                                         TMCNTSC_TCF|TMCNTSC_TCE)
 
 /* PISCR - periodic interrupt status and control */
 /* clear interrupts XXX jse */
-/*#define CFG_PISCR                    (PISCR_PS) */
-#define CFG_PISCR                      (PISCR_PS|PISCR_PTF|PISCR_PTE)
+/*#define CONFIG_SYS_PISCR                     (PISCR_PS) */
+#define CONFIG_SYS_PISCR                       (PISCR_PS|PISCR_PTF|PISCR_PTE)
 
 /* SCCR - system clock control */
-#define CFG_SCCR                       0x000001a9
+#define CONFIG_SYS_SCCR                        0x000001a9
 
 /* RCCR - risc controller configuration */
-#define CFG_RCCR                       0
+#define CONFIG_SYS_RCCR                        0
 
 /*
  * MEMORY MAP
  * ----------
- * CS0 - FLASH    8MB/8Bit     base=0xff800000 (boot: 0xfe000000, 8x mirrored)
+ * CS0 - FLASH    8MB/8Bit     base=0xff800000 (boot: 0xfe000000, 8x mirrored)
  * CS1 - SDRAM   32MB/64Bit    base=0x00000000
  * CS2 - DSP/SL1  1MB/16Bit    base=0xf0100000
  * CS3 - DSP/SL2  1MB/16Bit    base=0xf0200000
  *  x  - IMMR     384KB                base=0xf0000000
  */
 /* XXX jse 100MHz TODO */
-#define CFG_BR0_PRELIM                 0xff800801
-#define CFG_OR0_PRELIM                 0xff801e44
-#define CFG_BR1_PRELIM                 0x00000041
-#define CFG_OR1_PRELIM                 0xfe002ec0
+#define CONFIG_SYS_BR0_PRELIM                  0xff800801
+#define CONFIG_SYS_OR0_PRELIM                  0xff801e44
+#define CONFIG_SYS_BR1_PRELIM                  0x00000041
+#define CONFIG_SYS_OR1_PRELIM                  0xfe002ec0
 #if 1
-#define CFG_BR2_PRELIM                 0xf0101001
-#define CFG_OR2_PRELIM                 0xfff00ef4
-#define CFG_BR3_PRELIM                 0xf0201001
-#define CFG_OR3_PRELIM                 0xfff00ef4
-#define CFG_BR4_PRELIM                 0xf0301001
-#define CFG_OR4_PRELIM                 0xfff00ef4
-#define CFG_BR5_PRELIM                 0xf0401001
-#define CFG_OR5_PRELIM                 0xfff00ef4
+#define CONFIG_SYS_BR2_PRELIM                  0xf0101001
+#define CONFIG_SYS_OR2_PRELIM                  0xfff00ef4
+#define CONFIG_SYS_BR3_PRELIM                  0xf0201001
+#define CONFIG_SYS_OR3_PRELIM                  0xfff00ef4
+#define CONFIG_SYS_BR4_PRELIM                  0xf0301001
+#define CONFIG_SYS_OR4_PRELIM                  0xfff00ef4
+#define CONFIG_SYS_BR5_PRELIM                  0xf0401001
+#define CONFIG_SYS_OR5_PRELIM                  0xfff00ef4
 #else
-#define CFG_BR2_PRELIM                 0xf0101081
-#define CFG_OR2_PRELIM                 0xfff00104
-#define CFG_BR3_PRELIM                 0xf0201081
-#define CFG_OR3_PRELIM                 0xfff00104
-#define CFG_BR4_PRELIM                 0xf0301081
-#define CFG_OR4_PRELIM                 0xfff00104
-#define CFG_BR5_PRELIM                 0xf0401081
-#define CFG_OR5_PRELIM                 0xfff00104
+#define CONFIG_SYS_BR2_PRELIM                  0xf0101081
+#define CONFIG_SYS_OR2_PRELIM                  0xfff00104
+#define CONFIG_SYS_BR3_PRELIM                  0xf0201081
+#define CONFIG_SYS_OR3_PRELIM                  0xfff00104
+#define CONFIG_SYS_BR4_PRELIM                  0xf0301081
+#define CONFIG_SYS_OR4_PRELIM                  0xfff00104
+#define CONFIG_SYS_BR5_PRELIM                  0xf0401081
+#define CONFIG_SYS_OR5_PRELIM                  0xfff00104
 #endif
-#define CFG_BR7_PRELIM                 0xf0500881
-#define CFG_OR7_PRELIM                 0xffff8104
-#define CFG_MPTPR                      0x2700
-#define CFG_PSDMR                      0x822a2452      /* optimal */
-/*#define CFG_PSDMR                    0x822a48a3 */   /* relaxed */
-#define CFG_PSRT                       0x1a
+#define CONFIG_SYS_BR7_PRELIM                  0xf0500881
+#define CONFIG_SYS_OR7_PRELIM                  0xffff8104
+#define CONFIG_SYS_MPTPR                       0x2700
+#define CONFIG_SYS_PSDMR                       0x822a2452      /* optimal */
+/*#define CONFIG_SYS_PSDMR                     0x822a48a3 */   /* relaxed */
+#define CONFIG_SYS_PSRT                        0x1a
 
 /* "bad" address */
-#define        CFG_RESET_ADDRESS               0x40000000
+#define        CONFIG_SYS_RESET_ADDRESS                0x40000000
 
 #endif /* __CONFIG_H */