[U-Boot-Users] [PATCH 1/2] qemu-mips: add CFI support and coding style cleanup

[Jean-Christophe PLAGNIOL-VILLARD]

add CONFIG_ENV_OVERWRITE

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index e164019..b775714 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -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
-- 
1.5.4.5