Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/o2i.h b/include/configs/o2i.h
index 7594786790176683bc1885bae5b707063dbd3655..c0fcedaf10ca72b61a0ba680d5db8d3aee9232a6 100644 (file)
--- a/include/configs/o2i.h
+++ b/include/configs/o2i.h
@@ -2,10 +2,7 @@
  * (C) Copyright 2012
  * DENX Software Engineering, Anatolij Gustschin <agust@denx.de>
  *
- * 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.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -40,8 +37,8 @@
 
 #define CONFIG_BOARD_NAME              "o2i"
 #define CONFIG_BOARD_BOOTCMD           "run dhcp_boot"
-#define CONFIG_BOARD_MEM_LIMIT         xstr(62)
-#define BOARD_POST_CRC32_END           xstr(0x01000000)
+#define CONFIG_BOARD_MEM_LIMIT         __stringify(62)
+#define BOARD_POST_CRC32_END           __stringify(0x01000000)
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        CONFIG_IFM_DEFAULT_ENV_SETTINGS                                 \
@@ -55,7 +52,7 @@
        "jfftop=ffebffff\0"                                             \
        "kernel_addr=0xff060000\0"                                      \
        "ramdisk_addr=0xff160000\0"                                     \
-       "ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0"                      \
+       "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0"               \
        "ubotop=ff03ffff\0"                                             \
        "autoload=no\0"                                                 \
        "dhcp_boot=run dhcpcmd; run flash_mtd\0"                        \