summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Virdi <amit.virdi@st.com>2012-05-07 13:07:02 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-07-07 14:07:42 +0200
commit9b382b43a1db000a78822ad9e1814577dd2e1a19 (patch)
tree99a4fd69382fa6648a751fec7e693a1816fee409
parentbc0bdf4c2296d02802ddfa76f349cbba3a869138 (diff)
downloadtalos-obmc-uboot-9b382b43a1db000a78822ad9e1814577dd2e1a19.tar.gz
talos-obmc-uboot-9b382b43a1db000a78822ad9e1814577dd2e1a19.zip
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>
-rw-r--r--include/configs/spear-common.h14
-rw-r--r--include/configs/spear3xx_evb.h20
-rw-r--r--include/configs/spear6xx_evb.h2
3 files changed, 18 insertions, 18 deletions
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 0aa9551bfe..36c2a8b165 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -66,7 +66,7 @@
/* Flash configuration */
#if defined(CONFIG_FLASH_PNOR)
-#define CONFIG_SPEAR_EMI 1
+#define CONFIG_SPEAR_EMI
#else
#define CONFIG_ST_SMI
#endif
@@ -206,11 +206,11 @@
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_BOOT_PARAMS_ADDR 0x00000100
-#define CONFIG_CMDLINE_TAG 1
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_MISC_INIT_R 1
-#define CONFIG_ZERO_BOOTDELAY_CHECK 1
-#define CONFIG_AUTOBOOT_KEYED 1
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_MISC_INIT_R
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_AUTOBOOT_STOP_STR " "
#define CONFIG_AUTOBOOT_PROMPT \
"Hit SPACE in %d seconds to stop autoboot.\n", bootdelay
@@ -228,7 +228,7 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET 1
+#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_FLASH_EMPTY_INFO
diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
index d63c9dff39..3cd56dc487 100644
--- a/include/configs/spear3xx_evb.h
+++ b/include/configs/spear3xx_evb.h
@@ -29,14 +29,14 @@
* (easy to change)
*/
#if defined(CONFIG_spear300)
-#define CONFIG_SPEAR3XX 1
-#define CONFIG_SPEAR300 1
+#define CONFIG_SPEAR3XX
+#define CONFIG_SPEAR300
#elif defined(CONFIG_spear310)
-#define CONFIG_SPEAR3XX 1
-#define CONFIG_SPEAR310 1
+#define CONFIG_SPEAR3XX
+#define CONFIG_SPEAR310
#elif defined(CONFIG_spear320)
-#define CONFIG_SPEAR3XX 1
-#define CONFIG_SPEAR320 1
+#define CONFIG_SPEAR3XX
+#define CONFIG_SPEAR320
#endif
#if defined(CONFIG_usbtty)
@@ -52,17 +52,17 @@
#include <configs/spear-common.h>
/* Ethernet driver configuration */
-#define CONFIG_DW_ALTDESCRIPTOR 1
+#define CONFIG_DW_ALTDESCRIPTOR
#if defined(CONFIG_SPEAR310)
-#define CONFIG_MACB 1
+#define CONFIG_MACB
#define CONFIG_MACB0_PHY 0x01
#define CONFIG_MACB1_PHY 0x03
#define CONFIG_MACB2_PHY 0x05
#define CONFIG_MACB3_PHY 0x07
#elif defined(CONFIG_SPEAR320)
-#define CONFIG_MACB 1
+#define CONFIG_MACB
#define CONFIG_MACB0_PHY 0x01
#endif
@@ -141,7 +141,7 @@
#endif
#define CONFIG_SYS_MAX_FLASH_SECT (127 + 8)
-#define CONFIG_SYS_FLASH_QUIET_TEST 1
+#define CONFIG_SYS_FLASH_QUIET_TEST
#endif
diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h
index 4a761341a8..31b872552c 100644
--- a/include/configs/spear6xx_evb.h
+++ b/include/configs/spear6xx_evb.h
@@ -28,7 +28,7 @@
* High Level Configuration Options
* (easy to change)
*/
-#define CONFIG_SPEAR600 1
+#define CONFIG_SPEAR600
#if defined(CONFIG_usbtty)
#define CONFIG_SPEAR_USBTTY
OpenPOWER on IntegriCloud