summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2011-10-13 13:03:48 +0000
committerWolfgang Denk <wd@denx.de>2011-10-22 01:21:35 +0200
commitb3f44c21ea1a842eda757282d79e7c27efbf1f62 (patch)
tree960a15cb6b6b01a1173facd9b71f34058dd0e59c /common
parent8b3637c662e8a322f542942e5ee76b95ed9d9e39 (diff)
downloadtalos-obmc-uboot-b3f44c21ea1a842eda757282d79e7c27efbf1f62.tar.gz
talos-obmc-uboot-b3f44c21ea1a842eda757282d79e7c27efbf1f62.zip
common: cosmetic: CONFIG_BOOTFILE checkpatch compliance
Remove MK_STR from places that consume CONFIG_BOOTFILE to force all definitions to be string literals. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common')
-rw-r--r--common/env_common.c2
-rw-r--r--common/env_embedded.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/env_common.c b/common/env_common.c
index 596af82d7b..c7e9bea04b 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -112,7 +112,7 @@ const uchar default_environment[] = {
"hostname=" MK_STR(CONFIG_HOSTNAME) "\0"
#endif
#ifdef CONFIG_BOOTFILE
- "bootfile=" MK_STR(CONFIG_BOOTFILE) "\0"
+ "bootfile=" CONFIG_BOOTFILE "\0"
#endif
#ifdef CONFIG_LOADADDR
"loadaddr=" MK_STR(CONFIG_LOADADDR) "\0"
diff --git a/common/env_embedded.c b/common/env_embedded.c
index 9b3018a484..6ce1307767 100644
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -166,7 +166,7 @@ env_t environment __PPCENV__ = {
"hostname=" MK_STR(CONFIG_HOSTNAME) "\0"
#endif
#ifdef CONFIG_BOOTFILE
- "bootfile=" MK_STR(CONFIG_BOOTFILE) "\0"
+ "bootfile=" CONFIG_BOOTFILE "\0"
#endif
#ifdef CONFIG_LOADADDR
"loadaddr=" MK_STR(CONFIG_LOADADDR) "\0"
OpenPOWER on IntegriCloud