NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

PATCH New Jean-Christophe PLAGNIOL-VILLARD 4 participants 24 messages Apr 21, 2008 – Apr 25, 2008 1 message not in the archive

Subsystems (2)

Network drivers Kbuild

lore

Share & tools

lore

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-21 17:22 UTC #0 lore raw

cover NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

Move non-inlied functions into specific drivers file Set get_prom as weak

Coding Style Cleanup

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Signed-off-by Vlad Lungu <[email protected]>

drivers/net/Makefile +4 -1

index d5e413b..4131aad 100644
@@ -42,7 +42,10 @@ COBJS-y += lan91c96.o
 COBJS-y += macb.o
 COBJS-y += mcffec.o
 COBJS-y += natsemi.o
-COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o
+ifeq ($(CONFIG_DRIVER_NE2000),y)
+COBJS-y += ne2000.o
+COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o
+endif
 COBJS-y += netarm_eth.o
 COBJS-y += netconsole.o
 COBJS-y += ns7520_eth.o

drivers/net/ax88796.c new file +156 -0

156 lines not on this page · raw message

drivers/net/ax88796.h +0 ~~-134~~

139 lines not on this page · raw message

drivers/net/ne2000.c +243 ~~-129~~

672 lines not on this page · raw message

drivers/net/ne2000.h +1 ~~-86~~

97 lines not on this page · raw message

drivers/net/ne2000_base.h +0 -1

index 1badf62..d8768e8 100644
@@ -120,7 +120,6 @@ typedef struct dp83902a_priv_data {
  ------------------------------------------------------------------------
  Some forward declarations
 */
-int get_prom( u8* mac_addr);
 static void dp83902a_poll(void);
 
 /* ------------------------------------------------------------------------ */

Signature · 1 line

1.5.4.5

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-21 17:22 UTC #1 lore raw

PATCH 1/2 qemu-mips: add CFI support and coding style cleanup

add CONFIG_ENV_OVERWRITE

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

include/configs/qemu-mips.h +28 ~~-26~~

index e164019..b775714 100644
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

@@ -28,13 +28,14 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MIPS32		1  /* MIPS32 CPU core	*/
-#define CONFIG_QEMU_MIPS        1
+#define CONFIG_MIPS32		1	/* MIPS32 CPU core	*/
+#define CONFIG_QEMU_MIPS	1
 #define CONFIG_MISC_INIT_R
 
 /*IP address is default used by Qemu*/
-#define CONFIG_IPADDR		10.0.2.15    	     /* Our IP address */
-#define CONFIG_SERVERIP		10.0.2.2	     /* Server IP address*/
+#define CONFIG_ENV_OVERWRITE	1
+#define CONFIG_IPADDR		10.0.2.15	/* Our IP address */
+#define CONFIG_SERVERIP		10.0.2.2	/* Server IP address*/
 
 #define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds	*/

@@ -56,7 +57,6 @@
 
 #define CONFIG_BOOTCOMMAND	"bootp;bootelf"
 
-
 /*
  * BOOTP options
  */

@@ -65,7 +65,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */

@@ -74,21 +73,18 @@
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef  CONFIG_CMD_IMLS
-#undef  CONFIG_CMD_FLASH
-#undef  CONFIG_CMD_LOADB
-#undef  CONFIG_CMD_LOADS
+#undef	CONFIG_CMD_LOADB
+#undef	CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_NE2000_BASE	(0xb4000300)
 
-#define CFG_NO_FLASH
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
-#define CFG_NS16550_REG_SIZE    1
-#define CFG_NS16550_CLK         115200
-#define CFG_NS16550_COM1        (0xb40003f8)
+#define CFG_NS16550_REG_SIZE	1
+#define CFG_NS16550_CLK		115200
+#define CFG_NS16550_COM1	(0xb40003f8)
 #define CONFIG_CONS_INDEX	1
 
 #define CONFIG_CMD_IDE

@@ -106,17 +102,17 @@
 /*
  * Miscellaneous configurable options
  */
-#define	CFG_LONGHELP				/* undef to save memory      */
+#define	CFG_LONGHELP				/* undef to save memory */
 
-#define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt    */
+#define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt */
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2	"> "
 
-#define	CFG_CBSIZE		256		/* Console I/O Buffer Size   */
-#define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
+#define	CFG_CBSIZE		256		/* Console I/O Buffer Size */
+#define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)	/* Print Buffer Size */
 #define	CFG_MAXARGS		16		/* max number of command args*/
 
 #define CFG_MALLOC_LEN		128*1024

@@ -125,11 +121,11 @@
 
 #define CFG_MHZ			132
 
-#define CFG_HZ                  (CFG_MHZ * 1000000)
+#define CFG_HZ			(CFG_MHZ * 1000000)
 
-#define CFG_SDRAM_BASE		0x80000000     /* Cached addr */
+#define CFG_SDRAM_BASE		0x80000000	/* Cached addr */
 
-#define	CFG_LOAD_ADDR		0x81000000     /* default load address	*/
+#define	CFG_LOAD_ADDR		0x81000000	/* default load address	*/
 
 #define CFG_MEMTEST_START	0x80100000
 #define CFG_MEMTEST_END		0x80800000

@@ -146,11 +142,17 @@
 
 /* We boot from this flash, selected with dip switch */
 #define CFG_FLASH_BASE		0xbfc00000
-
-#define	CFG_ENV_IS_NOWHERE	1
-
+#define	CFG_MAX_FLASH_BANKS	1
+#define	CFG_MAX_FLASH_SECT	128
+#define	CFG_FLASH_CFI		1	/* Flash memory is CFI compliant */
+#define CFG_FLASH_CFI_DRIVER	1
+#define CFG_FLASH_USE_BUFFER_WRITE	1
+
+#define	CFG_ENV_IS_IN_FLASH	1
+#define CFG_ENV_ADDR		(CFG_FLASH_BASE+0x40000)
 /* Address and size of Primary Environment Sector	*/
-#define CFG_ENV_SIZE		0x10000
+#define CFG_ENV_SIZE		0x8000
+
 #undef CONFIG_NET_MULTI
 
 #define MEM_SIZE 128

Signature · 1 line

1.5.4.5

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-21 17:22 UTC #2 lore raw

PATCH 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

add support of :
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_PING
#define CONFIG_CMD_CDP
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_SETEXPR

and keep only :
tftp and dhcp support when CONFIG_SMALLEST is active

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Makefile +5 -0

index ab56831..f0cfd76 100644
@@ -2720,8 +2720,13 @@ gth2_config:	unconfig
 	@echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
 	@$(MKCONFIG) -a gth2 mips mips gth2
 
+qemu_mips_smallest_config	\
 qemu_mips_config: unconfig
 	@mkdir -p $(obj)include
+	@[ -z "$(findstring _smallest_,$@)" ] || \
+		{ echo "#define CONFIG_SMALLEST 1" >>$(obj)include/config.h ; \
+		  $(XECHO) "... config with the minimal functionalities" ; \
+		}
 	@echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
 	@$(MKCONFIG) -a qemu-mips mips mips qemu-mips

include/configs/qemu-mips.h +15 -1

index b775714..6a15413 100644
@@ -71,10 +71,20 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_ELF
+#ifndef CONFIG_SMALLEST
+#define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef	CONFIG_CMD_LOADB
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_CDP
+#define CONFIG_CMD_SAVES
+#define CONFIG_CMD_SETEXPR
+#else
 #undef	CONFIG_CMD_LOADS
+#undef	CONFIG_CMD_LOADB
+#undef	CONFIG_CMD_NFS
+#endif
+#undef	CONFIG_CMD_FPGA
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000

@@ -87,6 +97,7 @@
 #define CFG_NS16550_COM1	(0xb40003f8)
 #define CONFIG_CONS_INDEX	1
 
+#ifndef CONFIG_SMALLEST
 #define CONFIG_CMD_IDE
 #define CONFIG_DOS_PARTITION

@@ -103,13 +114,16 @@
  * Miscellaneous configurable options
  */
 #define	CFG_LONGHELP				/* undef to save memory */
+#endif
 
 #define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt */
 
+#ifndef CONFIG_SMALLEST
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2	"> "
+#endif
 
 #define	CFG_CBSIZE		256		/* Console I/O Buffer Size */
 #define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)	/* Print Buffer Size */

Signature · 1 line

1.5.4.5

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-21 17:48 UTC #3 lore raw

PATCH v2 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

and keep only :
tftp and dhcp support when CONFIG_SMALLEST is active

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 Makefile                    |    5 +++++
 include/configs/qemu-mips.h |   16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)

Makefile +5 -0

index ab56831..202ddd9 100644
@@ -2720,9 +2720,14 @@ gth2_config:	unconfig
 	@echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
 	@$(MKCONFIG) -a gth2 mips mips gth2
 
+qemu_mips_smallest_config	\
 qemu_mips_config: unconfig
 	@mkdir -p $(obj)include
 	@echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
+	@[ -z "$(findstring _smallest_,$@)" ] || \
+		{ echo "#define CONFIG_SMALLEST 1" >>$(obj)include/config.h ; \
+		  $(XECHO) "... config with the minimal functionalities" ; \
+		}
 	@$(MKCONFIG) -a qemu-mips mips mips qemu-mips
 
 #########################################################################

include/configs/qemu-mips.h +15 -1

index b775714..6a15413 100644
@@ -71,10 +71,20 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_ELF
+#ifndef CONFIG_SMALLEST
+#define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef	CONFIG_CMD_LOADB
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_CDP
+#define CONFIG_CMD_SAVES
+#define CONFIG_CMD_SETEXPR
+#else
 #undef	CONFIG_CMD_LOADS
+#undef	CONFIG_CMD_LOADB
+#undef	CONFIG_CMD_NFS
+#endif
+#undef	CONFIG_CMD_FPGA
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000

@@ -87,6 +97,7 @@
 #define CFG_NS16550_COM1	(0xb40003f8)
 #define CONFIG_CONS_INDEX	1
 
+#ifndef CONFIG_SMALLEST
 #define CONFIG_CMD_IDE
 #define CONFIG_DOS_PARTITION

@@ -103,13 +114,16 @@
  * Miscellaneous configurable options
  */
 #define	CFG_LONGHELP				/* undef to save memory */
+#endif
 
 #define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt */
 
+#ifndef CONFIG_SMALLEST
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2	"> "
+#endif
 
 #define	CFG_CBSIZE		256		/* Console I/O Buffer Size */
 #define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)	/* Print Buffer Size */

Signature · 1 line

1.5.4.5

Wolfgang Denk

2008-04-21 19:26 UTC #4 lore raw

PATCH v2 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

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

add support of :
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_PING
#define CONFIG_CMD_CDP
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_SETEXPR
and keep only :
tftp and dhcp support when CONFIG_SMALLEST is active

What is the difference between the first patch and patch "V2"?

What is "CONFIG_SMALLEST" ?

What is "full functionnalty"?

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
It [being a Vulcan] means to adopt a philosophy, a way of life  which
is logical and beneficial. We cannot disregard that philosophy merely
for personal gain, no matter how important that gain might be.
	-- Spock, "Journey to Babel", stardate 3842.4

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-22 06:26 UTC #5 lore raw

PATCH v2 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

Quoted 10 lines · Wolfgang Denk

Quoted 9 lines · In message <[email protected]> you wrote:
add support of :
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_PING
#define CONFIG_CMD_CDP
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_SETEXPR

Quoted 5 lines

Quoted 2 lines
and keep only :
tftp and dhcp support when CONFIG_SMALLEST is active
What is the difference between the first patch and patch "V2"?

I've invert on line in the Makefile

I've put
@[ -z "$(findstring _smallest_,$@)" ] || \

before
@echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h

so the #define CONFIG_SMALLEST is overwrite

Quoted 2 lines

What is "CONFIG_SMALLEST" ?

Built the minimal functionnality to create the smallest u-boot

Quoted 2 lines

What is "full functionnalty"?

Active everythink that we could.

Best regards,
J.

Wolfgang Denk

2008-04-22 10:01 UTC #6 lore raw

PATCH v2 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

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

Quoted 3 lines
What is the difference between the first patch and patch "V2"?
I've invert on line in the Makefile

You should explain such things when you post several versions of a patch. Otherwise it's extremely difficult to understand what exactly you want.

Quoted 3 lines

Quoted 2 lines
What is "CONFIG_SMALLEST" ?
Built the minimal functionnality to create the smallest u-boot

CONFIG_* reads like a standard option toi me, so I was lookign for appropriate documentation in the README for it. Now I tend to think this is something that is more private to your board?

Also, "smallest" is certainly not an absolute term ;-)

Quoted 3 lines

Quoted 2 lines
What is "full functionnalty"?
Active everythink that we could.

Actually I intended to point out that you might want to fix the spelling errors...

Best regards,

Wolfgang Denk

Signature · 4 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
Like winter snow on summer lawn, time past is time gone.

Shinya Kuribayashi

2008-04-22 07:26 UTC #7 lore raw

PATCH v2 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

In reply to Wolfgang Denk

Quoted 10 lines · Wolfgang Denk

Quoted 9 lines · In message <[email protected]> you wrote:
add support of :
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_PING
#define CONFIG_CMD_CDP
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_SETEXPR

Quoted 8 lines

Quoted 2 lines
and keep only :
tftp and dhcp support when CONFIG_SMALLEST is active
What is the difference between the first patch and patch "V2"?
What is "CONFIG_SMALLEST" ?
What is "full functionnalty"?

Although I said "(I) will push in a week or two" before, but I'll drop this patch from my pull-request list, since it needs to be logically sorted out a little more.

Jean, I recommend to change only CFI-support addition stuff. No need to make things complicated, no commands cleanups, no CodinStyle cleanups.

Quoted 3 lines

Best regards,
Wolfgang Denk

Signature · 2 lines

Shinya Kuribayashi
NEC Electronics

Shinya Kuribayashi

2008-04-22 07:38 UTC #8 lore raw

PATCH v2 2/2 qemu-mips: add full functionnalty and support of CONFIG_SMALLEST

Quoted 17 lines · Shinya Kuribayashi

Quoted 16 lines · Wolfgang Denk
Quoted 11 lines · In message <[email protected]> you wrote:
add support of :
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_PING
#define CONFIG_CMD_CDP
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_SETEXPR
and keep only :
tftp and dhcp support when CONFIG_SMALLEST is active
What is the difference between the first patch and patch "V2"?
What is "CONFIG_SMALLEST" ?

Quoted 8 lines

Quoted 1 line
What is "full functionnalty"?
Although I said "(I) will push in a week or two" before, but I'll drop this patch from my pull-request list, since it needs to be logically sorted out a little more.
Jean, I recommend to change only CFI-support addition stuff. No need to make things complicated, no commands cleanups, no CodinStyle cleanups.

I'm sorry, incorrect thread...

Signature · 2 lines

Shinya Kuribayashi
NEC Electronics

Shinya Kuribayashi

2008-04-22 15:10 UTC #9 lore raw

PATCH 1/2 qemu-mips: Cleanup whiespaces, tab indentations, etc.

In reply to Jean-Christophe PLAGNIOL-VILLARD

No functional change.

Signed-off-by Shinya Kuribayashi <[email protected]>

---

 include/configs/qemu-mips.h |   65 +++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 33 deletions(-)

include/configs/qemu-mips.h +32 ~~-33~~

index e164019..be00356 100644
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

@@ -28,25 +28,25 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MIPS32		1  /* MIPS32 CPU core	*/
-#define CONFIG_QEMU_MIPS        1
+#define CONFIG_MIPS32		1	/* MIPS32 CPU core */
+#define CONFIG_QEMU_MIPS	1
 #define CONFIG_MISC_INIT_R
 
 /*IP address is default used by Qemu*/
-#define CONFIG_IPADDR		10.0.2.15    	     /* Our IP address */
-#define CONFIG_SERVERIP		10.0.2.2	     /* Server IP address*/
+#define CONFIG_IPADDR		10.0.2.15	/* Our IP address */
+#define CONFIG_SERVERIP		10.0.2.2	/* Server IP address */
 
-#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds	*/
+#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds */
 
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
-#define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
-#undef	CONFIG_BOOTARGS
+#define CONFIG_TIMESTAMP		/* Print image info with timestamp */
+#undef CONFIG_BOOTARGS
 
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define CONFIG_EXTRA_ENV_SETTINGS					\
 	"addmisc=setenv bootargs ${bootargs} "				\
 		"console=ttyS0,${baudrate} "				\
 		"panic=1\0"						\

@@ -56,7 +56,6 @@
 
 #define CONFIG_BOOTCOMMAND	"bootp;bootelf"
 
-
 /*
  * BOOTP options
  */

@@ -65,7 +64,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */

@@ -74,10 +72,10 @@
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef  CONFIG_CMD_IMLS
-#undef  CONFIG_CMD_FLASH
-#undef  CONFIG_CMD_LOADB
-#undef  CONFIG_CMD_LOADS
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000

@@ -86,15 +84,15 @@
 #define CFG_NO_FLASH
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
-#define CFG_NS16550_REG_SIZE    1
-#define CFG_NS16550_CLK         115200
-#define CFG_NS16550_COM1        (0xb40003f8)
+#define CFG_NS16550_REG_SIZE	1
+#define CFG_NS16550_CLK		115200
+#define CFG_NS16550_COM1	(0xb40003f8)
 #define CONFIG_CONS_INDEX	1
 
 #define CONFIG_CMD_IDE
 #define CONFIG_DOS_PARTITION
 
-#define CFG_IDE_MAXBUS	2
+#define CFG_IDE_MAXBUS		2
 #define CFG_ATA_IDE0_OFFSET	(0x1f0)
 #define CFG_ATA_IDE1_OFFSET	(0x170)
 #define CFG_ATA_DATA_OFFSET	(0)

@@ -106,18 +104,18 @@
 /*
  * Miscellaneous configurable options
  */
-#define	CFG_LONGHELP				/* undef to save memory      */
+#define CFG_LONGHELP				/* undef to save memory */
 
-#define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt    */
+#define CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt */
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2	"> "
 
-#define	CFG_CBSIZE		256		/* Console I/O Buffer Size   */
-#define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
-#define	CFG_MAXARGS		16		/* max number of command args*/
+#define CFG_CBSIZE		256		/* Console I/O Buffer Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
+#define CFG_MAXARGS		16		/* max number of command args */
 
 #define CFG_MALLOC_LEN		128*1024

@@ -125,11 +123,11 @@
 
 #define CFG_MHZ			132
 
-#define CFG_HZ                  (CFG_MHZ * 1000000)
+#define CFG_HZ			(CFG_MHZ * 1000000)
 
-#define CFG_SDRAM_BASE		0x80000000     /* Cached addr */
+#define CFG_SDRAM_BASE		0x80000000	/* Cached addr */
 
-#define	CFG_LOAD_ADDR		0x81000000     /* default load address	*/
+#define CFG_LOAD_ADDR		0x81000000	/* default load address */
 
 #define CFG_MEMTEST_START	0x80100000
 #define CFG_MEMTEST_END		0x80800000

@@ -139,21 +137,22 @@
  */
 
 /* The following #defines are needed to get flash environment right */
-#define	CFG_MONITOR_BASE	TEXT_BASE
-#define	CFG_MONITOR_LEN		(192 << 10)
+#define CFG_MONITOR_BASE	TEXT_BASE
+#define CFG_MONITOR_LEN		(192 << 10)
 
 #define CFG_INIT_SP_OFFSET	0x400000
 
 /* We boot from this flash, selected with dip switch */
 #define CFG_FLASH_BASE		0xbfc00000
 
-#define	CFG_ENV_IS_NOWHERE	1
+#define CFG_ENV_IS_NOWHERE	1
 
-/* Address and size of Primary Environment Sector	*/
+/* Address and size of Primary Environment Sector */
 #define CFG_ENV_SIZE		0x10000
+
 #undef CONFIG_NET_MULTI
 
-#define MEM_SIZE 128
+#define MEM_SIZE		128
 
 #undef CONFIG_MEMSIZE_IN_BYTES

@@ -164,4 +163,4 @@
 #define CFG_ICACHE_SIZE		16384
 #define CFG_CACHELINE_SIZE	32
 
-#endif	/* __CONFIG_H */
+#endif /* __CONFIG_H */

Wolfgang Denk

2008-04-22 15:32 UTC #10 lore raw

PATCH 1/2 qemu-mips: Cleanup whiespaces, tab indentations, etc.

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

No functional change.
Signed-off-by Shinya Kuribayashi <[email protected]>
---
 include/configs/qemu-mips.h |   65 +++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 33 deletions(-)
include/configs/qemu-mips.h +0 -0
index e164019..be00356 100644

include/configs/qemu-mips.h line 15

Quoted 5 lines

include/configs/qemu-mips.h +1 -1

@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

Why are you changing this? It is a good old tradition of typesetters to user wieder horizontal spacing after a full stop.

See for example the file COPYING which does this consequently.

Please leave this as is.

Best regards,

Wolfgang Denk

Signature · 6 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
"...this does not mean that some of us should not want, in  a  rather
dispassionate sort of way, to put a bullet through csh's head."
                   - Larry Wall in <[email protected]>

Shinya Kuribayashi

2008-04-22 15:35 UTC #11 lore raw

PATCH 1/2 qemu-mips: Cleanup whiespaces, tab indentations, etc.

Quoted 10 lines · Wolfgang Denk

Review line 15
Quoted 6 lines
(quoted diff) +1 -1
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Why are you changing this? It is a good old tradition of typesetters to user wieder horizontal spacing after a full stop.

Quoted 3 lines

See for example the file COPYING which does this consequently.
Please leave this as is.

Didn't know that, sorry. Patch revised.

================================>

[MIPS] qemu-mips: Cleanup whiespaces, tab indentations, etc.

No functional change.

Signed-off-by Shinya Kuribayashi <[email protected]>

---

 include/configs/qemu-mips.h |   63 +++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 32 deletions(-)

include/configs/qemu-mips.h +31 ~~-32~~

index e164019..c91525e 100644
@@ -28,25 +28,25 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MIPS32		1  /* MIPS32 CPU core	*/
-#define CONFIG_QEMU_MIPS        1
+#define CONFIG_MIPS32		1	/* MIPS32 CPU core */
+#define CONFIG_QEMU_MIPS	1
 #define CONFIG_MISC_INIT_R
 
 /*IP address is default used by Qemu*/
-#define CONFIG_IPADDR		10.0.2.15    	     /* Our IP address */
-#define CONFIG_SERVERIP		10.0.2.2	     /* Server IP address*/
+#define CONFIG_IPADDR		10.0.2.15	/* Our IP address */
+#define CONFIG_SERVERIP		10.0.2.2	/* Server IP address */
 
-#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds	*/
+#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds */
 
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
-#define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
-#undef	CONFIG_BOOTARGS
+#define CONFIG_TIMESTAMP		/* Print image info with timestamp */
+#undef CONFIG_BOOTARGS
 
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define CONFIG_EXTRA_ENV_SETTINGS					\
 	"addmisc=setenv bootargs ${bootargs} "				\
 		"console=ttyS0,${baudrate} "				\
 		"panic=1\0"						\

@@ -56,7 +56,6 @@
 
 #define CONFIG_BOOTCOMMAND	"bootp;bootelf"
 
-
 /*
  * BOOTP options
  */

@@ -65,7 +64,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */

@@ -74,10 +72,10 @@
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef  CONFIG_CMD_IMLS
-#undef  CONFIG_CMD_FLASH
-#undef  CONFIG_CMD_LOADB
-#undef  CONFIG_CMD_LOADS
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000

@@ -86,15 +84,15 @@
 #define CFG_NO_FLASH
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
-#define CFG_NS16550_REG_SIZE    1
-#define CFG_NS16550_CLK         115200
-#define CFG_NS16550_COM1        (0xb40003f8)
+#define CFG_NS16550_REG_SIZE	1
+#define CFG_NS16550_CLK		115200
+#define CFG_NS16550_COM1	(0xb40003f8)
 #define CONFIG_CONS_INDEX	1
 
 #define CONFIG_CMD_IDE
 #define CONFIG_DOS_PARTITION
 
-#define CFG_IDE_MAXBUS	2
+#define CFG_IDE_MAXBUS		2
 #define CFG_ATA_IDE0_OFFSET	(0x1f0)
 #define CFG_ATA_IDE1_OFFSET	(0x170)
 #define CFG_ATA_DATA_OFFSET	(0)

@@ -106,18 +104,18 @@
 /*
  * Miscellaneous configurable options
  */
-#define	CFG_LONGHELP				/* undef to save memory      */
+#define CFG_LONGHELP				/* undef to save memory */
 
-#define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt    */
+#define CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt */
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2	"> "
 
-#define	CFG_CBSIZE		256		/* Console I/O Buffer Size   */
-#define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
-#define	CFG_MAXARGS		16		/* max number of command args*/
+#define CFG_CBSIZE		256		/* Console I/O Buffer Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
+#define CFG_MAXARGS		16		/* max number of command args */
 
 #define CFG_MALLOC_LEN		128*1024

@@ -125,11 +123,11 @@
 
 #define CFG_MHZ			132
 
-#define CFG_HZ                  (CFG_MHZ * 1000000)
+#define CFG_HZ			(CFG_MHZ * 1000000)
 
-#define CFG_SDRAM_BASE		0x80000000     /* Cached addr */
+#define CFG_SDRAM_BASE		0x80000000	/* Cached addr */
 
-#define	CFG_LOAD_ADDR		0x81000000     /* default load address	*/
+#define CFG_LOAD_ADDR		0x81000000	/* default load address */
 
 #define CFG_MEMTEST_START	0x80100000
 #define CFG_MEMTEST_END		0x80800000

@@ -139,21 +137,22 @@
  */
 
 /* The following #defines are needed to get flash environment right */
-#define	CFG_MONITOR_BASE	TEXT_BASE
-#define	CFG_MONITOR_LEN		(192 << 10)
+#define CFG_MONITOR_BASE	TEXT_BASE
+#define CFG_MONITOR_LEN		(192 << 10)
 
 #define CFG_INIT_SP_OFFSET	0x400000
 
 /* We boot from this flash, selected with dip switch */
 #define CFG_FLASH_BASE		0xbfc00000
 
-#define	CFG_ENV_IS_NOWHERE	1
+#define CFG_ENV_IS_NOWHERE	1
 
-/* Address and size of Primary Environment Sector	*/
+/* Address and size of Primary Environment Sector */
 #define CFG_ENV_SIZE		0x10000
+
 #undef CONFIG_NET_MULTI
 
-#define MEM_SIZE 128
+#define MEM_SIZE		128
 
 #undef CONFIG_MEMSIZE_IN_BYTES

@@ -164,4 +163,4 @@
 #define CFG_ICACHE_SIZE		16384
 #define CFG_CACHELINE_SIZE	32
 
-#endif	/* __CONFIG_H */
+#endif /* __CONFIG_H */

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-22 20:50 UTC #12 lore raw

PATCH 1/2 qemu-mips: Cleanup whiespaces, tab indentations, etc.

In reply to Wolfgang Denk

Quoted 10 lines · Wolfgang Denk

Quoted 9 lines · In message <[email protected]> you wrote:
No functional change.
Signed-off-by Shinya Kuribayashi <[email protected]>
---
 include/configs/qemu-mips.h |   65 +++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 33 deletions(-)

Quoted 9 lines

include/configs/qemu-mips.h line 15

Quoted 9 lines

include/configs/qemu-mips.h +0 -1

index e164019..be00356 100644
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

Please add the sof of the first author of the patch from who you deriverd.

As example, I've done the same for the NE2000 fix.

Best Regards,
J.

Shinya Kuribayashi

2008-04-23 02:02 UTC #13 lore raw

PATCH 1/2 qemu-mips: Cleanup whiespaces, tab indentations, etc.

Quoted 2 lines · Jean-Christophe PLAGNIOL-VILLARD

Please add the sof of the first author of the patch from who you deriverd.

Sorry for that. Patch revised.

================================>

[MIPS] qemu-mips.h: Cleanup whiespaces, tab indentations, etc.

No functional change.

This patch was originally submitted by Jean-Christophe PLAGNIOL-VILLARD. Then I re-created from scratch, and changed more lines than the original.

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Signed-off-by Shinya Kuribayashi <[email protected]>

---

 include/configs/qemu-mips.h |   65 +++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 33 deletions(-)

include/configs/qemu-mips.h +32 ~~-33~~

index e164019..931eccc 100644
@@ -22,31 +22,31 @@
  */
 
 /*
- * This file contains the configuration parameters for the dbau1x00 board.
+ * This file contains the configuration parameters for qemu-mips target.
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MIPS32		1  /* MIPS32 CPU core	*/
-#define CONFIG_QEMU_MIPS        1
+#define CONFIG_MIPS32		1	/* MIPS32 CPU core */
+#define CONFIG_QEMU_MIPS	1
 #define CONFIG_MISC_INIT_R
 
 /*IP address is default used by Qemu*/
-#define CONFIG_IPADDR		10.0.2.15    	     /* Our IP address */
-#define CONFIG_SERVERIP		10.0.2.2	     /* Server IP address*/
+#define CONFIG_IPADDR		10.0.2.15	/* Our IP address */
+#define CONFIG_SERVERIP		10.0.2.2	/* Server IP address */
 
-#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds	*/
+#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds */
 
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
-#define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
-#undef	CONFIG_BOOTARGS
+#define CONFIG_TIMESTAMP		/* Print image info with timestamp */
+#undef CONFIG_BOOTARGS
 
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define CONFIG_EXTRA_ENV_SETTINGS					\
 	"addmisc=setenv bootargs ${bootargs} "				\
 		"console=ttyS0,${baudrate} "				\
 		"panic=1\0"						\

@@ -56,7 +56,6 @@
 
 #define CONFIG_BOOTCOMMAND	"bootp;bootelf"
 
-
 /*
  * BOOTP options
  */

@@ -65,7 +64,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */

@@ -74,10 +72,10 @@
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef  CONFIG_CMD_IMLS
-#undef  CONFIG_CMD_FLASH
-#undef  CONFIG_CMD_LOADB
-#undef  CONFIG_CMD_LOADS
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000

@@ -86,15 +84,15 @@
 #define CFG_NO_FLASH
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
-#define CFG_NS16550_REG_SIZE    1
-#define CFG_NS16550_CLK         115200
-#define CFG_NS16550_COM1        (0xb40003f8)
+#define CFG_NS16550_REG_SIZE	1
+#define CFG_NS16550_CLK		115200
+#define CFG_NS16550_COM1	(0xb40003f8)
 #define CONFIG_CONS_INDEX	1
 
 #define CONFIG_CMD_IDE
 #define CONFIG_DOS_PARTITION
 
-#define CFG_IDE_MAXBUS	2
+#define CFG_IDE_MAXBUS		2
 #define CFG_ATA_IDE0_OFFSET	(0x1f0)
 #define CFG_ATA_IDE1_OFFSET	(0x170)
 #define CFG_ATA_DATA_OFFSET	(0)

@@ -106,18 +104,18 @@
 /*
  * Miscellaneous configurable options
  */
-#define	CFG_LONGHELP				/* undef to save memory      */
+#define CFG_LONGHELP				/* undef to save memory */
 
-#define	CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt    */
+#define CFG_PROMPT		"qemu-mips # "	/* Monitor Command Prompt */
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2	"> "
 
-#define	CFG_CBSIZE		256		/* Console I/O Buffer Size   */
-#define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
-#define	CFG_MAXARGS		16		/* max number of command args*/
+#define CFG_CBSIZE		256		/* Console I/O Buffer Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */
+#define CFG_MAXARGS		16		/* max number of command args */
 
 #define CFG_MALLOC_LEN		128*1024

@@ -125,11 +123,11 @@
 
 #define CFG_MHZ			132
 
-#define CFG_HZ                  (CFG_MHZ * 1000000)
+#define CFG_HZ			(CFG_MHZ * 1000000)
 
-#define CFG_SDRAM_BASE		0x80000000     /* Cached addr */
+#define CFG_SDRAM_BASE		0x80000000	/* Cached addr */
 
-#define	CFG_LOAD_ADDR		0x81000000     /* default load address	*/
+#define CFG_LOAD_ADDR		0x81000000	/* default load address */
 
 #define CFG_MEMTEST_START	0x80100000
 #define CFG_MEMTEST_END		0x80800000

@@ -139,21 +137,22 @@
  */
 
 /* The following #defines are needed to get flash environment right */
-#define	CFG_MONITOR_BASE	TEXT_BASE
-#define	CFG_MONITOR_LEN		(192 << 10)
+#define CFG_MONITOR_BASE	TEXT_BASE
+#define CFG_MONITOR_LEN		(192 << 10)
 
 #define CFG_INIT_SP_OFFSET	0x400000
 
 /* We boot from this flash, selected with dip switch */
 #define CFG_FLASH_BASE		0xbfc00000
 
-#define	CFG_ENV_IS_NOWHERE	1
+#define CFG_ENV_IS_NOWHERE	1
 
-/* Address and size of Primary Environment Sector	*/
+/* Address and size of Primary Environment Sector */
 #define CFG_ENV_SIZE		0x10000
+
 #undef CONFIG_NET_MULTI
 
-#define MEM_SIZE 128
+#define MEM_SIZE		128
 
 #undef CONFIG_MEMSIZE_IN_BYTES

@@ -164,4 +163,4 @@
 #define CFG_ICACHE_SIZE		16384
 #define CFG_CACHELINE_SIZE	32
 
-#endif	/* __CONFIG_H */
+#endif /* __CONFIG_H */

Signature · 2 lines

Shinya Kuribayashi
NEC Electronics

Wolfgang Denk

Applied

2008-04-25 07:16 UTC #14 lore raw

PATCH 1/2 qemu-mips: Cleanup whiespaces, tab indentations, etc.

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

Quoted 2 lines · Jean-Christophe PLAGNIOL-VILLARD
Please add the sof of the first author of the patch from who you deriverd.
Sorry for that. Patch revised.
================================>
[MIPS] qemu-mips.h: Cleanup whiespaces, tab indentations, etc.
No functional change.
This patch was originally submitted by Jean-Christophe PLAGNIOL-VILLARD. Then I re-created from scratch, and changed more lines than the original.

Quoted 6 lines

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by Shinya Kuribayashi <[email protected]>
---
 include/configs/qemu-mips.h |   65 +++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 33 deletions(-)

Applied, 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
If a train station is a place where a train stops,
                                           then what's a workstation?

Shinya Kuribayashi

2008-04-22 15:11 UTC #15 lore raw

PATCH 2/2 qemu-mips.h: Add CFI support

In reply to Jean-Christophe PLAGNIOL-VILLARD

From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

CONFIG_ENV_OVERWRITE is also added.

This patch is originally created by Jean-Christophe PLAGNIOL-VILLARD.

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Signed-off-by Shinya Kuribayashi <[email protected]>

---

 include/configs/qemu-mips.h |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

include/configs/qemu-mips.h +10 -5

index be00356..46bfee7 100644
@@ -72,8 +72,6 @@
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_LOADB
 #undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP

@@ -81,7 +79,6 @@
 #define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_NE2000_BASE	(0xb4000300)
 
-#define CFG_NO_FLASH
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
 #define CFG_NS16550_REG_SIZE	1

@@ -144,11 +141,19 @@
 
 /* We boot from this flash, selected with dip switch */
 #define CFG_FLASH_BASE		0xbfc00000
+#define CFG_MAX_FLASH_BANKS	1
+#define CFG_MAX_FLASH_SECT	128
+#define CFG_FLASH_CFI		1	/* Flash memory is CFI compliant */
+#define CFG_FLASH_CFI_DRIVER	1
+#define CFG_FLASH_USE_BUFFER_WRITE	1
 
-#define CFG_ENV_IS_NOWHERE	1
+#define CFG_ENV_IS_IN_FLASH	1
+#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x40000)
 
 /* Address and size of Primary Environment Sector */
-#define CFG_ENV_SIZE		0x10000
+#define CFG_ENV_SIZE		0x8000
+
+#define CONFIG_ENV_OVERWRITE	1
 
 #undef CONFIG_NET_MULTI

Wolfgang Denk

Applied

2008-04-25 07:16 UTC #16 lore raw

PATCH 2/2 qemu-mips.h: Add CFI support

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

From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
CONFIG_ENV_OVERWRITE is also added.

Quoted 8 lines

This patch is originally created by Jean-Christophe PLAGNIOL-VILLARD.
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by Shinya Kuribayashi <[email protected]>
---
 include/configs/qemu-mips.h |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 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 will also, for an appropriate fee, certify that  your  keyboard  is
object-oriented,  and  that  the bits on your hard disk are template-
compatible.            - Jeffrey S. Haemer in <[email protected]>

Wolfgang Denk

2008-04-21 19:24 UTC #17 lore raw

cover NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

In reply to Jean-Christophe PLAGNIOL-VILLARD

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

Move non-inlied functions into specific drivers file Set get_prom as weak
Coding Style Cleanup

Please split in two (3?) separate patches. 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
"Logic and practical information do not seem to apply here."
"You admit that?"
"To deny the facts would be illogical, Doctor"
	-- Spock and McCoy, "A Piece of the Action", stardate unknown

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-22 06:28 UTC #18 lore raw

cover NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

Quoted 7 lines · Wolfgang Denk

Quoted 4 lines · In message <[email protected]> you wrote:
Move non-inlied functions into specific drivers file Set get_prom as weak
Coding Style Cleanup
Please split in two (3?) separate patches. Thanks.

We could separate the Coding style in an other patch but if possible i'll let it in the same patch.

Seperate the moving of non-inlined functions and the setting of get_prom as weak is ine block to fix the regression

Best Regards,
J.

Wolfgang Denk

2008-04-22 10:02 UTC #19 lore raw

cover NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

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

Quoted 7 lines
Quoted 5 lines
Move non-inlied functions into specific drivers file Set get_prom as weak
Coding Style Cleanup
Please split in two (3?) separate patches. Thanks.
We could separate the Coding style in an other patch but if possible i'll let it in the same patch.

Please split it up, because otherwise the changes are really difficult to see.

Quoted 2 lines

Seperate the moving of non-inlined functions and the setting of get_prom as weak is ine block to fix the regression

OK.

Best regards,

Wolfgang Denk

Signature · 4 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
It's a small world, but I wouldn't want to paint it.

A message that is not in the archive (sent off-list or not yet received): [email protected]

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-24 05:43 UTC #21 lore raw

PATCH v2 1/1 NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

Move non-inlied functions into specific drivers file Set get_prom as weak

Coding Style Cleanup

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Signed-off-by Vlad Lungu <[email protected]>

---
 drivers/net/Makefile      |    5 +-
 drivers/net/ax88796.c     |  156 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/ax88796.h     |  134 --------------------------------------
 drivers/net/ne2000.c      |   94 ++++++++++++++++++++++++++-
 drivers/net/ne2000.h      |   87 +-------------------------
 drivers/net/ne2000_base.h |    1 -
 6 files changed, 252 insertions(+), 225 deletions(-)
 create mode 100644 drivers/net/ax88796.c

drivers/net/Makefile +4 -1

index d5e413b..4131aad 100644
@@ -42,7 +42,10 @@ COBJS-y += lan91c96.o
 COBJS-y += macb.o
 COBJS-y += mcffec.o
 COBJS-y += natsemi.o
-COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o
+ifeq ($(CONFIG_DRIVER_NE2000),y)
+COBJS-y += ne2000.o
+COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o
+endif
 COBJS-y += netarm_eth.o
 COBJS-y += netconsole.o
 COBJS-y += ns7520_eth.o

drivers/net/ax88796.c new file +156 -0

156 lines not on this page · raw message

drivers/net/ax88796.h +0 ~~-134~~

139 lines not on this page · raw message

drivers/net/ne2000.c +91 -3

118 lines not on this page · raw message

drivers/net/ne2000.h +1 ~~-86~~

97 lines not on this page · raw message

drivers/net/ne2000_base.h +0 -1

index 990d748..948b290 100644
@@ -122,7 +122,6 @@ typedef struct dp83902a_priv_data {
 /*
  * Some forward declarations
  */
-int get_prom( u8* mac_addr);
 static void dp83902a_poll(void);
 
 /* ------------------------------------------------------------------------ */

Signature · 1 line

1.5.4.5

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-24 05:57 UTC #22 lore raw

v2 cover NE2000: coding style cleanup

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
Fix coding style in drivers/net/ax88796.h too

 drivers/net/ax88796.h     |   46 ++--
 drivers/net/ne2000.c      |  276 ++++++++++++----------
 drivers/net/ne2000.h      |   30 ++--
 drivers/net/ne2000_base.h |  567 +++++++++++++++++++++++----------------------
 4 files changed, 474 insertions(+), 445 deletions(-)

rewrite drivers/net/ne2000_base.h (65%)

drivers/net/ax88796.h +23 ~~-23~~

index 069ae80..0e6f8a2 100644
@@ -23,24 +23,24 @@
 #ifndef __DRIVERS_AX88796L_H__
 #define __DRIVERS_AX88796L_H__
 
-#define DP_DATA     (0x10 << 1)
-#define START_PG    0x40    /* First page of TX buffer */
-#define START_PG2   0x48
-#define STOP_PG     0x80    /* Last page +1 of RX ring */
-#define TX_PAGES    12
-#define RX_START    (START_PG+TX_PAGES)
-#define RX_END      STOP_PG
+#define DP_DATA		(0x10 << 1)
+#define START_PG	0x40	/* First page of TX buffer */
+#define START_PG2	0x48
+#define STOP_PG		0x80	/* Last page +1 of RX ring */
+#define TX_PAGES	12
+#define RX_START	(START_PG+TX_PAGES)
+#define RX_END		STOP_PG
 
 #define AX88796L_BASE_ADDRESS	CONFIG_DRIVER_NE2000_BASE
-#define AX88796L_BYTE_ACCESS    0x00001000
-#define AX88796L_OFFSET         0x00000400
-#define AX88796L_ADDRESS_BYTE   AX88796L_BASE_ADDRESS + \
+#define AX88796L_BYTE_ACCESS	0x00001000
+#define AX88796L_OFFSET		0x00000400
+#define AX88796L_ADDRESS_BYTE	AX88796L_BASE_ADDRESS + \
 		AX88796L_BYTE_ACCESS + AX88796L_OFFSET
-#define AX88796L_REG_MEMR       AX88796L_ADDRESS_BYTE + (0x14<<1)
-#define AX88796L_REG_CR         AX88796L_ADDRESS_BYTE + (0x00<<1)
+#define AX88796L_REG_MEMR	AX88796L_ADDRESS_BYTE + (0x14<<1)
+#define AX88796L_REG_CR		AX88796L_ADDRESS_BYTE + (0x00<<1)
 
 #define AX88796L_CR		(*(vu_short *)(AX88796L_REG_CR))
-#define AX88796L_MEMR	(*(vu_short *)(AX88796L_REG_MEMR))
+#define AX88796L_MEMR		(*(vu_short *)(AX88796L_REG_MEMR))
 
 #define EECS_HIGH		(AX88796L_MEMR |= 0x10)
 #define EECS_LOW		(AX88796L_MEMR &= 0xef)

@@ -53,7 +53,7 @@
 #define PAGE0_SET		(AX88796L_CR &= 0x3f)
 #define PAGE1_SET		(AX88796L_CR = (AX88796L_CR & 0x3f) | 0x40)
 
-#define BIT_DUMMY		0
+#define BIT_DUMMY	0
 #define MAC_EEP_READ	1
 #define MAC_EEP_WRITE	2
 #define MAC_EEP_ERACE	3

@@ -62,20 +62,20 @@
 
 /* R7780MP Specific code */
 #if defined(CONFIG_R7780MP)
-#define ISA_OFFSET  0x1400
-#define DP_IN(_b_, _o_, _d_)  (_d_) = \
+#define ISA_OFFSET	0x1400
+#define DP_IN(_b_, _o_, _d_)	(_d_) = \
 	*( (vu_short *) ((_b_) + ((_o_) * 2) + ISA_OFFSET))
 #define DP_OUT(_b_, _o_, _d_) \
 	*((vu_short *)((_b_) + ((_o_) * 2) + ISA_OFFSET)) = (_d_)
-#define DP_IN_DATA(_b_, _d_)  (_d_) = *( (vu_short *) ((_b_) + ISA_OFFSET))
-#define DP_OUT_DATA(_b_, _d_) *( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
+#define DP_IN_DATA(_b_, _d_)	(_d_) = *( (vu_short *) ((_b_) + ISA_OFFSET))
+#define DP_OUT_DATA(_b_, _d_)	*( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
 #else
 /* Please change for your target boards */
-#define ISA_OFFSET  0x0000
-#define DP_IN(_b_, _o_, _d_)  (_d_) = *( (vu_short *)((_b_)+(_o_ )+ISA_OFFSET))
-#define DP_OUT(_b_, _o_, _d_) *((vu_short *)((_b_)+(_o_)+ISA_OFFSET)) = (_d_)
-#define DP_IN_DATA(_b_, _d_)  (_d_) = *( (vu_short *) ((_b_)+ISA_OFFSET))
-#define DP_OUT_DATA(_b_, _d_) *( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
+#define ISA_OFFSET	0x0000
+#define DP_IN(_b_, _o_, _d_)	(_d_) = *( (vu_short *)((_b_)+(_o_ )+ISA_OFFSET))
+#define DP_OUT(_b_, _o_, _d_)	*((vu_short *)((_b_)+(_o_)+ISA_OFFSET)) = (_d_)
+#define DP_IN_DATA(_b_, _d_)	(_d_) = *( (vu_short *) ((_b_)+ISA_OFFSET))
+#define DP_OUT_DATA(_b_, _d_)	*( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
 #endif

drivers/net/ne2000.c +151 ~~-125~~

548 lines not on this page · raw message

drivers/net/ne2000.h +15 ~~-15~~

index d324a00..6049482 100644
@@ -1,5 +1,5 @@
 /*
-Ported to U-Boot  by Christian Pellegrin <[email protected]>
+Ported to U-Boot by Christian Pellegrin <[email protected]>
 
 Based on sources from the Linux kernel (pcnet_cs.c, 8390.h) and
 eCOS(if_dp83902a.c, if_dp83902a.h). Both of these 2 wonderful world

@@ -7,9 +7,9 @@ are GPL, so this is, of course, GPL.
 
 ==========================================================================
 
-      dev/dp83902a.h
+	dev/dp83902a.h
 
-      National Semiconductor DP83902a ethernet chip
+	National Semiconductor DP83902a ethernet chip
 
 ==========================================================================
 ####ECOSGPLCOPYRIGHTBEGIN####

@@ -57,9 +57,9 @@ are GPL, so this is, of course, GPL.
 ==========================================================================
 #####DESCRIPTIONBEGIN####
 
- Author(s):    gthomas
- Contributors: gthomas, jskov
- Date:         2001-06-13
+ Author(s):	gthomas
+ Contributors:	gthomas, jskov
+ Date:		2001-06-13
  Purpose:
  Description:

@@ -79,17 +79,17 @@ are GPL, so this is, of course, GPL.
 /* Enable NE2000 basic init function */
 #define NE2000_BASIC_INIT
 
-#define DP_DATA     0x10
-#define START_PG    0x50    /* First page of TX buffer */
-#define STOP_PG     0x80    /* Last page +1 of RX ring */
+#define DP_DATA		0x10
+#define START_PG	0x50	/* First page of TX buffer */
+#define STOP_PG		0x80	/* Last page +1 of RX ring */
 
-#define RX_START    0x50
-#define RX_END      0x80
+#define RX_START	0x50
+#define RX_END		0x80
 
-#define DP_IN(_b_, _o_, _d_)  (_d_) = *( (vu_char *) ((_b_)+(_o_)))
-#define DP_OUT(_b_, _o_, _d_) *( (vu_char *) ((_b_)+(_o_))) = (_d_)
-#define DP_IN_DATA(_b_, _d_)  (_d_) = *( (vu_char *) ((_b_)))
-#define DP_OUT_DATA(_b_, _d_) *( (vu_char *) ((_b_))) = (_d_)
+#define DP_IN(_b_, _o_, _d_)	(_d_) = *( (vu_char *) ((_b_)+(_o_)))
+#define DP_OUT(_b_, _o_, _d_)	*( (vu_char *) ((_b_)+(_o_))) = (_d_)
+#define DP_IN_DATA(_b_, _d_)	(_d_) = *( (vu_char *) ((_b_)))
+#define DP_OUT_DATA(_b_, _d_)	*( (vu_char *) ((_b_))) = (_d_)
 
 static void pcnet_reset_8390(void)
 {

drivers/net/ne2000_base.h +285 ~~-282~~

567 lines not on this page · raw message

Signature · 1 line

1.5.4.5

Jean-Christophe PLAGNIOL-VILLARD

author

2008-04-24 05:57 UTC #23 lore raw

PATCH v2 1/1 NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

Move non-inlied functions into specific drivers file Set get_prom as weak

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Signed-off-by Vlad Lungu <[email protected]>

---
Fix comment

 drivers/net/Makefile      |    5 +-
 drivers/net/ax88796.c     |  156 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/ax88796.h     |  136 ---------------------------------------
 drivers/net/ne2000.c      |   94 ++++++++++++++++++++++++++-
 drivers/net/ne2000.h      |   87 +-------------------------
 drivers/net/ne2000_base.h |    1 -
 6 files changed, 252 insertions(+), 227 deletions(-)
 create mode 100644 drivers/net/ax88796.c

drivers/net/Makefile +4 -1

index d5e413b..4131aad 100644
@@ -42,7 +42,10 @@ COBJS-y += lan91c96.o
 COBJS-y += macb.o
 COBJS-y += mcffec.o
 COBJS-y += natsemi.o
-COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o
+ifeq ($(CONFIG_DRIVER_NE2000),y)
+COBJS-y += ne2000.o
+COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o
+endif
 COBJS-y += netarm_eth.o
 COBJS-y += netconsole.o
 COBJS-y += ns7520_eth.o

drivers/net/ax88796.c new file +156 -0

156 lines not on this page · raw message

drivers/net/ax88796.h +0 ~~-136~~

140 lines not on this page · raw message

drivers/net/ne2000.c +91 -3

118 lines not on this page · raw message

drivers/net/ne2000.h +1 ~~-86~~

97 lines not on this page · raw message

drivers/net/ne2000_base.h +0 -1

index 990d748..948b290 100644
@@ -122,7 +122,6 @@ typedef struct dp83902a_priv_data {
 /*
  * Some forward declarations
  */
-int get_prom( u8* mac_addr);
 static void dp83902a_poll(void);
 
 /* ------------------------------------------------------------------------ */

Signature · 1 line

1.5.4.5

Wolfgang Denk

Applied

2008-04-25 07:16 UTC #24 lore raw

v2 cover NE2000: coding style cleanup

In reply to Jean-Christophe PLAGNIOL-VILLARD

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

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
---
Fix coding style in drivers/net/ax88796.h too
 drivers/net/ax88796.h     |   46 ++--
 drivers/net/ne2000.c      |  276 ++++++++++++----------
 drivers/net/ne2000.h      |   30 ++--
 drivers/net/ne2000_base.h |  567 +++++++++++++++++++++++----------------------
 4 files changed, 474 insertions(+), 445 deletions(-)
rewrite drivers/net/ne2000_base.h (65%)

Applied, 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
It seems intuitively obvious to me, which  means  that  it  might  be
wrong.                                                 -- Chris Torek