Changeset 13096

Timestamp:

10/16/2009 01:15:36 AM (5 months ago)

Author:

BrainSlayer

Message:

work in progress

Files:

• ar5315_microredboot/microredboot/CHANGELOG (modified) (1 diff)
• ar5315_microredboot/microredboot/boot/src/ramconfig.h (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar531xPhy/athrs26/current/src/ae531xecos.h (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar531xPhy/kendin/current/src/ae531xecos.h (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar7100/current/src/ag7100.h (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar7100/current/src/ag7100_ecos.h (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar7100/current/src/rtPhy.c (modified) (2 diffs)
• ar5315_microredboot/microredboot/ecos/packages/hal/mips/pb42/current/misc/redboot_RAM.ecm (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/hal/mips/pb42/current/misc/redboot_ROM.ecm (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/redboot/current/include/flash_config.h (modified) (1 diff)
• ar5315_microredboot/microredboot/ecos/packages/redboot/current/src/fconfig.c (modified) (4 diffs)
• ar5315_microredboot/microredboot/ecos/packages/redboot/current/src/main.c (modified) (2 diffs)
• ar5315_microredboot/microredboot/images_default/redboot_ap48_16M_4M_kendin.rom (modified) (previous)
• ar5315_microredboot/microredboot/images_default/redboot_ap48_16M_4M_marvell.rom (modified) (previous)
• ar5315_microredboot/microredboot/images_default/redboot_ap48_32M_4M_marvell.rom (modified) (previous)
• ar5315_microredboot/microredboot/images_default/redboot_ap48_32M_8M_icplus.rom (modified) (previous)
• ar5315_microredboot/microredboot/images_default/redboot_ap48_32M_8M_kendin.rom (modified) (previous)
• ar5315_microredboot/microredboot/makefile (modified) (1 diff)

ar5315_microredboot/microredboot/CHANGELOG

@@ +1 @@
+15.10.09
+    * start of ar7100 port (far from beeing finished, stub needs still to be written)
+
-14.10.09
-    * add some workarounds for slow low quality flash chips

ar5315_microredboot/microredboot/boot/src/ramconfig.h

@@ -1 @@
-2
+1
-#define AR5312 1
-#define RESETBUTTON 0x06

ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar531xPhy/athrs26/current/src/ae531xecos.h

@@ -59 +59 @@
-#endif
-
-
+//
-
-#if !defined(DEBUG)

ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar531xPhy/kendin/current/src/ae531xecos.h

@@ -59 +59 @@
-#endif
-
-
+//
-
-#if !defined(DEBUG)

ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar7100/current/src/ag7100.h

@@ -46 +46 @@
-}
-#else
-
-
-
-
-
-
-
-
-
+
-#endif
-

ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar7100/current/src/ag7100_ecos.h

@@ -11 +11 @@
-#include <string.h>
-
-
+//
-
-
-
-
+
-
-#define AG7100_TX_BUF_SIZE 1536

ar5315_microredboot/microredboot/ecos/packages/devs/eth/mips/ar7100/current/src/rtPhy.c

@@ -24 +24 @@
-#include "ag7100_phy.h"
-
-/* DEBUG */ 1
+0
-#define RT_DEBUG_ERROR     0x00000001
-#define RT_DEBUG_PHYSETUP  0x00000002
@@ -218 +218 @@
-
-#ifdef DEBUG
-
+
-/* Define the PHY registers of interest for a phyShow command */
-struct rtRegisterTable_s {

ar5315_microredboot/microredboot/ecos/packages/hal/mips/pb42/current/misc/redboot_RAM.ecm

@@ -21 +21 @@
-    package -template CYGPKG_LIBC_STRING current ;
-    package CYGPKG_MEMALLOC current ;
-    package CYGPKG_COMPRESS_ZLIB current ;
-    package CYGPKG_COMPRESS_7ZIP current ;
-    package CYGPKG_IO_ETH_DRIVERS current ;

ar5315_microredboot/microredboot/ecos/packages/hal/mips/pb42/current/misc/redboot_ROM.ecm

@@ -22 +22 @@
-    package CYGPKG_MEMALLOC v2_0 ;
-    package CYGPKG_COMPRESS_7ZIP current ;      
-    package CYGPKG_COMPRESS_ZLIB v2_0 ;
-    package CYGPKG_IO_ETH_DRIVERS v2_0 ;
-    package CYGPKG_IO_FILEIO v2_0 ;

ar5315_microredboot/microredboot/ecos/packages/redboot/current/include/flash_config.h

@@ -99 +99 @@
-bool flash_add_config(struct config_option *opt, bool update);
-
+// Get mac address.
+bool flash_get_mac_address(int type, void *val);
+
+#if defined(CYGPKG_HAL_MIPS_AR7100)
+#define ATHEROS_MODS
+#endif
+
+#ifdef ATHEROS_MODS
+
+#define ATHEROS_CONFIG_SIZE        0x2000
+#define ATHEROS_BOARD_CONFIG_SIZE  0x1000
+
+/* this structure lives in last sector of the flash */
+struct _atheros_config {
+       /* We needed a simple way to read pll setting from flash when   */
+       /* 'C' environment isn't ready yet. Putting this  in cfg_env    */
+       /* would mean we would have to store and search the array using */ 
+       /* key=value format in assembly.  Having some of the config     */
+       /* parameters at fixed offsets - makes redboot startup code     */
+       /* simpler.                                                     */
+       /* 0x3F0000/0x7F0000 starts here */
+       unsigned int freq_setting; 
+       unsigned int PCI_clock;
+       unsigned int reserved[2];
+
+       /* generic config sector */
+       unsigned int  magic_num;
+       unsigned int  version;
+       unsigned int  boardid;
+       unsigned char cfg_env[ATHEROS_BOARD_CONFIG_SIZE-8*4]; /* key=value pairs */
+       unsigned int  checksum; /* covers the struct starting from magic_num */
+
+       /* 0x3F1000/0x7F1000 starts here */
+       unsigned char MAC1[6];
+       unsigned char MAC2[6];
+       unsigned char MAC3[6];
+       unsigned char MAC4[6];
+           unsigned int  macsum;
+};
+
+bool flash_set_pll_freq (unsigned int val);
+#endif
+
+// read atheros PCI clock
+cyg_uint32 get_atheros_config_PCI_clock(void);
+
-// Internal structure used to hold config data
-struct _config {

ar5315_microredboot/microredboot/ecos/packages/redboot/current/src/fconfig.c

@@ -74 +74 @@
-externC bool cyg_plf_redboot_esa_validate(unsigned char *val);
-#endif
+
+
+
-
-#ifdef CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH
@@ -106 +109 @@
-#endif // FLASH MEDIA
-
+#ifdef ATHEROS_MODS
+static struct _atheros_config ath_cfg;  
+#endif
+
-// Prototypes for local functions
-static unsigned char *flash_lookup_config(char *key);
+
+#ifdef ATHEROS_MODS
+static int atoi(char *str);
+#ifdef CYGNUM_CONFIG_PRODUCT_ID
+static void do_mac_setting (int argc, char *argv[]);
+#endif /* CYGNUM_CONFIG_PRODUCT_ID */
+
+static void do_pll_settings_usage(void);
+static void read_atheros_config(void);
+static int get_atheros_config_pll(void);
+static int set_atheros_config_pll(int v);
+static bool flash_set_pll_freq (unsigned int val);
+static bool update_atheros_config(void);
+#endif
+
-
-static bool config_ok;
@@ -492 +514 @@
-}
-
+#ifdef ATHEROS_MODS
+
+/*********************************************************************************
+** atoi
+**
+** Simple implementation of the conversion from decimal to binary integer value
+**
+*/
+
+static int atoi(char *str)
+{
+    int val  = 0;
+    int sign = 1;
+    
+    while(*str == ' ')
+        str++;;   /* strip spaces */
+    
+    if(*str == '-')
+    {
+        sign = -1;
+        str++;
+    }
+    
+    /*
+    ** Loop on digits
+    */
+    
+    while(*str > 0x2f && *str < 0x3a)
+    {
+        val= 10 * val + (*str++ - 0x30);
+    }
+    
+    val = val * sign;
+    
+    return (val);    
+}
+
+
+#ifdef CYGNUM_CONFIG_PRODUCT_ID
+/*
+** If the product ID is defined for this board, then we provide the command for programming
+** the MAC addresses for the board.  It is assumed that the board will have a WAN Mac address
+** and a LAN mac address.  Only the WAN mac address is used by redboot, but both will be read
+** by Linux to program the WAN and LAN MAC addresses upon bootup.
+*/
+
+static cmd_fun do_mac_setting;
+RedBoot_cmd("progmac",
+            "Programs the mac address(es) into flash.  Based on board serial number.Number of MACs required depends on board type",
+            "usage:\n"
+            "progmac serialno\n"
+            "  serialno = board serial number in decimal\n",
+            do_mac_setting
+        ); 
+
+/**********************************************************************************
+** do_mac_setting
+**
+** This is the executable portion of the progmac command.  This will process the
+** MAC address strings, and program them into the appropriate flash sector..
+**
+*/
+
+static void
+do_mac_setting (int argc, char *argv[])
+{
+    char    macPrefix[3]= { 0x00, 0x03, 0x7f };
+    int     serno;
+
+    /*
+    ** Argv[1] contains the value string.  Convert to binary, and program the
+    ** values in flash
+    */
+    
+    serno = atoi(argv[1]);
+    
+    /*
+    ** If the serial number is less than 0, or greater than 0x1fff, it's out of range
+    */
+    
+    if(serno < 0 || serno > 0x1fff)
+    {
+        diag_printf("Serno out of range\n",serno);
+        return;
+    }
+    
+    /*
+    ** Create the 24 bit number that composes the lower 3 bytes of the MAC address
+    */
+    
+    serno = 0xFFFFFF & ( (CYGNUM_CONFIG_PRODUCT_ID << 13) | (serno & 0x1fff));
+    
+    /*
+    ** Get the values from flash, and program into the MAC address registers
+    */
+    
+    read_atheros_config();
+    
+    /*
+    ** Set the first and second values
+    */
+    
+    memcpy(ath_cfg.MAC1,macPrefix,3);
+    ath_cfg.MAC1[3] = 0xFF & (serno >> 16);
+    ath_cfg.MAC1[4] = 0xFF & (serno >> 8);
+    ath_cfg.MAC1[5] = 0xFF &  serno;
+    
+    /*
+    ** Increment by 1 for the second MAC address
+    */
+
+    serno++;    
+    memcpy(ath_cfg.MAC2,macPrefix,3);
+    ath_cfg.MAC2[3] = 0xFF & (serno >> 16);
+    ath_cfg.MAC2[4] = 0xFF & (serno >> 8);
+    ath_cfg.MAC2[5] = 0xFF &  serno;
+    
+    update_atheros_config();
+}
+
+#endif /* CYGNUM_CONFIG_PRODUCT_ID */
+
+/****************************************************************************************
+** flash_get_mac_address
+**
+** This returns the indicated MAC address into the provided buffer.  The address is
+** based on the MAC pointer provided
+*/
+
+
+bool
+flash_get_mac_address(int unit, void *pdata)
+{
+    /*
+    ** Ensure we do a read first to make sure the data in the structure
+    ** is valid
+    */
+    
+    read_atheros_config();
+    
+    switch(unit)
+    {
+        case 0:
+            memcpy(pdata,ath_cfg.MAC1,6);
+            break;
+            
+        case 1:
+            memcpy(pdata,ath_cfg.MAC1,6);
+            break;
+            
+        case 2:
+            memcpy(pdata,ath_cfg.MAC1,6);
+            break;
+            
+        case 3:
+            memcpy(pdata,ath_cfg.MAC1,6);
+            break;
+     }
+     
+     return true;
+}
+
+
+
+
+
+static cmd_fun do_pll_setting;
+RedBoot_cmd("ar7100_pll",
+            "Set pll configuration for AR7100 (default = 0)",
+            "0 - use chip rev\n"
+            "1 - 200/200/100\n"
+            "2 - 300/300/150\n"
+            "3 - 333/333/166\n"
+            "4 - 266/266/133\n"
+            "5 - 266/266/66\n"
+            "6 - 400/400/200\n"
+            "7 - 600/300/150\n"
+            "8  - 680/340/170\n",
+            do_pll_setting
+        ); 
+
+static void
+do_pll_settings_usage(void)
+{
+  diag_printf ("usage: ar7100_pll <0|1|2|3|4|5|6|7|8> where\n"
+           "0  - use chip rev\n"
+           "1  - 200/200/100\n"
+           "2  - 300/300/150\n"
+           "3  - 333/333/166\n"
+           "4  - 266/266/133\n"
+           "5  - 266/266/66\n"
+           "6  - 400/400/200\n"
+           "7  - 600/300/150\n"
+           "8  - 680/340/170\n");
+  read_atheros_config();
+  diag_printf ("current value is %d\n", get_atheros_config_pll());
+}
+
+static void
+do_pll_setting (int argc, char *argv[])
+{
+  unsigned int  val;
+
+  if (argc != 2) {
+    do_pll_settings_usage();
+    return;
+  }
+
+  /*
+  ** We now can have a two digit number.  If the second character is a digit, then we
+  ** calculate the value based on the two digits.
+  */
+  
+  val = atoi(argv[1]);
+  
+  /*
+  ** The values 30 and 31 are "seceret" values for 720/340/170 and 800/400/200
+  ** divider settings, respectively.  These are used for debug ONLY, and are not
+  ** intimated to the user
+  */
+  
+  if ( val < 0 || ( (val > 8 ) && (val != 30) && (val != 31) ) ) {
+    do_pll_settings_usage();
+    return;
+  }
+  flash_set_pll_freq(val); 
+}
+
+#endif
+
+
+
-static cmd_fun do_flash_config;
-RedBoot_cmd("fconfig",
@@ -908 +1162 @@
-    return false;
-}
+
+#ifdef ATHEROS_MODS 
+
+#if (CYGNUM_FLASH_BLOCK_NUM == 64)
+#define ATH_CFG_ADDR  0xbf3f0000  /* 4MB version */
+#else 
+#define ATH_CFG_ADDR  0xbf7f0000  /* 8MB version */
+#endif
+
+#define ATH_CFG_MAGIC_NUM  0xECECCECE
+
+static void
+read_atheros_config(void)
+{
+    /*
+    ** Copy the structure from the flash area to RAM
+    */
+    
+    memcpy (&ath_cfg, (char *)ATH_CFG_ADDR, sizeof(struct _atheros_config));
+    
+    /*
+    ** Check for the "magic number" to be valid.  We should also use checksum
+    */
+    
+    if (ath_cfg.magic_num != ATH_CFG_MAGIC_NUM)
+    {
+        memset(&ath_cfg,0,sizeof(ath_cfg));
+        ath_cfg.magic_num = ATH_CFG_MAGIC_NUM;
+        
+        /*
+        ** Need to set the MAC addresses to a default value
+        */
+        
+        ath_cfg.MAC1[0]= 0x00;
+        ath_cfg.MAC1[1]= 0x03;
+        ath_cfg.MAC1[2]= 0x7f;
+        ath_cfg.MAC1[3]= 0xff;
+        ath_cfg.MAC1[4]= 0xff;
+        ath_cfg.MAC1[5]= 0xfe;
+
+        ath_cfg.MAC2[0]= 0x00;
+        ath_cfg.MAC2[1]= 0x03;
+        ath_cfg.MAC2[2]= 0x7f;
+        ath_cfg.MAC2[3]= 0xff;
+        ath_cfg.MAC2[4]= 0xff;
+        ath_cfg.MAC2[5]= 0xff;
+    }
+}
+
+
+static int
+get_atheros_config_pll(void)
+{
+  if (ath_cfg.magic_num != ATH_CFG_MAGIC_NUM)
+    read_atheros_config();
+
+  return ath_cfg.freq_setting;
+}
+
+static int
+set_atheros_config_pll(int v)
+{
+  if (ath_cfg.magic_num != ATH_CFG_MAGIC_NUM)
+  {
+    read_atheros_config();
+  }
+  
+  ath_cfg.freq_setting=v;
+
+  return 0;
+}
+
+static bool
+flash_set_pll_freq (unsigned int val)
+{
+  read_atheros_config();
+  set_atheros_config_pll(val);
+  
+  return (update_atheros_config());
+}
+
+
+/****************************************************************************
+** update_atheros_config
+**
+** This routine will erase and write the current value of the ath_cfg structure
+** back to the flash sector from whence it came.  This can be called by any
+** routine that needs to write back to flash after updating parameters in
+** the ath_cfg structure.
+**
+** Returns true if the write was successful, and false if not.
+*/
+
+static bool
+update_atheros_config(void)
+{
+    int     stat;
+    void    *err_addr;
+    int     err_count = 0;
+    
+    /*
+    ** Code Begins
+    */
+    
+    diag_printf("Erasing last sector...\n");
+    
+    stat = flash_erase(ATH_CFG_ADDR, sizeof(struct _atheros_config),(void **)&err_addr);
+    
+    if(stat)
+    {
+        diag_printf("Error erasing flash!\n");
+        return false;
+    }
+
+try_again:
+    diag_printf("Writing to last sector....\n");
+    stat = FLASH_PROGRAM(ATH_CFG_ADDR, &ath_cfg, sizeof(struct _atheros_config),(void **) &err_addr);
+    
+    if (stat)
+    {
+        err_count++;
+        if(err_count < 2)
+            goto try_again;
+        
+        diag_printf("Error writing config data at %p: %s\n",err_addr, flash_errmsg(stat));
+        return false;
+    }
+    
+    return true; 
+}
+
+#endif
-
-//

ar5315_microredboot/microredboot/ecos/packages/redboot/current/src/main.c

@@ -168 +168 @@
-else
-        *(volatile unsigned *)AR2316_GPIO_DO &= ~(1<<gpio);     /*set GPIO0 to 1 to spi flash CS normal state */
+#elif defined(CYGPKG_HAL_MIPS_AR7100)
+//      *(volatile unsigned *)(AR7100_GPIO_OE) |= 1<<gpio;      /*set GPIO0 to be output */
+//if (state)
+//      *(volatile unsigned *)(AR7100_GPIO_OUT) |= 1<<gpio;     /*set GPIO0 to 1 to spi flash CS normal state */
+//else
+//      *(volatile unsigned *)(AR7100_GPIO_OUT )&= ~(1<<gpio);  /*set GPIO0 to 1 to spi flash CS normal state */
+
+
-#else
-        *(volatile unsigned *)AR531X_GPIO_CR &= ~(1<<gpio);     /*set GPIO0 to be output */
@@ -188 +196 @@
-        b = ((*(volatile unsigned int *)(AR2316_GPIO_DI)) >> 
-                                        resetgpio) & 1;
+#elif defined(CYGPKG_HAL_MIPS_AR7100) 
+        b = ((*(volatile unsigned int *)(AR7100_GPIO_IN)) >> 
+                                        resetgpio) & 1;
+
-#else
-        b = ((*(volatile unsigned int *)(AR531X_GPIO_DI)) >> 

ar5315_microredboot/microredboot/makefile

@@ -124 +124 @@
-
-
+
+pb42:   BOARD_TYPE=pb42
+pb42:
+        echo "#define RAM_SIZE 0x2000000" > boot/src/ramconfig.h
+        echo "#define AR5312 1" >> boot/src/ramconfig.h
+# RAM version
+        $(PLATFORM_RAM_START) \
+        ecosconfig import $(ECOS_REPOSITORY)/hal/mips/pb42/current/misc/redboot_RAM.ecm; \
+        ecosconfig import $(REDBOOT_DIR)/options/eth_ar7100/adm_phy; \
+        $(PLATFORM_BLD_CUST)
+        $(PLATFORM_RAM_BUILD)
+        cp redboot/pb42/ram/install/bin/redboot.rom images/redboot_pb42_32M_8M_kendin.rom
+        cp redboot/pb42/ram/install/bin/redboot.img images/redboot_pb42_32M_8M_kendin.elf
+
-#
-# The rules