Skip to contentSkip to conversation

MIPS updates

GIT PULL Shinya Kuribayashi 2 participants 4 messages May 16, 2009

lore
Share & tools
lore
#0 lore raw

please pull U-Boot/MIPS repository to pick up the following changes.

Thanks in advance,

Shinya

---

The following changes since commit a2e0ffcf2d9a22c582a93e84a4bef20fd3877f47:
Wolfgang Denk (1):

        Prepare v2009.06-rc2

are available in the git repository at:

git://git.denx.de/u-boot-mips.git master

Shinya Kuribayashi (2):
MIPS: Make all extern-ed functions in bitops.h static
MIPS: lib_mips/board.c: Remove unused variables

Thomas Lange (1):
MIPS: Implement ethernet halt for au1x00

 cpu/mips/au1x00_eth.c     |    4 +++
 include/asm-mips/bitops.h |   64 ++++++++++++++++++++++----------------------
 lib_mips/board.c          |    3 +-
 3 files changed, 37 insertions(+), 34 deletions(-)
cpu/mips/au1x00_eth.c +4 -0
index 6272a3a..5074997 100644
@@ -276,6 +276,10 @@ static int au1x00_init(struct eth_device* dev, bd_t * bd){
 }
 
 static void au1x00_halt(struct eth_device* dev){
+	volatile u32 *macen = (volatile u32*)MAC0_ENABLE;
+
+	/* Put MAC0 in reset */
+	*macen = 0;
 }
 
 int au1x00_enet_initialize(bd_t *bis){
include/asm-mips/bitops.h +32 -32

256 lines not on this page · raw message

lib_mips/board.c +1 -2
index 6fc4845..061901e 100644
@@ -323,9 +323,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
-	char *s, *e;
+	char *s;
 	bd_t *bd;
-	int i;
 
 	gd = id;
 	gd->flags |= GD_FLG_RELOC;	/* tell others: relocation done */
#1 lore raw
Quoted 2 lines · Shinya Kuribayashi

Thomas Lange (1):
MIPS: Implement ethernet halt for au1x00

[...]

Quoted 15 lines
cpu/mips/au1x00_eth.c +4 -0
index 6272a3a..5074997 100644
@@ -276,6 +276,10 @@ static int au1x00_init(struct eth_device* dev, bd_t * bd){
 }
 
 static void au1x00_halt(struct eth_device* dev){
+	volatile u32 *macen = (volatile u32*)MAC0_ENABLE;
+
+	/* Put MAC0 in reset */
+	*macen = 0;
 }
 
 int au1x00_enet_initialize(bd_t *bis){
#2 lore raw

Dear Shinya Kuribayashi,

Quoted 7 lines · In message <[email protected]> you wrote:

From the CodingStyle point of view, (volatile u32 *) is preferred, but I see that Thomas-san just follow existing code and tries to be consistent.

Wolfgang-san, I hope the patch is applied as-is at this moment, and look forward to cleanup patch in the future.

That's OK, thanks.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I distrust all systematisers, and avoid them. The will  to  a  system
shows a lack of honesty.
- Friedrich Wilhelm Nietzsche _G?tzen-D?mmerung [The Twilight of  the
Idols]_ ``Maxims and Missiles'' no. 26
#3 lore raw
In reply to Shinya Kuribayashi

Dear Shinya Kuribayashi,

Quoted 20 lines · In message <[email protected]> you wrote:

please pull U-Boot/MIPS repository to pick up the following changes.

Thanks in advance,

Shinya

---

The following changes since commit a2e0ffcf2d9a22c582a93e84a4bef20fd3877f47:
Wolfgang Denk (1):

        Prepare v2009.06-rc2

are available in the git repository at:

git://git.denx.de/u-boot-mips.git master

Shinya Kuribayashi (2):
MIPS: Make all extern-ed functions in bitops.h static
MIPS: lib_mips/board.c: Remove unused variables

Quoted 7 lines

Thomas Lange (1):
MIPS: Implement ethernet halt for au1x00

 cpu/mips/au1x00_eth.c     |    4 +++
 include/asm-mips/bitops.h |   64 ++++++++++++++++++++++----------------------
 lib_mips/board.c          |    3 +-
 3 files changed, 37 insertions(+), 34 deletions(-)

Done, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You've no idea of what a poor opinion  I  have  of  myself,  and  how
little I deserve it.                                  - W. S. Gilbert