Commit b77fad3b authored by wdenk's avatar wdenk
Browse files

* Patch by Steven Scholz, 07 Apr 2005:

  Add i2c_reg_write() and i2c_reg_write() for at91rm9200 I2C

* Patch by Steven Scholz, 07 Apr 2005:
  Fix compiler warning in altera.c

* Patch by Ladislav Michl, 06 Apr 2005:
  Fix voiceblue configuration.
parent 7ec25502
......@@ -2,6 +2,15 @@
Changes for U-Boot 1.1.3:
======================================================================
* Patch by Steven Scholz, 07 Apr 2005:
Add i2c_reg_write() and i2c_reg_write() for at91rm9200 I2C
* Patch by Steven Scholz, 07 Apr 2005:
Fix compiler warning in altera.c
* Patch by Ladislav Michl, 06 Apr 2005:
Fix voiceblue configuration.
* Patch by Stefan Roese, 06 Apr 2005:
Updates for OCOTEA board:
- Changed U-Boot size from 512kByte to 256kByte
......
......@@ -158,6 +158,7 @@ int altera_info( Altera_desc *desc )
/* Add new family types here */
default:
/* we don't need a message here - we give one up above */
break;
}
} else {
printf ("No Device Function Table.\n");
......
......@@ -189,4 +189,19 @@ i2c_init(int speed, int slaveaddr)
debug ("Found AT91 i2c\n");
return;
}
uchar i2c_reg_read(uchar i2c_addr, uchar reg)
{
char buf;
i2c_read(i2c_addr, reg, 1, &buf, 1);
return(buf);
}
void i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
{
i2c_write(i2c_addr, reg, 1, &val, 1);
}
#endif /* CONFIG_HARD_I2C */
......@@ -98,20 +98,17 @@
#endif
/*
* Size of malloc() pool
* Size of malloc() pool and stack
*/
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#ifdef VOICEBLUE_SMALL_FLASH
#define CFG_MALLOC_LEN (SZ_64K - CFG_GBL_DATA_SIZE)
#define CONFIG_STACKSIZE SZ_8K
#else
#define CFG_MALLOC_LEN (SZ_4M - CFG_GBL_DATA_SIZE)
#define CFG_MALLOC_LEN SZ_4M
#define CONFIG_STACKSIZE SZ_1M
#endif
/*
* The stack size is set up in start.S using the settings below
*/
#define CONFIG_STACKSIZE SZ_8K /* regular stack */
/*
* Hardware drivers
*/
......@@ -163,7 +160,7 @@
#ifdef VOICEBLUE_SMALL_FLASH
#define CONFIG_BOOTDELAY 0
#undef CONFIG_BOOTARGS /* the preboot command will set bootargs*/
#define CFG_AUTOLOAD "n" /* No autoload */
#define CFG_AUTOLOAD "n" /* no autoload */
#define CONFIG_PREBOOT "run setup"
#define CONFIG_EXTRA_ENV_SETTINGS \
"setup=setenv bootargs console=ttyS0,$(baudrate) " \
......@@ -172,8 +169,8 @@
"cp.b 10400000 c000000 $(filesize)\0"
#else
#define CONFIG_BOOTDELAY 3
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CFG_AUTOLOAD "n" /* No autoload */
#undef CONFIG_BOOTARGS /* boot command will set bootargs */
#define CFG_AUTOLOAD "n" /* no autoload */
#define CONFIG_BOOTCOMMAND "run nboot"
#define CONFIG_PREBOOT "run setup"
#define CONFIG_EXTRA_ENV_SETTINGS \
......@@ -188,11 +185,11 @@
"fi\0" \
"setup=setenv bootargs console=ttyS0,$baudrate " \
"mtdparts=$mtdparts\0" \
"nfsargs=setenv bootargs $bootargs " \
"root=/dev/nfs ip=dhcp; run setpart\0" \
"flashargs=setenv bootargs $bootargs " \
"root=/dev/mtdblock$partition " \
"rootfstype=jffs2; run setpart\0" \
"nfsargs=run setpart; setenv bootargs $bootargs " \
"root=/dev/nfs ip=dhcp\0" \
"flashargs=run setpart; setenv bootargs $bootargs " \
"root=/dev/mtdblock$partition ro " \
"rootfstype=jffs2\0" \
"nboot=run nfsargs; bootp; tftp; bootm\0" \
"fboot=run flashargs; fsload /boot/uImage; bootm\0"
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment