Commit 9b382b43a1db000a78822ad9e1814577dd2e1a19

Authored by Amit Virdi
Committed by Albert ARIBAUD
1 parent bc0bdf4c22

cleanup/SPEAr: Define configuration flags more elegantly

In SPEAr, some of the configuration flags eg. CONFIG_SPEAR_EMI, were given value
"1", which isn't required. Define the flags without assigning any value

Signed-off-by: Amit Virdi <amit.virdi@st.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 3 changed files with 18 additions and 18 deletions Side-by-side Diff

include/configs/spear-common.h
... ... @@ -66,7 +66,7 @@
66 66  
67 67 /* Flash configuration */
68 68 #if defined(CONFIG_FLASH_PNOR)
69   -#define CONFIG_SPEAR_EMI 1
  69 +#define CONFIG_SPEAR_EMI
70 70 #else
71 71 #define CONFIG_ST_SMI
72 72 #endif
... ... @@ -206,11 +206,11 @@
206 206 #define CONFIG_BOARD_EARLY_INIT_F
207 207 #define CONFIG_DISPLAY_CPUINFO
208 208 #define CONFIG_BOOT_PARAMS_ADDR 0x00000100
209   -#define CONFIG_CMDLINE_TAG 1
210   -#define CONFIG_SETUP_MEMORY_TAGS 1
211   -#define CONFIG_MISC_INIT_R 1
212   -#define CONFIG_ZERO_BOOTDELAY_CHECK 1
213   -#define CONFIG_AUTOBOOT_KEYED 1
  209 +#define CONFIG_CMDLINE_TAG
  210 +#define CONFIG_SETUP_MEMORY_TAGS
  211 +#define CONFIG_MISC_INIT_R
  212 +#define CONFIG_ZERO_BOOTDELAY_CHECK
  213 +#define CONFIG_AUTOBOOT_KEYED
214 214 #define CONFIG_AUTOBOOT_STOP_STR " "
215 215 #define CONFIG_AUTOBOOT_PROMPT \
216 216 "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay
... ... @@ -228,7 +228,7 @@
228 228 #define CONFIG_SYS_MAXARGS 16
229 229 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
230 230 #define CONFIG_SYS_LOAD_ADDR 0x00800000
231   -#define CONFIG_SYS_CONSOLE_INFO_QUIET 1
  231 +#define CONFIG_SYS_CONSOLE_INFO_QUIET
232 232  
233 233 #define CONFIG_SYS_FLASH_EMPTY_INFO
234 234  
include/configs/spear3xx_evb.h
... ... @@ -29,14 +29,14 @@
29 29 * (easy to change)
30 30 */
31 31 #if defined(CONFIG_spear300)
32   -#define CONFIG_SPEAR3XX 1
33   -#define CONFIG_SPEAR300 1
  32 +#define CONFIG_SPEAR3XX
  33 +#define CONFIG_SPEAR300
34 34 #elif defined(CONFIG_spear310)
35   -#define CONFIG_SPEAR3XX 1
36   -#define CONFIG_SPEAR310 1
  35 +#define CONFIG_SPEAR3XX
  36 +#define CONFIG_SPEAR310
37 37 #elif defined(CONFIG_spear320)
38   -#define CONFIG_SPEAR3XX 1
39   -#define CONFIG_SPEAR320 1
  38 +#define CONFIG_SPEAR3XX
  39 +#define CONFIG_SPEAR320
40 40 #endif
41 41  
42 42 #if defined(CONFIG_usbtty)
43 43  
44 44  
... ... @@ -52,17 +52,17 @@
52 52 #include <configs/spear-common.h>
53 53  
54 54 /* Ethernet driver configuration */
55   -#define CONFIG_DW_ALTDESCRIPTOR 1
  55 +#define CONFIG_DW_ALTDESCRIPTOR
56 56  
57 57 #if defined(CONFIG_SPEAR310)
58   -#define CONFIG_MACB 1
  58 +#define CONFIG_MACB
59 59 #define CONFIG_MACB0_PHY 0x01
60 60 #define CONFIG_MACB1_PHY 0x03
61 61 #define CONFIG_MACB2_PHY 0x05
62 62 #define CONFIG_MACB3_PHY 0x07
63 63  
64 64 #elif defined(CONFIG_SPEAR320)
65   -#define CONFIG_MACB 1
  65 +#define CONFIG_MACB
66 66 #define CONFIG_MACB0_PHY 0x01
67 67  
68 68 #endif
... ... @@ -141,7 +141,7 @@
141 141 #endif
142 142  
143 143 #define CONFIG_SYS_MAX_FLASH_SECT (127 + 8)
144   -#define CONFIG_SYS_FLASH_QUIET_TEST 1
  144 +#define CONFIG_SYS_FLASH_QUIET_TEST
145 145  
146 146 #endif
147 147  
include/configs/spear6xx_evb.h
... ... @@ -28,7 +28,7 @@
28 28 * High Level Configuration Options
29 29 * (easy to change)
30 30 */
31   -#define CONFIG_SPEAR600 1
  31 +#define CONFIG_SPEAR600
32 32  
33 33 #if defined(CONFIG_usbtty)
34 34 #define CONFIG_SPEAR_USBTTY