treewide: Convert CONFIG_HOSTNAME to a string option

[platform/kernel/u-boot.git] / include / configs / x600.h

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 3f63761..a6fb988 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -38,7 +38,6 @@
 #define CONFIG_PL01x_PORTS                     { (void *)CONFIG_SYS_SERIAL0, \
                                                (void *)CONFIG_SYS_SERIAL1 }
 #define CONFIG_PL011_CLOCK                     (48 * 1000 * 1000)
-#define CONFIG_CONS_INDEX                      0
 #define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, \
                                                  57600, 115200 }
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
@@ -70,7 +69,6 @@
 /* Ethernet config options */
 #define CONFIG_MII
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
-#define CONFIG_PHY_ADDR                0       /* PHY address */
 
 #define CONFIG_SPEAR_GPIO
 
@@ -85,7 +83,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR        0x68
 
 /* FPGA config options */
-#define CONFIG_FPGA_SPARTAN3
 #define CONFIG_FPGA_COUNT      1
 
 /* USB EHCI options */
@@ -114,22 +111,15 @@
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (8 << 20)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000
 
-/* Use last 2 lwords in internal SRAM for bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_ADDR              (CONFIG_SRAM_BASE + \
-                                                CONFIG_SRAM_SIZE)
-
-#define CONFIG_HOSTNAME                                x600
+#define CONFIG_HOSTNAME                                "x600"
 #define CONFIG_UBI_PART                                ubi0
 #define CONFIG_UBIFS_VOLUME                    rootfs
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "u-boot_addr=1000000\0"                                         \
-       "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0"          \
+       "u-boot=" CONFIG_HOSTNAME "/u-boot.spr\0"               \
        "load=tftp ${u-boot_addr} ${u-boot}\0"                          \
        "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)      \
                " +${filesize};"                                        \
@@ -139,7 +129,7 @@
                "protect on " __stringify(CONFIG_SYS_MONITOR_BASE)      \
                " +${filesize}\0"                                       \
        "upd=run load update\0"                                         \
-       "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0"            \
+       "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0"         \
        "part=" __stringify(CONFIG_UBI_PART) "\0"                       \
        "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0"                    \
        "load_ubifs=tftp ${kernel_addr} ${ubifs}\0"                     \
@@ -164,12 +154,12 @@
                "saveenv;boot\0"                                        \
        "ubifsargs=set bootargs ubi.mtd=ubi${boot_part} "               \
                "root=ubi0:rootfs rootfstype=ubifs\0"                   \
-       "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0"              \
+       "kernel=" CONFIG_HOSTNAME "/uImage\0"           \
        "kernel_fs=/boot/uImage \0"                                     \
        "kernel_addr=1000000\0"                                         \
-       "dtb=" __stringify(CONFIG_HOSTNAME) "/"                         \
-               __stringify(CONFIG_HOSTNAME) ".dtb\0"                   \
-       "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0"           \
+       "dtb=" CONFIG_HOSTNAME "/"                              \
+               CONFIG_HOSTNAME ".dtb\0"                        \
+       "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0"                \
        "dtb_addr=1800000\0"                                            \
        "load_kernel=tftp ${kernel_addr} ${kernel}\0"                   \
        "load_dtb=tftp ${dtb_addr} ${dtb}\0"                            \