#define GPT_FREE_RUNNING               0xFFFF
 
 /* Timer, HZ specific defines */
-#define CONFIG_SPEAR_HZ                        (1000)
-#define CONFIG_SPEAR_HZ_CLOCK          (8300000)
+#define CONFIG_SPEAR_HZ                        1000
+#define CONFIG_SPEAR_HZ_CLOCK          8300000
 
 #endif
 
 #define CONFIG_I2C_CHIPADDRESS                 0x50
 
 /* Timer, HZ specific defines */
-#define CONFIG_SYS_HZ                          (1000)
+#define CONFIG_SYS_HZ                          1000
 
 /* Flash configuration */
 #if defined(CONFIG_FLASH_PNOR)
 #if defined(CONFIG_ST_SMI)
 
 #define CONFIG_SYS_MAX_FLASH_BANKS             2
-#define CONFIG_SYS_FLASH_BASE                  (0xF8000000)
-#define CONFIG_SYS_CS1_FLASH_BASE              (0xF9000000)
-#define CONFIG_SYS_FLASH_BANK_SIZE             (0x01000000)
+#define CONFIG_SYS_FLASH_BASE                  0xF8000000
+#define CONFIG_SYS_CS1_FLASH_BASE              0xF9000000
+#define CONFIG_SYS_FLASH_BANK_SIZE             0x01000000
 #define CONFIG_SYS_FLASH_ADDR_BASE             {CONFIG_SYS_FLASH_BASE, \
                                                CONFIG_SYS_CS1_FLASH_BASE}
 #define CONFIG_SYS_MAX_FLASH_SECT              128
 
 #define CONFIG_SYS_FSMC_NAND_8BIT
 
 #if defined(CONFIG_SPEAR300)
-#define CONFIG_SYS_NAND_BASE                   (0x80000000)
+#define CONFIG_SYS_NAND_BASE                   0x80000000
 
 #elif defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_NAND_BASE                   (0x40000000)
+#define CONFIG_SYS_NAND_BASE                   0x40000000
 
 #elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_NAND_BASE                   (0x50000000)
+#define CONFIG_SYS_NAND_BASE                   0x50000000
 
 #endif
 
 
 /* NAND flash configuration */
 #define CONFIG_SYS_FSMC_NAND_SP
 #define CONFIG_SYS_FSMC_NAND_8BIT
-#define CONFIG_SYS_NAND_BASE                   (0xD2000000)
+#define CONFIG_SYS_NAND_BASE                   0xD2000000
 
 /* Environment Settings */
 #define CONFIG_EXTRA_ENV_SETTINGS              CONFIG_EXTRA_ENV_USBTTY