This patch brings the sandburst karef board support up to date due to fpga changes.

CHANGELOG:

* Update Sandburst Karef board support due to FPGA fixes. Initialize front end fpga ID and Version variables properly. Patch by Travis B. Sawyer, 16 Feb 2006

Regards, Travis Sawyer

diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 2d71d3b..dcbd151 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -35,16 +35,14 @@

void fpga_init (void);

-KAREF_BOARD_ID_ST board_id_as[] = -{ +KAREF_BOARD_ID_ST board_id_as[] = { {"Undefined"}, /* Not specified */ {"Kamino Reference Design"}, {"Reserved"}, /* Reserved for future use */ {"Reserved"}, /* Reserved for future use */ };

-KAREF_BOARD_ID_ST ofem_board_id_as[] = -{ +KAREF_BOARD_ID_ST ofem_board_id_as[] = { {"Undefined"}, {"1x10 + 10x2"}, {"Reserved"}, @@ -242,7 +240,7 @@ int checkboard (void) sys_info_t sysinfo; unsigned char brd_rev, brd_id; unsigned short sernum; - unsigned char scan_rev, scan_id, ofem_rev=0, ofem_id=0; + unsigned char scan_rev, scan_id, ofem_rev = 0xff, ofem_id = 0xff; unsigned char ofem_brd_rev, ofem_brd_id; KAREF_FPGA_REGS_ST *karef_ps; OFEM_FPGA_REGS_ST *ofem_ps; @@ -335,7 +333,9 @@ int misc_init_f (void) /************************************************************************* * misc_init_r * - * Do nothing. + * Setup second serial port for interboard access if specified. + * dump the build string. + * Check for automatic filesystem recovery request. ************************************************************************/ int misc_init_r (void) { @@ -445,7 +445,7 @@ void fpga_init(void) /* * Wait a bit to allow the ofem fpga to get its brains */ - udelay(5000); + udelay(100000);

/* * Check to see if the ofem is there @@ -460,10 +460,22 @@ void fpga_init(void)

ofem_ps = (OFEM_FPGA_REGS_ST *)CFG_OFEM_FPGA_BASE; ofem_ps->reset_ul = tmp; + /* + * SB BUG 21938 + * Ensure all extraneous LEDs are off. + */ + ofem_ps->control_ul &= ~(SAND_HAL_KA_OF_OFEM_CNTL_FAULT_LED_MASK | + SAND_HAL_KA_OF_OFEM_CNTL_TEMP_LED_MASK | + SAND_HAL_KA_OF_OFEM_CNTL_RS232_R_LED_MASK | + SAND_HAL_KA_OF_OFEM_CNTL_RS232_L_LED_MASK);

- ofem_ps->control_ul |= 1 < SAND_HAL_KA_OF_OFEM_CNTL_FAULT_LED_SHIFT; + ofem_ps->control_ul |= (1 << SAND_HAL_KA_OF_OFEM_CNTL_FAULT_LED_SHIFT); }

+ karef_ps->control_ul &= ~(SAND_HAL_KA_SC_SCAN_CNTL_FAULT_LED_MASK | + SAND_HAL_KA_SC_SCAN_CNTL_TEMP_LED_MASK | + SAND_HAL_KA_SC_SCAN_CNTL_RS232_R_LED_MASK | + SAND_HAL_KA_SC_SCAN_CNTL_RS232_L_LED_MASK); karef_ps->control_ul |= 1 << SAND_HAL_KA_SC_SCAN_CNTL_FAULT_LED_SHIFT;

asm("eieio"); @@ -498,7 +510,7 @@ int karefSetupVars(cmd_tbl_t *cmdtp, int sprintf(envstr, "console=ttyS0,9600 root=/dev/nfs " "rw nfsroot=10.100.17.10:/home/metrobox/mbc70.%d " "nfsaddrs=10.100.70.%d:10.100.17.10:10.100.1.1:" - "255.255.0.0:karef%d.sandburst.com:eth0:none idebus=33", + "255.255.0.0:metrobox70-%d.sandburst.com:eth0:none idebus=33", sernum, sernum, sernum);

setenv("bootargs_nfs", envstr); @@ -510,7 +522,7 @@ int karefSetupVars(cmd_tbl_t *cmdtp, int memset(envstr, 0, 255);

sprintf(envstr, "console=ttyS0,9600 root=/dev/hda2 " - "rw ip=10.100.70.%d:::255.255.0.0:karef%d:eth0:none idebus=33", + "rw ip=10.100.70.%d:::255.255.0.0:metrobox70-%d:eth0:none idebus=33", sernum, sernum);

setenv("bootargs_cf", envstr); diff --git a/board/sandburst/karef/karef_version.h b/board/sandburst/karef/karef_version.h index 9960b9a..186aa4c 100644 --- a/board/sandburst/karef/karef_version.h +++ b/board/sandburst/karef/karef_version.h @@ -22,5 +22,5 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ -#define KAREF_U_BOOT_REL_STR "Release 0.0.7" +#define KAREF_U_BOOT_REL_STR "Release 1.0.1" #endif