Use MK_STR for CONFIG_BOARD_CUSTOM_STRING

diff --git a/u-boot/Makefile b/u-boot/Makefile
index 61ef56c75c8a298e4a03e945402fbef4ffe98e2f..44255092da3e6a2633554209f62054945fa8c6a5 100644 (file)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -192,7 +192,7 @@ define config_init
     $(call define_add,SOC_TYPE,$(6)) \
   )
 
-  $(call define_add,CONFIG_BOARD_CUSTOM_STRING,"$(call board_name,$(1))")
+  $(call define_add,CONFIG_BOARD_CUSTOM_STRING,$(call board_name,$(1)))
   $(call define_add,CONFIG_DEFAULT_FLASH_SIZE_IN_MB,$(call flash_size,$(3)))
 
   echo

diff --git a/u-boot/board/ar7240/common/common.c b/u-boot/board/ar7240/common/common.c
index d4f2c54fabcb7e50a6aaf3655347ce53e5aa9d81..d69af948df3af0f5911ad5a4e626f02e5b3bfb52 100644 (file)
--- a/u-boot/board/ar7240/common/common.c
+++ b/u-boot/board/ar7240/common/common.c
@@ -16,10 +16,6 @@
 #include <asm/addrspace.h>
 #include <soc/qca_soc_common.h>
 
-#ifndef CONFIG_BOARD_CUSTOM_STRING
-       #define CONFIG_BOARD_CUSTOM_STRING      "Unknown/OEM"
-#endif
-
 #define ALIGN_SIZE     "8"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -94,7 +90,8 @@ void print_board_info(void)
        char buffer[24];
 
        /* Board name */
-       printf("%" ALIGN_SIZE "s %s\n", "BOARD:", CONFIG_BOARD_CUSTOM_STRING);
+       printf("%" ALIGN_SIZE "s %s\n",
+              "BOARD:", MK_STR(CONFIG_BOARD_CUSTOM_STRING));
 
        /* SOC name, version and revision */
        qca_soc_name_rev(buffer);