spi: Add function to allocate a new SPI slave

[karo-tx-uboot.git] / include / configs / xpedite537x.h

diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 202f209a7b6e2b30c5984ddc721d0dd3fc641ed1..46f1c903f1356e617ee2572fc219b6d2eb18ba14 100644 (file)
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -246,7 +246,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 /*
  * Pass open firmware flat tree
@@ -363,7 +362,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_TSEC_TBI
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */
@@ -472,12 +470,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * f6f00000 - f7efffff     Sec OS image (16MB)
  * f0000000 - f6efffff     Sec OS Use/Filesystem (111MB)
  */
-#define CONFIG_UBOOT1_ENV_ADDR MK_STR(0xfff80000)
-#define CONFIG_UBOOT2_ENV_ADDR MK_STR(0xf7f80000)
-#define CONFIG_FDT1_ENV_ADDR   MK_STR(0xfff00000)
-#define CONFIG_FDT2_ENV_ADDR   MK_STR(0xf7f00000)
-#define CONFIG_OS1_ENV_ADDR    MK_STR(0xfef00000)
-#define CONFIG_OS2_ENV_ADDR    MK_STR(0xf6f00000)
+#define CONFIG_UBOOT1_ENV_ADDR __stringify(0xfff80000)
+#define CONFIG_UBOOT2_ENV_ADDR __stringify(0xf7f80000)
+#define CONFIG_FDT1_ENV_ADDR   __stringify(0xfff00000)
+#define CONFIG_FDT2_ENV_ADDR   __stringify(0xf7f00000)
+#define CONFIG_OS1_ENV_ADDR    __stringify(0xfef00000)
+#define CONFIG_OS2_ENV_ADDR    __stringify(0xf6f00000)
 
 #define CONFIG_PROG_UBOOT1                                             \
        "$download_cmd $loadaddr $ubootfile; "                          \