From: Wolfgang Denk Date: Wed, 15 Oct 2008 13:50:45 +0000 (+0200) Subject: Coding Style cleanup, update CHANGELOG, prepare 2008.10-rc3 X-Git-Tag: v2008.10-rc3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=789d45f945bc37e721b91923388a91a4f4fcbedb;p=u-boot Coding Style cleanup, update CHANGELOG, prepare 2008.10-rc3 Signed-off-by: Wolfgang Denk --- diff --git a/CHANGELOG b/CHANGELOG index 51984b8ab9..e7dad9c19c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,87 @@ +commit 374b9038293d01d8744a46af9b7854a6fd99b228 +Author: Heiko Schocher +Date: Wed Oct 15 09:51:19 2008 +0200 + + Fix compiler warning in lib_ppc/board.c + + Fix compiler warning introduced by commit 0f8cbc18 + + Signed-off-by: Heiko Schocher + Signed-off-by: Wolfgang Denk + +commit 9724555755a6f1066636481b41f7094e0ce93a69 +Author: Selvamuthukumar +Date: Thu Oct 9 10:29:14 2008 +0530 + + mpc83xx: wait till UPM completes the write to array + + Reference manual states that MxMR[MAD] increment is the indication + of write to UPM array is complete. Honour that. Also, make the dummy + write explicit. + + also fix the comment. + + Signed-off-by: Selvamuthukumar + Signed-off-by: Kim Phillips + +commit 03e2dbb18e858e2f7a6aaa437f290f3690d02d51 +Author: Selvamuthukumar +Date: Wed Oct 8 18:12:20 2008 -0500 + + Remove unwanted ';' at end of define. + + Currently this is not creating any problem. But it will result + in compilation error when used as below. + + printf("CFG_SDRAM_CFG2 - %08x\n", CFG_SDRAM_CFG2); + + Signed-off-by: Selvamuthukumar + + continuation of the theme based on git grep "^#define CFG_.*;$" include/ + + Signed-off-by: Kim Phillips + +commit b2934a56650e9a6c54432f9ce6dc36757967385e +Author: Hugo Villeneuve +Date: Mon Oct 6 10:53:59 2008 -0400 + + ARM DaVinci: Add maintainer information for SFFSDR board. + + Signed-off-by: Hugo Villeneuve + +commit 12c6670f873ed632c264a6f3e8bf1297d5c3ddbc +Author: Matthias Fuchs +Date: Sat Oct 4 19:26:16 2008 +0200 + + api: fix type mismatch + + This patch fixes a type mismatch and thus removes a compiler + warning when compiling with CONFIG_API on powerpc. + + Signed-off-by: Matthias Fuchs + +commit 9bc2e4eee3bcb8e63847d7a733e0c607807d6141 +Author: Peter Tyser +Date: Wed Oct 1 12:25:04 2008 -0500 + + cmd_i2c: Fix help for CONFIG_I2C_CMD_TREE && !CONFIG_I2C_MULTI_BUS + + Original code displayed: + => help i2c + i2c i2c speed [speed] - show or set I2C bus speed + i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device + ... + + Signed-off-by: Peter Tyser + +commit a0b1b610e980e253d4c2519ee15bd0937c3f8be1 +Author: Wolfgang Denk +Date: Tue Oct 14 22:13:41 2008 +0200 + + Update CHANGELOG + + Signed-off-by: Wolfgang Denk + commit 0f8cbc1829d9c7d9616fd29b366a99d037facdcd Author: Jason Jin Date: Fri Oct 10 11:41:01 2008 +0800 diff --git a/Makefile b/Makefile index 7c13ce826b..9055747141 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ VERSION = 2008 PATCHLEVEL = 10 SUBLEVEL = -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else diff --git a/drivers/net/ax88180.h b/drivers/net/ax88180.h index 5254e7d5f5..d2113df4bd 100644 --- a/drivers/net/ax88180.h +++ b/drivers/net/ax88180.h @@ -182,7 +182,7 @@ struct ax88180_private { #define RXCURT (CMD_BASE + 0x0034) #define DEFAULT_RXCURT 0x00000000 #define RXBOUND (CMD_BASE + 0x0038) - #define DEFAULT_RXBOUND 0x7FF //RX pages 0~7FFh + #define DEFAULT_RXBOUND 0x7FF /* RX pages 0~7FFh */ #define MACCFG0 (CMD_BASE + 0x0040) #define MACCFG0_BIT3_0 0x00000007 #define IPGT_VAL 0x00000150