TX48 config: remove '0x' from CONFIG_LOADADDR and add it to CONFIG_SYS_LOADADDR only

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 5cdd712bb009fcd369a52abe4271b243ed78752d..18e84fa0e63d108257602951b2426057c6f91327 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -106,6 +106,8 @@
  */
 #define xstr(s)        str(s)
 #define str(s) #s
+#define __pfx(x, s)    (x##s)
+#define _pfx(x, s)     __pfx(x, s)
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
@@ -115,8 +117,8 @@
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_BOOTARGS                "console=ttymO0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND     "run bootcmd_nand"
-#define CONFIG_LOADADDR                0x83000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_LOADADDR                83000000
+#define CONFIG_SYS_LOAD_ADDR   _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_U_BOOT_IMG_SIZE SZ_1M
 #define CONFIG_HW_WATCHDOG