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

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

diff --git a/include/configs/o2d300.h b/include/configs/o2d300.h
index c74e622b8c7e7087eb89386f3a21ac22ab9682ff..a8222d9f97e2418b0cf79900c939378bbcb27021 100644 (file)
--- a/include/configs/o2d300.h
+++ b/include/configs/o2d300.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+
  */
 
 /*
@@ -47,8 +44,8 @@
 
 #define CONFIG_BOARD_NAME              "o2d300"
 #define CONFIG_BOARD_BOOTCMD           "run dhcp_boot"
-#define CONFIG_BOARD_MEM_LIMIT         xstr(126)
-#define BOARD_POST_CRC32_END           xstr(0x02000000)
+#define CONFIG_BOARD_MEM_LIMIT         __stringify(126)
+#define BOARD_POST_CRC32_END           __stringify(0x02000000)
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        CONFIG_IFM_DEFAULT_ENV_SETTINGS                                 \
@@ -66,7 +63,7 @@
        "ramtop=fc57ffff\0"                                             \
        "jffbot=fc580000\0"                                             \
        "jfftop=fd39ffff\0"                                             \
-       "ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0"                      \
+       "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0"               \
        "ubotop=fc03ffff\0"                                             \
        "halname="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME"_halcon\0"      \
        "halbot=fd3a0000\0"                                             \