From b6b4684546809f89c8bac72863ca49b5fd8ac0cd Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Thu, 5 Jul 2007 11:12:16 +0200
Subject: Minor coding style cleanup. Update CHANGELOG.

---
 include/configs/MPC8260ADS.h  |  2 --
 include/configs/MPC8266ADS.h  |  9 ---------
 include/configs/TQM834x.h     |  6 ------
 include/configs/acadia.h      |  3 ---
 include/configs/atstk1002.h   |  3 ---
 include/configs/bf537-stamp.h |  5 -----
 include/configs/cpci5200.h    |  3 ---
 include/configs/csb472.h      |  3 ---
 include/configs/ml401.h       |  4 ----
 include/configs/sc520_cdp.h   | 11 -----------
 10 files changed, 49 deletions(-)

(limited to 'include/configs')

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index aaecd38..eceeb5e 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -246,8 +246,6 @@
 #endif /* CONFIG_ADSTYPE >= CFG_PQ2FADS */
 
 
-
-
 #define CONFIG_BOOTDELAY	5		/* autoboot after 5 seconds */
 #define CONFIG_BOOTCOMMAND	"bootm fff80000"	/* autoboot command */
 #define CONFIG_BOOTARGS		"root=/dev/mtdblock2"
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index d6dd73b..306ee49 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -141,11 +141,9 @@
  */
 #define SPD_EEPROM_ADDRESS	0x50
 
-
 #define CONFIG_8260_CLKIN	66000000	/* in Hz */
 #define CONFIG_BAUDRATE		115200
 
-
 /*
  * Command line configuration.
  */
@@ -214,8 +212,6 @@
 				 CONFIG_BOOTP_BOOTFILESIZE | \
 				 CONFIG_BOOTP_DNS)
 
-
-
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
 
 #if defined(CONFIG_CMD_KGDB)
@@ -285,7 +281,6 @@
 
 #define SDRAM_SPD_ADDR 0x50
 
-
 /*-----------------------------------------------------------------------
  * BR2,BR3 - Base Register
  *     Ref: Section 10.3.1 on page 10-14
@@ -383,7 +378,6 @@
 #error "INVALID SDRAM CONFIGURATION"
 #endif
 
-
 #define RS232EN_1		0x02000002
 #define RS232EN_2		0x01000001
 #define FETHIEN			0x08000008
@@ -395,7 +389,6 @@
 #define CFG_GBL_DATA_OFFSET	(CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET	CFG_GBL_DATA_OFFSET
 
-
 /* Use this HRCW for booting from address 0xfe00000 (JP3 in setting 1-2)  */
 /* 0x0EB2B645 */
 #define CFG_HRCW_MASTER (( HRCW_BPS11 | HRCW_CIP )				|\
@@ -452,13 +445,11 @@
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
 
-
 #define CFG_CACHELINE_SIZE	32	/* For MPC8260 CPU */
 #if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT	5	/* log base 2 of the above value */
 #endif
 
-
 /*-----------------------------------------------------------------------
  * HIDx - Hardware Implementation-dependent Registers			 2-11
  *-----------------------------------------------------------------------
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 9628703..684cb30 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -281,7 +281,6 @@ extern int tqm834x_num_flash_banks;
 #define CFG_PCI1_IO_PHYS        CFG_PCI1_IO_BASE
 #define CFG_PCI1_IO_SIZE        0x1000000       /* 16M */
 
-
 #undef CONFIG_EEPRO100
 #define CONFIG_EEPRO100
 #undef CONFIG_TULIP
@@ -316,7 +315,6 @@ extern int tqm834x_num_flash_banks;
 #define CONFIG_LOADS_ECHO		1	/* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE		1	/* allow baudrate change */
 
-
 /*
  * Command line configuration.
  */
@@ -339,10 +337,6 @@ extern int tqm834x_num_flash_banks;
     #undef CONFIG_CMD_LOADS
 #endif
 
-
-
-
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 3f5d025..5bd8ac6 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -299,7 +299,6 @@
 
 #define CONFIG_SUPPORT_VFAT
 
-
 /*
  * Command line configuration.
  */
@@ -331,8 +330,6 @@
 #undef CONFIG_CMD_IMLS
 #endif
 
-
-
 #undef CONFIG_WATCHDOG					/* watchdog disabled		*/
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 90fe8a5..de2fd31 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -111,7 +111,6 @@
 #define CONFIG_BOOTP_MASK		(CONFIG_BOOTP_SUBNETMASK	\
 					 | CONFIG_BOOTP_GATEWAY)
 
-
 /*
  * Command line configuration.
  */
@@ -129,8 +128,6 @@
 #undef CONFIG_CMD_SETGETDCR
 #undef CONFIG_CMD_XIMG
 
-
-
 #define CONFIG_ATMEL_USART		1
 #define CONFIG_MACB			1
 #define CONFIG_PIO2			1
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 1c23871..36f55d1 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -166,8 +166,6 @@
 #define CONFIG_NETCONSOLE	1
 #define CONFIG_NET_MULTI	1
 
-
-
 /*
  * Command line configuration.
  */
@@ -196,7 +194,6 @@
 
 #endif
 
-
 #if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT)
 
 #define CONFIG_CMD_DHCP
@@ -209,8 +206,6 @@
 #endif
 
 
-
-
 #define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw console=ttyBF0,57600"
 #define CONFIG_LOADADDR	0x1000000
 
diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index efb89bf..c4ed19a 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -99,7 +99,6 @@
 #define CONFIG_USB_STORAGE
 #endif
 
-
 /*
  * Command line configuration.
  */
@@ -118,8 +117,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DATE
 
-
-
 #if (TEXT_BASE == 0xFF000000)	/* Boot low with 16 MB Flash */
 #   define CFG_LOWBOOT		1
 #   define CFG_LOWBOOT16	1
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 1fef94f7..316b1fe 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -80,8 +80,6 @@
 				  CONFIG_BOOTP_DNS2		| \
 				  CONFIG_BOOTP_BOOTFILESIZE	)
 
-
-
 /*
  * Command line configuration.
  */
@@ -98,7 +96,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
-
 /*
  * Serial download configuration
  *
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 9537008..6cfc947 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -145,8 +145,6 @@
 	#define	CFG_FLASH_PROTECTION		/* hardware flash protection */
 #endif /* !FLASH */
 
-
-
 /*
  * Command line configuration.
  */
@@ -181,8 +179,6 @@
 	#endif
 #endif
 
-
-
 #if defined(CONFIG_CMD_JFFS2)
 /* JFFS2 partitions */
 #define CONFIG_JFFS2_CMDLINE	/* mtdparts command line support */
diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index 1001342..8689be4 100644
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -64,10 +64,8 @@
  */
 #define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
 
-
 #define CONFIG_BAUDRATE		9600
 
-
 /*
  * Command line configuration.
  */
@@ -79,8 +77,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_EEPROM
 
-
-
 #define CONFIG_BOOTDELAY	15
 #define CONFIG_BOOTARGS    	"root=/dev/mtdblock0 console=ttyS0,9600"
 /* #define CONFIG_BOOTCOMMAND	"bootm 38000000" */
@@ -90,7 +86,6 @@
 #define CONFIG_KGDB_SER_INDEX	2		/* which serial port to use */
 #endif
 
-
 /*
  * Miscellaneous configurable options
  */
@@ -113,7 +108,6 @@
 						/* valid baudrates */
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
@@ -122,8 +116,6 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-
-
 #define CFG_MAX_FLASH_BANKS	3	/* max number of memory banks		*/
 #define CFG_MAX_FLASH_SECT	64	/* max number of sectors on one chip	*/
 
@@ -134,11 +126,9 @@
 #define CONFIG_SPI_EEPROM      /* Support for SPI EEPROMs (AT25128) */
 #define CONFIG_MW_EEPROM       /* Support for MicroWire EEPROMs (AT93LC46) */
 
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
-
 /* Environment in EEPROM */
 #define CFG_ENV_IS_IN_EEPROM   1
 #define CONFIG_SPI
@@ -218,7 +208,6 @@
 #define CONFIG_I8042_KBD
 #define CFG_ISA_IO 0
 
-
 /************************************************************
  * RTC
  ***********************************************************/
-- 
cgit v1.1


From e4dbe1b215f5c6c462e76909d240bd96472b84de Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Thu, 5 Jul 2007 17:56:27 +0200
Subject: Fixing some typos etc. introduced mainly by cfg patches.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 include/configs/MPC8260ADS.h |  4 ++--
 include/configs/Total5200.h  |  2 +-
 include/configs/ZPC1900.h    | 12 ++++++------
 include/configs/lwmon.h      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'include/configs')

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index eceeb5e..69d4c28 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -250,7 +250,7 @@
 #define CONFIG_BOOTCOMMAND	"bootm fff80000"	/* autoboot command */
 #define CONFIG_BOOTARGS		"root=/dev/mtdblock2"
 
-#if defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB) || (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #undef	CONFIG_KGDB_ON_SMC		/* define if kgdb on SMC */
 #define CONFIG_KGDB_ON_SCC		/* define if kgdb on SCC */
 #undef	CONFIG_KGDB_NONE		/* define if kgdb on something else */
@@ -268,7 +268,7 @@
 #define CFG_PROMPT_HUSH_PS2 "> "
 #define CFG_LONGHELP			/* undef to save memory	    */
 #define CFG_PROMPT	"=> "		/* Monitor Command Prompt   */
-#if defined(CONFIG & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB) || (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CFG_CBSIZE	1024		/* Console I/O Buffer Size  */
 #else
 #define CFG_CBSIZE	256			/* Console I/O Buffer Size  */
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index ba2daf7..2a1cb89 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -115,7 +115,7 @@
  */
 #include <config_cmd_default.h>
 
-#if definded(CONFIG_MPC5200)
+#if defined(CONFIG_MPC5200)
     #define CONFIG_CMD_PCI
 #endif
 
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index a5085cf..2b02fe7 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -248,18 +248,18 @@
 #define CFG_LSRT		0x0F
 #define CFG_MPTPR		0x4000
 
-#define CFG_PSDRAM_BR		CFG_SDRAM_BASE | 0x00000041
+#define CFG_PSDRAM_BR		(CFG_SDRAM_BASE | 0x00000041)
 #define CFG_PSDRAM_OR		0xFC0028C0
-#define CFG_LSDRAM_BR		CFG_LSDRAM_BASE | 0x00001861
+#define CFG_LSDRAM_BR		(CFG_LSDRAM_BASE | 0x00001861)
 #define CFG_LSDRAM_OR		0xFF803480
 
-#define CFG_BR0_PRELIM		CFG_FLASH_BASE | 0x00000801
+#define CFG_BR0_PRELIM		(CFG_FLASH_BASE | 0x00000801)
 #define CFG_OR0_PRELIM		0xFFE00856
-#define CFG_BR5_PRELIM		CFG_EEPROM | 0x00000801
+#define CFG_BR5_PRELIM		(CFG_EEPROM | 0x00000801)
 #define CFG_OR5_PRELIM		0xFFFF03F6
-#define CFG_BR6_PRELIM		CFG_FLSIMM_BASE | 0x00001801
+#define CFG_BR6_PRELIM		(CFG_FLSIMM_BASE | 0x00001801)
 #define CFG_OR6_PRELIM		0xFF000856
-#define CFG_BR7_PRELIM		CFG_BCSR | 0x00000801
+#define CFG_BR7_PRELIM		(CFG_BCSR | 0x00000801)
 #define CFG_OR7_PRELIM		0xFFFF83F6
 
 #define CFG_RESET_ADDRESS	0xC0000000
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 627bc9c..3dc7a8e 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -279,7 +279,7 @@
  */
 #define CFG_SDRAM_BASE		0x00000000
 #define CFG_FLASH_BASE		0x40000000
-#if defined(DEBUG) || defiend(CONFIG_CMD_IDE)
+#if defined(DEBUG) || defined(CONFIG_CMD_IDE)
 #define CFG_MONITOR_LEN		(256 << 10)	/* Reserve 256 kB for Monitor	*/
 #else
 #define CFG_MONITOR_LEN		(128 << 10)	/* Reserve 128 kB for Monitor	*/
-- 
cgit v1.1