Changes for U-Boot 1.0.0:
======================================================================
+* Patch by Steven Scholz, 18 Oct 2003:
+ Fix AT91RM9200 ethernet driver
+
+* Patch by Nye Liu, 17 Oct 2003:
+ Fix typo in include/mpc8xx.h
+
+* Patch by Richard Woodruff, 16 Oct 03:
+ Fixes for cpu/arm925/interrupt.c
+ - Initialize timestamp & lastdec vars.
+ - fix timestamp overflows.
+ - fix lastdec overflow.
+ - smarter normalization to allow udelay() below 1ms to work.
+
+* Patch by Scott McNutt, 16 Oct
+ add networking support for the Altera Nios Development Kit,
+ Cyclone Edition (DK-1C20)
+
+* Patch by Jon Diekema, 14 Oct 2003:
+ add hint about doc/README.silent to README file
+
* Add CompactFlash support for NSCU
* Fix PCI problems on PPChameleonEVB
default i/o. Serial console can be forced with
environment 'console=serial'.
+ When CONFIG_SILENT_CONSOLE is defined, all console
+ messages (by U-Boot and Linux!) can be silenced with
+ the "silent" environment variable. See
+ doc/README.silent for more information.
+
- Console Baudrate:
CONFIG_BAUDRATE - in bps
Select one of the baudrates listed in
{
int32_t val;
+ /* Start the decrementer ticking down from 0xffffffff */
*((int32_t *) (CFG_TIMERBASE + LOAD_TIM)) = TIMER_LOAD_VAL;
val = MPUTIM_ST | MPUTIM_AR | MPUTIM_CLOCK_ENABLE | (CFG_PVT << MPUTIM_PTV_BIT);
*((int32_t *) (CFG_TIMERBASE + CNTL_TIMER)) = val;
+
+ /* init the timestamp and lastdec value */
+ reset_timer_masked();
+
return (0);
}
timestamp = t;
}
-/* very rough timer... */
+/* delay x useconds AND perserve advance timstamp value */
void udelay (unsigned long usec)
{
#ifdef CONFIG_INNOVATOROMAP1510
for (i = time_remaining; i > 0; i--) {
}
#else
+ ulong tmo, tmp;
+
+ if(usec >= 1000){ /* if "big" number, spread normalization to seconds */
+ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */
+ tmo *= CFG_HZ; /* find number of "ticks" to wait to achieve target */
+ tmo /= 1000; /* finish normalize. */
+ }else{ /* else small number, don't kill it prior to HZ multiply */
+ tmo = usec * CFG_HZ;
+ tmo /= (1000*1000);
+ }
- ulong tmo;
-
- tmo = usec / 1000;
- tmo *= CFG_HZ;
- tmo /= 1000;
-
- tmo += get_timer (0);
+ tmp = get_timer (0); /* get current timestamp */
+ if( (tmo + tmp) < tmp ) /* if setting this fordward will roll time stamp */
+ reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastdec value */
+ else
+ tmo += tmp; /* else, set advancing stamp wake up time */
- while (get_timer_masked () < tmo)
+ while (get_timer_masked () < tmo)/* loop till event */
/*NOP*/;
#endif
}
void reset_timer_masked (void)
{
/* reset time */
- lastdec = READ_TIMER;
- timestamp = 0;
+ lastdec = READ_TIMER; /* capure current decrementer value time */
+ timestamp = 0; /* start "advancing" time stamp from 0 */
}
ulong get_timer_masked (void)
{
- ulong now = READ_TIMER; /* current tick value */
+ ulong now = READ_TIMER; /* current tick value */
- if (lastdec >= now) { /* did I roll (rem decrementer) */
+ if (lastdec >= now) { /* normal mode (non roll) */
/* normal mode */
- timestamp += lastdec - now; /* record amount of time since last check */
- } else {
- /* we have an overflow ... */
+ timestamp += lastdec - now; /* move stamp fordward with absoulte diff ticks */
+ } else { /* we have overflow of the count down timer */
+ /* nts = ts + ld + (TLV - now)
+ * ts=old stamp, ld=time that passed before passing through -1
+ * (TLV-now) amount of time after passing though -1
+ * nts = new "advancing time stamp"...it could also roll and cause problems.
+ */
timestamp += lastdec + TIMER_LOAD_VAL - now;
}
lastdec = now;
return timestamp;
}
+/* waits specified delay value and resets timestamp */
void udelay_masked (unsigned long usec)
{
#ifdef CONFIG_INNOVATOROMAP1510
for (i=time_remaining; i>0; i--) { }
#else
- ulong tmo;
+ ulong tmo, tmp;
- tmo = usec / 1000;
- tmo *= CFG_HZ;
- tmo /= 1000;
+ if(usec >= 1000){ /* if "big" number, spread normalization to seconds */
+ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */
+ tmo *= CFG_HZ; /* find number of "ticks" to wait to achieve target */
+ tmo /= 1000; /* finish normalize. */
+ }else{ /* else small number, don't kill it prior to HZ multiply */
+ tmo = usec * CFG_HZ;
+ tmo /= (1000*1000);
+ }
- reset_timer_masked ();
+ reset_timer_masked (); /* set "advancing" timestamp to 0, set lastdec vaule */
- while (get_timer_masked () < tmo)
+ while (get_timer_masked () < tmo) /* wait for time stamp to overtake tick number.*/
/*NOP*/;
#endif
}
* On ARM it returns the number of timer ticks per second.
*/
ulong get_tbclk (void)
-{ /* poor timer, may need to improve especiall for bootp. */
+{
ulong tbclk;
tbclk = CFG_HZ;
* TRUE - if data read successfully
*/
static UCHAR at91rm9200_EmacWritePhy (AT91PS_EMAC p_mac,
- unsigned char RegisterAddress,
- unsigned short *pOutput)
+ unsigned char RegisterAddress,
+ unsigned short *pOutput)
{
p_mac->EMAC_MAN = (AT91C_EMAC_HIGH & ~AT91C_EMAC_LOW) |
AT91C_EMAC_CODE_802_3 | AT91C_EMAC_RW_W |
- (RegisterAddress << 18);
+ (RegisterAddress << 18) | *pOutput;
udelay (10000);
Nios Development Kit
Cyclone Editions
- Last Update: October 4, 2003
+ Last Update: October 15, 2003
====================================================================
This file contains information regarding U-Boot and the Altera
Programming U-Boot into FLASH with GERMS
-----------------------------------------
The current version of the DK-1C20 port occupies less than
-60 KByte. So everything will fit into a single Flash sector.
+60 KByte with network support disabled. So everything will fit
+into a single flash sector. With network support (e.g. bootp,
+tftpboot, ping, etc) the flash footprint is about 77K.
+
To program U-Boot into the DK-1C20 flash using GERMS do the
following:
U-Boot for Nios-32
- Last Update: October 4, 2003
+ Last Update: October 15, 2003
====================================================================
This file contains information regarding U-Boot and the Altera
There are plenty of areas where help is needed. Here's are some ideas
for those interested in contributing:
--SMC 91C111 support. E.g. add in tftpboot, etc.
-
-CompactFlash. Port & test CF/FAT.
-ASMI support. Use ASMI for environment, etc.
})
#endif
+#if defined(CONFIG_SMC_USE_32_BIT)
+
+#define SMC_inl(r) (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
+
+#define SMC_insl(r,b,l) ({ int __i ; \
+ dword *__b2; \
+ __b2 = (dword *) b; \
+ for (__i = 0; __i < l; __i++) { \
+ *(__b2 + __i) = SMC_inl(r); \
+ SMC_inl(0); \
+ }; \
+ })
+
+#define SMC_outl(d,r) (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
+
+#define SMC_outsl(r,b,l) ({ int __i; \
+ dword *__b2; \
+ __b2 = (dword *) b; \
+ for (__i = 0; __i < l; __i++) { \
+ SMC_outl( *(__b2 + __i), r); \
+ } \
+ })
+
+#endif /* CONFIG_SMC_USE_32_BIT */
+
#endif
/*---------------------------------------------------------------
/*------------------------------------------------------------------------
* Ethernet -- needs work!
*----------------------------------------------------------------------*/
-#if 0
#define CONFIG_DRIVER_SMC91111 /* Using SMC91c111 */
-#define CONFIG_SMC91111_BASE 0x00910000 /* Base address */
-#undef CONFIG_SMC91111_EXT_PHY /* No external PHY */
-#define CONFIG_SMC_USE_32_BIT 1 /* 32-bit i/f */
-#endif
+#define CONFIG_SMC91111_BASE 0x00910300 /* Base address */
+#undef CONFIG_SMC91111_EXT_PHY /* Internal PHY */
+#define CONFIG_SMC_USE_32_BIT /* 32-bit data rd/wr */
#define CONFIG_ETHADDR 08:00:3e:26:0a:5b
#define CONFIG_NETMASK 255.255.255.0
CFG_CMD_JFFS2 | \
CFG_CMD_KGDB | \
CFG_CMD_NAND | \
- CFG_CMD_NET | \
CFG_CMD_MMC | \
CFG_CMD_MII | \
CFG_CMD_PCI | \
#define PLPRCR_MF_MSK 0xffff001e /* Multiplication factor + PDF bits */
#define PLPRCR_MFN_MSK 0xf8000000 /* Multiplication factor numerator bits */
#define PLPRCR_MFN_SHIFT 0x0000001b /* Multiplication factor numerator shift*/
-#define PLPRCR_MFD_MSK 0x03c00000 /* Multiplication factor denominator bits */
+#define PLPRCR_MFD_MSK 0x07c00000 /* Multiplication factor denominator bits */
#define PLPRCR_MFD_SHIFT 0x00000017 /* Multiplication factor denominator shift*/
#define PLPRCR_S_MSK 0x00300000 /* Multiplication factor integer bits */
#define PLPRCR_S_SHIFT 0x00000014 /* Multiplication factor integer shift */
#include <common.h>
#include <devices.h>
#include <watchdog.h>
+#include <net.h>
/*
bd_t *bd;
init_fnc_t **init_fnc_ptr;
+ char *s, *e;
+ int i;
/* Pointer is writable since we allocated a register for it.
* Nios treats CFG_GBL_DATA_OFFSET as an address.
bd->bi_sramstart= CFG_SRAM_BASE;
bd->bi_sramsize = CFG_SRAM_SIZE;
bd->bi_baudrate = CONFIG_BAUDRATE;
+ bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
+ s = getenv ("ethaddr");
+ for (i = 0; i < 6; ++i) {
+ bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
+ if (s) s = (*e) ? e + 1 : e;
+ }
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
if ((*init_fnc_ptr) () != 0) {
puts("### ERROR ### Please reset board ###\n");
for (;;);
}
+
projects / u-boot.git / commitdiff