summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-07 22:36:40 +0000
committerwdenk <wdenk>2005-04-07 22:36:40 +0000
commitb77fad3b25402559247faac95bc23bd2981f0d11 (patch)
tree89c38479fc5890b76a73e943f77430491e864253
parent7ec25502382e6097f0d8d31a3105acc3b159b0d6 (diff)
downloadu-boot-imx-b77fad3b25402559247faac95bc23bd2981f0d11.zip
u-boot-imx-b77fad3b25402559247faac95bc23bd2981f0d11.tar.gz
u-boot-imx-b77fad3b25402559247faac95bc23bd2981f0d11.tar.bz2
* 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.
-rw-r--r--CHANGELOG9
-rw-r--r--common/altera.c1
-rw-r--r--cpu/arm920t/at91rm9200/i2c.c15
-rw-r--r--include/configs/voiceblue.h27
4 files changed, 37 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b0cdfc6..e53b7c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
diff --git a/common/altera.c b/common/altera.c
index 31b3728..ebd5038 100644
--- a/common/altera.c
+++ b/common/altera.c
@@ -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");
diff --git a/cpu/arm920t/at91rm9200/i2c.c b/cpu/arm920t/at91rm9200/i2c.c
index 433dd32..2743275 100644
--- a/cpu/arm920t/at91rm9200/i2c.c
+++ b/cpu/arm920t/at91rm9200/i2c.c
@@ -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 */
diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 53dbf82..1640163 100644
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -98,21 +98,18 @@
#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
*/
#define CONFIG_DRIVER_SMC91111
@@ -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