From: Piotr Dymacz <pepe2k@gmail.com>
Date: Fri, 9 Sep 2016 12:53:43 +0000 (+0200)
Subject: Use MK_STR for CONFIG_BOARD_CUSTOM_STRING
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a6e95457beb948f9bc1470bcf053703be5596f7;p=oweals%2Fu-boot_mod.git

Use MK_STR for CONFIG_BOARD_CUSTOM_STRING
---

diff --git a/u-boot/Makefile b/u-boot/Makefile
index 61ef56c..4425509 100644
--- 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 d4f2c54..d69af94 100644
--- 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);