Fix line endings (Win->Unix) in u-boot/include/configs/db12x.h
authorPiotr Dymacz <pepe2k@gmail.com>
Tue, 28 Apr 2015 07:08:21 +0000 (09:08 +0200)
committerPiotr Dymacz <pepe2k@gmail.com>
Tue, 28 Apr 2015 07:08:21 +0000 (09:08 +0200)
u-boot/include/configs/db12x.h

index 2b2d377a2f5ec05400d30e37191d2ec0d3722bee..0e4c6e8de93e5a91f354bf24d2973fa795278ab8 100644 (file)
-/*\r
- * This file contains the configuration parameters for the DB12x (AR9344) board.\r
- */\r
-\r
-#ifndef __CONFIG_H\r
-#define __CONFIG_H\r
-\r
-#include <configs/ar7240.h>\r
-#include <config.h>\r
-\r
-/*\r
- * FLASH and environment organization\r
- */\r
-#define CFG_MAX_FLASH_BANKS                    1\r
-#define CFG_MAX_FLASH_SECT                     4096    // 4 KB sectors in 16 MB flash\r
-/*\r
- * We boot from this flash\r
- */\r
-#define CFG_FLASH_BASE                                 0x9F000000\r
-#ifdef COMPRESSED_UBOOT\r
-       #define BOOTSTRAP_TEXT_BASE                     CFG_FLASH_BASE\r
-       #define BOOTSTRAP_CFG_MONITOR_BASE      BOOTSTRAP_TEXT_BASE\r
-#endif\r
-\r
-/*\r
- * The following #defines are needed to get flash environment right\r
- */\r
-#define        CFG_MONITOR_BASE        TEXT_BASE\r
-#define        CFG_MONITOR_LEN         (192 << 10)\r
-\r
-/*\r
- * Default bootargs\r
- */\r
-#undef CONFIG_BOOTARGS\r
-#if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1) || defined (CONFIG_FOR_TPLINK_WDR3500_V1)\r
-#define        CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 rootfstype=squashfs init=/sbin/init mtdparts=ath-nor0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1408k(uImage),64k(mib0),64k(ART)"\r
-#else\r
-#define        CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 rootfstype=squashfs init=/sbin/init mtdparts=ath-nor0:128k(u-boot),1024k(kernel),2816k(rootfs),64k(config),64k(art)"\r
-#endif\r
-\r
-/*\r
- * Other env default values\r
- */\r
-#undef CONFIG_BOOTFILE\r
-#define CONFIG_BOOTFILE                "firmware.bin"\r
-\r
-#undef CONFIG_LOADADDR\r
-#define CONFIG_LOADADDR                0x80800000\r
-\r
-#define        CFG_LOAD_ADDR                    0x9F020000\r
-#define UPDATE_SCRIPT_FW_ADDR  "0x9F020000"\r
-#define CONFIG_BOOTCOMMAND             "bootm 0x9F020000"\r
-\r
-\r
-#define CONFIG_IPADDR          192.168.1.1\r
-#define CONFIG_SERVERIP                192.168.1.2\r
-\r
-#undef CFG_PLL_FREQ\r
-#undef CFG_HZ\r
-\r
-// CPU-RAM-AHB frequency setting\r
-#if !defined(CONFIG_AP123)\r
-#define CFG_PLL_FREQ                           CFG_PLL_560_480_240\r
-#define CFG_HZ_FALLBACK                                (560000000LU/2)\r
-#else\r
-#define CFG_PLL_FREQ                           CFG_PLL_533_400_200\r
-#define CFG_HZ_FALLBACK                                (535000000LU/2)\r
-#endif\r
-\r
-#define        CFG_HZ                                          bd->bi_cfg_hz\r
-#define AR7240_SPI_CONTROL                     0x43\r
-#define AR7240_SPI_CONTROL_DEFAULT     AR7240_SPI_CONTROL\r
-/*\r
- * MIPS32 24K Processor Core Family Software User's Manual\r
- *\r
- * 6.2.9 Count Register (CP0 Register 9, Select 0)\r
- * The Count register acts as a timer, incrementing at a constant\r
- * rate, whether or not an instruction is executed, retired, or\r
- * any forward progress is made through the pipeline.  The counter\r
- * increments every other clock, if the DC bit in the Cause register\r
- * is 0.\r
- *\r
- * Since the count is incremented every other tick, divide by 2\r
- * XXX derive this from CFG_PLL_FREQ\r
- */\r
-\r
-/*\r
- * Cache lock for stack\r
- */\r
-#define CFG_INIT_SP_OFFSET             0x1000\r
-\r
-/*\r
- * Address and size of Primary Environment Sector\r
- */\r
-#undef  CFG_ENV_IS_IN_FLASH\r
-#define CFG_ENV_IS_NOWHERE     1\r
-\r
-#define CFG_ENV_ADDR           0x9F040000\r
-#define CFG_ENV_SIZE           0x10000\r
-\r
-/*\r
- * Available commands\r
- */\r
-#define CONFIG_COMMANDS (CFG_CMD_MEMORY | \\r
-                                                CFG_CMD_DHCP   | \\r
-                                                CFG_CMD_PING   | \\r
-                                                CFG_CMD_FLASH  | \\r
-                                                CFG_CMD_NET    | \\r
-                                                CFG_CMD_RUN    | \\r
-                                                CFG_CMD_DATE   | \\r
-                                                CFG_CMD_SNTP   | \\r
-                                                CFG_CMD_ECHO   | \\r
-                                                CFG_CMD_BOOTD  | \\r
-                                                CFG_CMD_ITEST)\r
-\r
-// Enable NetConsole and custom NetConsole port\r
-#define CONFIG_NETCONSOLE\r
-#define CONFIG_NETCONSOLE_PORT 6666\r
-\r
-/* DDR settings for WASP */\r
-#define CFG_DDR_REFRESH_VAL     0x4270\r
-#define CFG_DDR_CONFIG_VAL      0xc7bc8cd0\r
-#define CFG_DDR_MODE_VAL_INIT   0x133\r
-#define CFG_DDR_EXT_MODE_VAL    0x0\r
-#define CFG_DDR_MODE_VAL        0x33\r
-#define CFG_DDR_TRTW_VAL        0x1f\r
-#define CFG_DDR_TWTR_VAL        0x1e\r
-#define CFG_DDR_CONFIG2_VAL     0x9dd0e6a8\r
-\r
-#define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_32     0xff\r
-#define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_16     0xffff\r
-\r
-#if DDR2_32BIT_SUPPORT\r
-       #define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL         CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_32\r
-#else\r
-       #define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL         CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_16\r
-#endif\r
-\r
-#define CFG_DDR1_RD_DATA_THIS_CYCLE_VAL                0xffff\r
-#define CFG_SDRAM_RD_DATA_THIS_CYCLE_VAL       0xffffffff\r
-\r
-/* DDR2 Init values */\r
-#define CFG_DDR2_EXT_MODE_VAL    0x402\r
-\r
-#define CONFIG_NET_MULTI\r
-\r
-#ifdef CFG_ATHRS27_PHY\r
-       /* use eth1(LAN) as the net interface */\r
-       #define CONFIG_AG7240_SPEPHY\r
-#endif\r
-\r
-#define CONFIG_PCI 1\r
-\r
-/*\r
- * Web Failsafe configuration\r
- */\r
-#define WEBFAILSAFE_UPLOAD_RAM_ADDRESS                         CONFIG_LOADADDR\r
-#define WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS                       CFG_FLASH_BASE\r
-\r
-// Firmware partition offset\r
-#define WEBFAILSAFE_UPLOAD_KERNEL_ADDRESS                      WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS + 0x20000\r
-\r
-// U-Boot partition size\r
-#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES         (CONFIG_MAX_UBOOT_SIZE_KB * 1024)\r
-#define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES                      "0x10000"\r
-\r
-// ART partition size\r
-#define WEBFAILSAFE_UPLOAD_ART_SIZE_IN_BYTES           (64 * 1024)\r
-\r
-// max. firmware size <= (FLASH_SIZE -  WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES)\r
-// TP-Link: 64k(U-Boot),64k(MAC/model/WPS pin block),64k(ART)\r
-#define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES       (192 * 1024)\r
-\r
-// progress state info\r
-#define WEBFAILSAFE_PROGRESS_START                             0\r
-#define WEBFAILSAFE_PROGRESS_TIMEOUT                   1\r
-#define WEBFAILSAFE_PROGRESS_UPLOAD_READY              2\r
-#define WEBFAILSAFE_PROGRESS_UPGRADE_READY             3\r
-#define WEBFAILSAFE_PROGRESS_UPGRADE_FAILED            4\r
-\r
-// update type\r
-#define WEBFAILSAFE_UPGRADE_TYPE_FIRMWARE              0\r
-#define WEBFAILSAFE_UPGRADE_TYPE_UBOOT                 1\r
-#define WEBFAILSAFE_UPGRADE_TYPE_ART                   2\r
-\r
-/*-----------------------------------------------------------------------*/\r
-\r
-/*\r
- * Additional environment variables for simple upgrades\r
- */\r
-#define CONFIG_EXTRA_ENV_SETTINGS      "uboot_addr=0x9F000000\0" \\r
-                                                                       "uboot_name=uboot.bin\0" \\r
-                                                                       "uboot_size=" UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES "\0" \\r
-                                                                       "uboot_upg=" \\r
-                                                                               "if ping $serverip; then " \\r
-                                                                                       "tftp $loadaddr $uboot_name && " \\r
-                                                                                       "if itest.l $filesize == $uboot_size; then " \\r
-                                                                                               "erase $uboot_addr +$filesize && " \\r
-                                                                                               "cp.b $loadaddr $uboot_addr $filesize && " \\r
-                                                                                               "echo OK!; " \\r
-                                                                                       "else " \\r
-                                                                                               "echo ERROR! Wrong file size!; " \\r
-                                                                                       "fi; " \\r
-                                                                               "else " \\r
-                                                                                       "ERROR! Server not reachable!; " \\r
-                                                                               "fi\0" \\r
-                                                                       "firmware_addr=" UPDATE_SCRIPT_FW_ADDR "\0" \\r
-                                                                       "firmware_name=firmware.bin\0" \\r
-                                                                       "firmware_upg=" \\r
-                                                                               "if ping $serverip; then " \\r
-                                                                                       "tftp $loadaddr $firmware_name && " \\r
-                                                                                       "erase $firmware_addr +$filesize && " \\r
-                                                                                       "cp.b $loadaddr $firmware_addr $filesize && " \\r
-                                                                                       "echo OK!; " \\r
-                                                                               "else " \\r
-                                                                                       "ERROR! Server not reachable!; " \\r
-                                                                               "fi\0" \\r
-                                                                       SILENT_ENV_VARIABLE\r
-\r
-/* For Merlin, both PCI, PCI-E interfaces are valid */\r
-#define AR7240_ART_PCICFG_OFFSET       12\r
-\r
-#define WLANCAL                                                0x9fff1000\r
-#define CFG_MII0_RMII                          1\r
-#define CFG_BOOTM_LEN                          (16 << 20) /* 16 MB */\r
-\r
-#undef DEBUG\r
-#define milisecdelay(_x)                       udelay((_x) * 1000)\r
-\r
-/* MAC address, model and PIN number offsets in FLASH */\r
-#define OFFSET_MAC_DATA_BLOCK                  0x010000\r
-#define OFFSET_MAC_DATA_BLOCK_LENGTH   0x010000\r
-#define OFFSET_MAC_ADDRESS                             0x00FC00\r
-#define OFFSET_ROUTER_MODEL                            0x00FD00\r
-#define OFFSET_PIN_NUMBER                              0x00FE00\r
-\r
-#include <cmd_confdefs.h>\r
-\r
-#endif /* __CONFIG_H */\r
+/*
+ * This file contains the configuration parameters for the DB12x (AR9344) board.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/ar7240.h>
+#include <config.h>
+
+/*
+ * FLASH and environment organization
+ */
+#define CFG_MAX_FLASH_BANKS                    1
+#define CFG_MAX_FLASH_SECT                     4096    // 4 KB sectors in 16 MB flash
+/*
+ * We boot from this flash
+ */
+#define CFG_FLASH_BASE                                 0x9F000000
+#ifdef COMPRESSED_UBOOT
+       #define BOOTSTRAP_TEXT_BASE                     CFG_FLASH_BASE
+       #define BOOTSTRAP_CFG_MONITOR_BASE      BOOTSTRAP_TEXT_BASE
+#endif
+
+/*
+ * The following #defines are needed to get flash environment right
+ */
+#define        CFG_MONITOR_BASE        TEXT_BASE
+#define        CFG_MONITOR_LEN         (192 << 10)
+
+/*
+ * Default bootargs
+ */
+#undef CONFIG_BOOTARGS
+#if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1) || defined (CONFIG_FOR_TPLINK_WDR3500_V1)
+#define        CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 rootfstype=squashfs init=/sbin/init mtdparts=ath-nor0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1408k(uImage),64k(mib0),64k(ART)"
+#else
+#define        CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 rootfstype=squashfs init=/sbin/init mtdparts=ath-nor0:128k(u-boot),1024k(kernel),2816k(rootfs),64k(config),64k(art)"
+#endif
+
+/*
+ * Other env default values
+ */
+#undef CONFIG_BOOTFILE
+#define CONFIG_BOOTFILE                "firmware.bin"
+
+#undef CONFIG_LOADADDR
+#define CONFIG_LOADADDR                0x80800000
+
+#define        CFG_LOAD_ADDR                    0x9F020000
+#define UPDATE_SCRIPT_FW_ADDR  "0x9F020000"
+#define CONFIG_BOOTCOMMAND             "bootm 0x9F020000"
+
+
+#define CONFIG_IPADDR          192.168.1.1
+#define CONFIG_SERVERIP                192.168.1.2
+
+#undef CFG_PLL_FREQ
+#undef CFG_HZ
+
+// CPU-RAM-AHB frequency setting
+#if !defined(CONFIG_AP123)
+#define CFG_PLL_FREQ                           CFG_PLL_560_480_240
+#define CFG_HZ_FALLBACK                                (560000000LU/2)
+#else
+#define CFG_PLL_FREQ                           CFG_PLL_533_400_200
+#define CFG_HZ_FALLBACK                                (535000000LU/2)
+#endif
+
+#define        CFG_HZ                                          bd->bi_cfg_hz
+#define AR7240_SPI_CONTROL                     0x43
+#define AR7240_SPI_CONTROL_DEFAULT     AR7240_SPI_CONTROL
+/*
+ * MIPS32 24K Processor Core Family Software User's Manual
+ *
+ * 6.2.9 Count Register (CP0 Register 9, Select 0)
+ * The Count register acts as a timer, incrementing at a constant
+ * rate, whether or not an instruction is executed, retired, or
+ * any forward progress is made through the pipeline.  The counter
+ * increments every other clock, if the DC bit in the Cause register
+ * is 0.
+ *
+ * Since the count is incremented every other tick, divide by 2
+ * XXX derive this from CFG_PLL_FREQ
+ */
+
+/*
+ * Cache lock for stack
+ */
+#define CFG_INIT_SP_OFFSET             0x1000
+
+/*
+ * Address and size of Primary Environment Sector
+ */
+#undef  CFG_ENV_IS_IN_FLASH
+#define CFG_ENV_IS_NOWHERE     1
+
+#define CFG_ENV_ADDR           0x9F040000
+#define CFG_ENV_SIZE           0x10000
+
+/*
+ * Available commands
+ */
+#define CONFIG_COMMANDS (CFG_CMD_MEMORY | \
+                                                CFG_CMD_DHCP   | \
+                                                CFG_CMD_PING   | \
+                                                CFG_CMD_FLASH  | \
+                                                CFG_CMD_NET    | \
+                                                CFG_CMD_RUN    | \
+                                                CFG_CMD_DATE   | \
+                                                CFG_CMD_SNTP   | \
+                                                CFG_CMD_ECHO   | \
+                                                CFG_CMD_BOOTD  | \
+                                                CFG_CMD_ITEST)
+
+// Enable NetConsole and custom NetConsole port
+#define CONFIG_NETCONSOLE
+#define CONFIG_NETCONSOLE_PORT 6666
+
+/* DDR settings for WASP */
+#define CFG_DDR_REFRESH_VAL     0x4270
+#define CFG_DDR_CONFIG_VAL      0xc7bc8cd0
+#define CFG_DDR_MODE_VAL_INIT   0x133
+#define CFG_DDR_EXT_MODE_VAL    0x0
+#define CFG_DDR_MODE_VAL        0x33
+#define CFG_DDR_TRTW_VAL        0x1f
+#define CFG_DDR_TWTR_VAL        0x1e
+#define CFG_DDR_CONFIG2_VAL     0x9dd0e6a8
+
+#define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_32     0xff
+#define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_16     0xffff
+
+#if DDR2_32BIT_SUPPORT
+       #define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL         CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_32
+#else
+       #define CFG_DDR2_RD_DATA_THIS_CYCLE_VAL         CFG_DDR2_RD_DATA_THIS_CYCLE_VAL_16
+#endif
+
+#define CFG_DDR1_RD_DATA_THIS_CYCLE_VAL                0xffff
+#define CFG_SDRAM_RD_DATA_THIS_CYCLE_VAL       0xffffffff
+
+/* DDR2 Init values */
+#define CFG_DDR2_EXT_MODE_VAL    0x402
+
+#define CONFIG_NET_MULTI
+
+#ifdef CFG_ATHRS27_PHY
+       /* use eth1(LAN) as the net interface */
+       #define CONFIG_AG7240_SPEPHY
+#endif
+
+#define CONFIG_PCI 1
+
+/*
+ * Web Failsafe configuration
+ */
+#define WEBFAILSAFE_UPLOAD_RAM_ADDRESS                         CONFIG_LOADADDR
+#define WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS                       CFG_FLASH_BASE
+
+// Firmware partition offset
+#define WEBFAILSAFE_UPLOAD_KERNEL_ADDRESS                      WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS + 0x20000
+
+// U-Boot partition size
+#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES         (CONFIG_MAX_UBOOT_SIZE_KB * 1024)
+#define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES                      "0x10000"
+
+// ART partition size
+#define WEBFAILSAFE_UPLOAD_ART_SIZE_IN_BYTES           (64 * 1024)
+
+// max. firmware size <= (FLASH_SIZE -  WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES)
+// TP-Link: 64k(U-Boot),64k(MAC/model/WPS pin block),64k(ART)
+#define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES       (192 * 1024)
+
+// progress state info
+#define WEBFAILSAFE_PROGRESS_START                             0
+#define WEBFAILSAFE_PROGRESS_TIMEOUT                   1
+#define WEBFAILSAFE_PROGRESS_UPLOAD_READY              2
+#define WEBFAILSAFE_PROGRESS_UPGRADE_READY             3
+#define WEBFAILSAFE_PROGRESS_UPGRADE_FAILED            4
+
+// update type
+#define WEBFAILSAFE_UPGRADE_TYPE_FIRMWARE              0
+#define WEBFAILSAFE_UPGRADE_TYPE_UBOOT                 1
+#define WEBFAILSAFE_UPGRADE_TYPE_ART                   2
+
+/*-----------------------------------------------------------------------*/
+
+/*
+ * Additional environment variables for simple upgrades
+ */
+#define CONFIG_EXTRA_ENV_SETTINGS      "uboot_addr=0x9F000000\0" \
+                                                                       "uboot_name=uboot.bin\0" \
+                                                                       "uboot_size=" UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES "\0" \
+                                                                       "uboot_upg=" \
+                                                                               "if ping $serverip; then " \
+                                                                                       "tftp $loadaddr $uboot_name && " \
+                                                                                       "if itest.l $filesize == $uboot_size; then " \
+                                                                                               "erase $uboot_addr +$filesize && " \
+                                                                                               "cp.b $loadaddr $uboot_addr $filesize && " \
+                                                                                               "echo OK!; " \
+                                                                                       "else " \
+                                                                                               "echo ERROR! Wrong file size!; " \
+                                                                                       "fi; " \
+                                                                               "else " \
+                                                                                       "ERROR! Server not reachable!; " \
+                                                                               "fi\0" \
+                                                                       "firmware_addr=" UPDATE_SCRIPT_FW_ADDR "\0" \
+                                                                       "firmware_name=firmware.bin\0" \
+                                                                       "firmware_upg=" \
+                                                                               "if ping $serverip; then " \
+                                                                                       "tftp $loadaddr $firmware_name && " \
+                                                                                       "erase $firmware_addr +$filesize && " \
+                                                                                       "cp.b $loadaddr $firmware_addr $filesize && " \
+                                                                                       "echo OK!; " \
+                                                                               "else " \
+                                                                                       "ERROR! Server not reachable!; " \
+                                                                               "fi\0" \
+                                                                       SILENT_ENV_VARIABLE
+
+/* For Merlin, both PCI, PCI-E interfaces are valid */
+#define AR7240_ART_PCICFG_OFFSET       12
+
+#define WLANCAL                                                0x9fff1000
+#define CFG_MII0_RMII                          1
+#define CFG_BOOTM_LEN                          (16 << 20) /* 16 MB */
+
+#undef DEBUG
+#define milisecdelay(_x)                       udelay((_x) * 1000)
+
+/* MAC address, model and PIN number offsets in FLASH */
+#define OFFSET_MAC_DATA_BLOCK                  0x010000
+#define OFFSET_MAC_DATA_BLOCK_LENGTH   0x010000
+#define OFFSET_MAC_ADDRESS                             0x00FC00
+#define OFFSET_ROUTER_MODEL                            0x00FD00
+#define OFFSET_PIN_NUMBER                              0x00FE00
+
+#include <cmd_confdefs.h>
+
+#endif /* __CONFIG_H */