Coding Style cleanup: remove trailing white space

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

diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h
index 797378b..a55b39b 100644 (file)
--- a/include/configs/manroland/common.h
+++ b/include/configs/manroland/common.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2009
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __MANROLAND_COMMON_H
@@ -70,9 +54,6 @@
 
 #undef CONFIG_BOOTARGS
 
-#define xstr(s)        str(s)
-#define str(s) #s
-
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
@@ -85,29 +66,29 @@
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
        "kernel_addr=ff810000\0"                                        \
-       "fdt_addr="xstr(CONFIG_SYS_FLASH_BASE)"\0"                      \
+       "fdt_addr="__stringify(CONFIG_SYS_FLASH_BASE)"\0"               \
        "flash_nfs=run nfsargs addip addcon addwdt addlog;"             \
                "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "kernel_addr_r=300000\0"                                        \
        "fdt_addr_r=200000\0"                                           \
-       "fdt_file=" xstr(CONFIG_HOSTNAME) "/"                           \
-               xstr(CONFIG_HOSTNAME) ".dtb\0"                          \
-       "kernel_file=" xstr(CONFIG_HOSTNAME) "/uImage \0"               \
+       "fdt_file=" __stringify(CONFIG_HOSTNAME) "/"                    \
+               __stringify(CONFIG_HOSTNAME) ".dtb\0"                   \
+       "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0"        \
        "load_fdt=tftp ${fdt_addr_r} ${fdt_file};\0"                    \
        "load_kernel=tftp ${kernel_addr_r} ${kernel_file};\0"           \
        "addcon=setenv bootargs ${bootargs} console=ttyPSC0,${baudrate}\0"\
        "net_nfs=run load_fdt load_kernel; "                            \
                "run nfsargs addip addcon addwdt addlog;"               \
                "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
-       "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0"                \
+       "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin \0"         \
        "u-boot_addr_r=200000\0"                                        \
        "load=tftp ${u-boot_addr_r} ${u-boot}\0"                        \
-       "update=protect off " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};"               \
-               "erase " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};"            \
-               "cp.b ${u-boot_addr_r} " xstr(CONFIG_SYS_TEXT_BASE)             \
+       "update=protect off " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize};"\
+               "erase " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize};"\
+               "cp.b ${u-boot_addr_r} " __stringify(CONFIG_SYS_TEXT_BASE) \
                " ${filesize};"                                         \
-               "protect on " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize}\0"              \
+               "protect on " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize}\0"\
        ""
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"