From owner-p4-projects@FreeBSD.ORG Tue Apr 11 16:42:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D290F16A40A; Tue, 11 Apr 2006 16:42:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92DB416A402 for ; Tue, 11 Apr 2006 16:42:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4444543D48 for ; Tue, 11 Apr 2006 16:42:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BGgiFm001388 for ; Tue, 11 Apr 2006 16:42:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BGgi2M001377 for perforce@freebsd.org; Tue, 11 Apr 2006 16:42:44 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 16:42:44 GMT Message-Id: <200604111642.k3BGgi2M001377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 16:42:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=94993 Change 94993 by imp@imp_Speedy on 2006/04/11 16:41:42 hacks for the tsc board Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#9 (text+ko) ==== @@ -26,15 +26,11 @@ #define BAUD 115200 -/* ****************************** GLOBALS *************************************/ - -/* ***********************PRIVATE FUNCTIONS/DATA ******************************/ - #define AT91C_US_ASYNC_MODE (AT91C_US_USMODE_NORMAL + AT91C_US_NBSTOP_1_BIT + AT91C_US_PAR_NONE + AT91C_US_CHRL_8_BITS + AT91C_US_CLKS_CLOCK) -/* ************************** GLOBAL FUNCTIONS ********************************/ +//#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +#define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS - /* * .KB_C_FN_DEFINITION_START * void DefaultSystemInit(void) @@ -64,9 +60,9 @@ // Crude selection between 16MHz clock and 10MHz clock. // if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000) - div = OSC_MAIN_FREQ_DIV_10; +// div = OSC_MAIN_FREQ_DIV_10; // else -// div = OSC_MAIN_FREQ_DIV_16; + div = OSC_MAIN_FREQ_DIV_16; // set PLLA = 180MHz // assume main osc = 10Mhz @@ -132,12 +128,10 @@ ((6 << 27) & AT91C_SDRC_TXSR); - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_PRCGALL_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_PRCGALL_CMD; *p = 0; - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_RFSH_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_RFSH_CMD; *p = 0; *p = 0; *p = 0; @@ -147,16 +141,13 @@ *p = 0; *p = 0; - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_LMR_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_LMR_CMD; *p = 0; AT91C_BASE_SDRC->SDRC_TR = 7 * AT91C_MASTER_CLOCK / 1000000; - *p = 0; - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_NORMAL_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_NORMAL_CMD; *p = 0; // Configure DBGU -use local routine optimized for space