From: Przemyslaw Marczak <p.marczak@samsung.com>
Date: Wed, 12 Nov 2014 13:49:35 +0000 (+0100)
Subject: samsung: common: add get_plat_name()/get_board_model()
X-Git-Tag: submit/tizen/20150522.044923~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea8f22556f661ce476e4afd3e0d5758bda65ef06;p=platform%2Fkernel%2Fu-boot.git

samsung: common: add get_plat_name()/get_board_model()

This patch introduce some cleanup in set_board_info(),
related to the listed code changes:
Change 1:
The name of function get_board_type() was unclear,
so now it is changed to get_board_model().

Change 2:
The previous version of get_board_name() was returning
the platform name - now it returns full boardname.

Change 3:
Add new function get_plat_name() - returns platform name.
This is useful for platform common usage like environment
settings.

Change 4:
Update odroid.c by change get_board_type() to get_board_model().

Change 5:
samsung: misc: set env ${platname} in set_board_info()

Change-Id: Iba16e917f9c88458e1af21892d84ded121aa12cf
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
---

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index d52a8af4fe..6d2115fd08 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -337,7 +337,7 @@ int checkboard(void)
 	board_info = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
 	printf("Board: %s\n", board_info ? board_info : "unknown");
 #ifdef CONFIG_BOARD_TYPES
-	board_info = get_board_type();
+	board_info = get_board_model();
 
 	printf("Model: %s\n", board_info ? board_info : "unknown");
 #endif
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 2ba3d071ac..183789caaa 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -77,19 +77,19 @@ void set_board_info(void)
 	setenv("board_rev", info);
 #endif
 #ifdef CONFIG_OF_LIBFDT
-	const char *bdtype = "";
 	const char *bdname = CONFIG_SYS_BOARD;
 
 #ifdef CONFIG_BOARD_TYPES
-	bdtype = get_board_type();
 #ifdef CONFIG_OF_MULTI
+	const char *platname = get_plat_name();
 	bdname = get_board_name();
+
+	setenv("platname", platname);
 #endif
-	sprintf(info, "%s%s", bdname, bdtype);
-	setenv("boardname", info);
+	setenv("boardname", bdname);
 #endif
-	snprintf(info, ARRAY_SIZE(info),  "%s%x-%s%s.dtb",
-		 CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype);
+	snprintf(info, ARRAY_SIZE(info),  "%s%x-%s.dtb",
+		 CONFIG_SYS_SOC, s5p_cpu_id, bdname);
 	setenv("fdtfile", info);
 #endif
 }
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index ae41c29d92..684fd7803b 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -53,11 +53,11 @@ void set_board_type(void)
 		gd->board_type = ODROID_TYPE_U3;
 }
 
-const char *get_board_type(void)
+const char *get_board_model(void)
 {
-	const char *board_type[] = {"u3", "x2"};
+	const char *board_model[] = {"u3", "x2"};
 
-	return board_type[gd->board_type];
+	return board_model[gd->board_type];
 }
 #endif
 
diff --git a/include/samsung/misc.h b/include/samsung/misc.h
index 693cb7c14e..574d30ec15 100644
--- a/include/samsung/misc.h
+++ b/include/samsung/misc.h
@@ -65,8 +65,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr);
 #endif
 #ifdef CONFIG_BOARD_TYPES
 void set_board_type(void);
-const char *get_board_type(void);
+const char *get_board_model(void);
 #ifdef CONFIG_OF_MULTI
+const char *get_plat_name(void);
 const char *get_board_name(void);
 #endif
 #endif