Skip to contentSkip to conversation

checkpatch compliance

U-Boot Superseded Joe Hershberger 6 participants 34 messages Oct 7, 2011 – Nov 18, 2011

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,

I'm attempting to make the files I touched in several recent patch-series chechkpatch.pl compliant.

I've hit several cases which fail and probably shouldn't. For each of these cases, should the warning / error just be ignored or reported to checkpatch maintainers or altered some other way?

ERROR: Macros with multiple statements should be enclosed in a do - while loop
+#define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} } /* Don't probe
these addrs */
Used like this:
static struct

{
        uchar   bus;
        uchar   addr;
} i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;

ERROR: need consistent spacing around '/' (ctx:WxV)
+#define CONFIG_ROOTPATH /nfs/root/path
Used like this:
#ifdef CONFIG_ROOTPATH
"rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"

ERROR: Macros with complex values should be enclosed in parenthesis
+#define CONFIG_ROOTPATH /nfs/root/path

ERROR: Macros with complex values should be enclosed in parenthesis
+#define CONFIG_UBOOTPATH u-boot.bin

ERROR: Macros with complex values should be enclosed in parenthesis #218: FILE: include/configs/MPC8313ERDB.h:274:

+#define CONFIG_SYS_NAND_BR_PRELIM      (CONFIG_SYS_NAND_BASE \
                                | (2<<BR_DECC_SHIFT)    /* Use HW ECC */ \
-                               | BR_PS_8               /* Port Size =
8 bit */ \
+                               | BR_PS_8               /* 8 bit port */ \
                                | BR_MS_FCM             /* MSEL = FCM */ \
-                               | BR_V )                /* valid */

-#define CONFIG_SYS_NAND_OR_PRELIM ( 0xFFFF8000 /*
length 32K */ \
+ | BR_V) /* valid */

Thanks,
-Joe

#1 lore raw

Dear Joe Hershberger,

Quoted 7 lines · In message <CANr=Z=Y+Q6AoJ-+gkc+YDeAPGcLsaQkPCzAmhJcRNwts9jXJzw@mail.gmail.com>…

I'm attempting to make the files I touched in several recent patch-series chechkpatch.pl compliant.

I've hit several cases which fail and probably shouldn't. For each of these cases, should the warning / error just be ignored or reported to checkpatch maintainers or altered some other way?

Please see this message / thread:

http://thread.gmane.org/gmane.linux.kernel/1130494/focus=1172475

It would be best if we
1) copied the current checkpatch.pl from Linux to tools/checkpatch.pl (which would also make it easier for all to use the same version)
and
2) provide a customized U-Boot specific .config file that takes care about things like the ones you list.

Quoted 2 lines

ERROR: need consistent spacing around '/' (ctx:WxV)
+#define CONFIG_ROOTPATH /nfs/root/path

Actually this is IMO wrong. Should it not be "/nfs/root/path" instead?

Quoted 2 lines

ERROR: Macros with complex values should be enclosed in parenthesis
+#define CONFIG_UBOOTPATH u-boot.bin

Ditto here.

Quoted 11 lines

ERROR: Macros with complex values should be enclosed in parenthesis #218: FILE: include/configs/MPC8313ERDB.h:274:

(quoted diff) +1 -1
+#define CONFIG_SYS_NAND_BR_PRELIM      (CONFIG_SYS_NAND_BASE \
                                | (2<<BR_DECC_SHIFT)    /* Use HW ECC */ \
-                               | BR_PS_8               /* Port Size =

8 bit */ \

(quoted diff) +1 -2
+                               | BR_PS_8               /* 8 bit port */ \
                                | BR_MS_FCM             /* MSEL = FCM */ \
-                               | BR_V )                /* valid */
-#define CONFIG_SYS_NAND_OR_PRELIM      ( 0xFFFF8000            /*
Quoted 2 lines

length 32K */ \
+ | BR_V) /* valid */

I think this one should actually be reported.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
What is wanted is not the will to believe,  but the will to find out,
which is the exact opposite.
		        -- Bertrand Russell, "Skeptical Essays", 1928
#2 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

Added from Linux - commit 30ecad51849ae132dc6ef6ddb62d499c7257515b

Include config file to ignore common false-positives

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 .checkpatch.conf    |   16 +
 tools/checkpatch.pl | 3337 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3353 insertions(+), 0 deletions(-)
 create mode 100644 .checkpatch.conf
 create mode 100755 tools/checkpatch.pl
.checkpatch.conf new file +16 -0
new file mode 100644
index 0000000..1454b9a
@@ -0,0 +1,16 @@
+# Not Linux, so don't expect a Linux tree.
+--no-tree
+
+# Temporary for false positive in checkpatch
+--ignore COMPLEX_MACRO
+
+# For CONFIG_SYS_I2C_NOPROBES
+--ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
+
+# For CONFIG_ROOTPATH
+--ignore SPACING
+--ignore COMPLEX_MACRO
+
+# For Linux includes
+--ignore ARCH_INCLUDE_LINUX
+--ignore INCLUDE_LINUX
tools/checkpatch.pl new file +3337 -0

2,984 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.2

Part of the diff is not shown here. View the raw message.

#3 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

Quoted 3 lines · Joe Hershberger

Added from Linux - commit 30ecad51849ae132dc6ef6ddb62d499c7257515b

Include config file to ignore common false-positives

great thanks Joe.

#4 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

In reply to Joe Hershberger

.checkpatch.conf line 2

Quoted 5 lines · On Tuesday 11 October 2011 21:41:19 Joe Hershberger wrote:
.checkpatch.conf new file +2 -0
 
+# Not Linux, so don't expect a Linux tree.
+--no-tree

the only things checkpatch.pl uses $tree for, i think we want. like #include asm/foo.h instead of linux/foo.h. why do you want this ?

Quoted 3 lines

+# For Linux includes

+--ignore ARCH_INCLUDE_LINUX
+--ignore INCLUDE_LINUX

i think these checks are good actually. we import headers from Linux all the time ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111012/b895b6a4/attachment.pgp

#5 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

Quoted 6 lines · Mike Frysinger

.checkpatch.conf line 2

Quoted 5 lines · On Tuesday 11 October 2011 21:41:19 Joe Hershberger wrote:
.checkpatch.conf new file +2 -0
 
+# Not Linux, so don't expect a Linux tree.
+--no-tree

Why depend on or have to specify where a linux tree is for building u-boot?

Quoted 9 lines

the only things checkpatch.pl uses $tree for, i think we want. ?like #include asm/foo.h instead of linux/foo.h. ?why do you want this ?

Quoted 3 lines

+# For Linux includes

+--ignore ARCH_INCLUDE_LINUX
+--ignore INCLUDE_LINUX

i think these checks are good actually. ?we import headers from Linux all the time ...

These seem to be irrelevant if --no-tree is specified. It doesn't seem like checkpatch would make good decisions about this anyway given that an include file that exists in the referred-to Linux tree may not exist in the u-boot tree.

-Joe

#6 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

Quoted 9 lines · On Thursday 13 October 2011 13:25:51 Joe Hershberger wrote:
Quoted 6 lines · Mike Frysinger

.checkpatch.conf line 2

Quoted 5 lines · On Tuesday 11 October 2011 21:41:19 Joe Hershberger wrote:
.checkpatch.conf new file +2 -0
 
+# Not Linux, so don't expect a Linux tree.
+--no-tree

Why depend on or have to specify where a linux tree is for building u-boot?

that's not how it works. use the u-boot tree as the "linux" tree.

Quoted 7 lines
Quoted 7 lines

the only things checkpatch.pl uses $tree for, i think we want. like #include asm/foo.h instead of linux/foo.h. why do you want this ?

Quoted 3 lines

+# For Linux includes

+--ignore ARCH_INCLUDE_LINUX
+--ignore INCLUDE_LINUX
Quoted 7 lines
Quoted 2 lines

i think these checks are good actually. we import headers from Linux all the time ...

These seem to be irrelevant if --no-tree is specified. It doesn't seem like checkpatch would make good decisions about this anyway given that an include file that exists in the referred-to Linux tree may not exist in the u-boot tree.

use the u-boot tree, then it works fine
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111013/22988a30/attachment.pgp

#7 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

Quoted 23 lines · Mike Frysinger
Quoted 9 lines · On Thursday 13 October 2011 13:25:51 Joe Hershberger wrote:
Quoted 6 lines · Mike Frysinger

.checkpatch.conf line 2

Quoted 5 lines · On Tuesday 11 October 2011 21:41:19 Joe Hershberger wrote:
.checkpatch.conf new file +2 -0
 
+# Not Linux, so don't expect a Linux tree.
+--no-tree

Why depend on or have to specify where a linux tree is for building u-boot?

that's not how it works. ?use the u-boot tree as the "linux" tree.

Quoted 10 lines
Quoted 9 lines

the only things checkpatch.pl uses $tree for, i think we want. ?like #include asm/foo.h instead of linux/foo.h. ?why do you want this ?

Quoted 3 lines

+# For Linux includes

+--ignore ARCH_INCLUDE_LINUX
+--ignore INCLUDE_LINUX

i think these checks are good actually. ?we import headers from Linux all the time ...

Quoted 6 lines
Quoted 4 lines

These seem to be irrelevant if --no-tree is specified. ?It doesn't seem like checkpatch would make good decisions about this anyway given that an include file that exists in the referred-to Linux tree may not exist in the u-boot tree.

use the u-boot tree, then it works fine

With the latest version of checkpatch that does not work... checkpatch looks for the following files/folders to identify the top_of_kernel_tree:

                "COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile",
                "README", "Documentation", "arch", "include", "drivers",
                "fs", "init", "ipc", "kernel", "lib", "scripts",

u-boot has no Kbuild, Documentation, init, ipc, kernel, or scripts.

-Joe

#8 lore raw

PATCH 1/1 tools: checkpatch.pl from Linux added to tools

Quoted 11 lines · On Thursday 13 October 2011 14:30:12 Joe Hershberger wrote:
Quoted 10 lines · Mike Frysinger
Quoted 9 lines · On Thursday 13 October 2011 13:25:51 Joe Hershberger wrote:
Quoted 7 lines · Mike Frysinger
Quoted 3 lines · On Tuesday 11 October 2011 21:41:19 Joe Hershberger wrote:

+# For Linux includes

+--ignore ARCH_INCLUDE_LINUX
+--ignore INCLUDE_LINUX

i think these checks are good actually. we import headers from Linux all the time ...

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

These seem to be irrelevant if --no-tree is specified. It doesn't seem like checkpatch would make good decisions about this anyway given that an include file that exists in the referred-to Linux tree may not exist in the u-boot tree.

use the u-boot tree, then it works fine

With the latest version of checkpatch that does not work...

sad

Quoted 8 lines

checkpatch looks for the following files/folders to identify the top_of_kernel_tree:

                "COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile",
                "README", "Documentation", "arch", "include", "drivers",
                "fs", "init", "ipc", "kernel", "lib", "scripts",

u-boot has no Kbuild, Documentation, init, ipc, kernel, or scripts.

i guess let's talk to lkml to see about decoupling this so that only the required paths get checked for the relevant tests. for the header tests, that should only require include/linux/ to exist.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111013/8fd38fd7/attachment.pgp

#9 lore raw

PATCH v2 1/1 tools: checkpatch.pl from Linux added to tools

In reply to Joe Hershberger

Added from Linux - commit 30ecad51849ae132dc6ef6ddb62d499c7257515b

Include config file to ignore common false-positives

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>

---
Changes for v2:
- Remove exceptions that were needed for CONFIG_ROOTPATH patches
- Add exceptions for min/max and simple_strtoul

 .checkpatch.conf    |   15 +
 tools/checkpatch.pl | 3337 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3352 insertions(+), 0 deletions(-)
 create mode 100644 .checkpatch.conf
 create mode 100755 tools/checkpatch.pl
.checkpatch.conf new file +15 -0
new file mode 100644
index 0000000..52ae3ff
@@ -0,0 +1,15 @@
+# Not Linux, so don't expect a Linux tree.
+--no-tree
+
+# Temporary for false positive in checkpatch
+--ignore COMPLEX_MACRO
+
+# For CONFIG_SYS_I2C_NOPROBES
+--ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
+
+# For simple_strtoul
+--ignore CONSIDER_KSTRTO
+
+# For min/max
+--ignore MINMAX
+
tools/checkpatch.pl new file +3337 -0

2,985 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.2

Part of the diff is not shown here. View the raw message.

#10 lore raw

PATCH v2 1/1 tools: checkpatch.pl from Linux added to tools

Hi Wolfgang,

Quoted 29 lines · Joe Hershberger

Added from Linux - commit 30ecad51849ae132dc6ef6ddb62d499c7257515b

Include config file to ignore common false-positives

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>

---
Changes for v2:
?- Remove exceptions that were needed for CONFIG_ROOTPATH patches ?- Add exceptions for min/max and simple_strtoul

?.checkpatch.conf ? ?| ? 15 +
?tools/checkpatch.pl | 3337 +++++++++++++++++++++++++++++++++++++++++++++++++++ ?2 files changed, 3352 insertions(+), 0 deletions(-)
?create mode 100644 .checkpatch.conf
?create mode 100755 tools/checkpatch.pl

.checkpatch.conf new file +5 -0
new file mode 100644
index 0000000..52ae3ff
@@ -0,0 +1,15 @@
+# Not Linux, so don't expect a Linux tree.
+--no-tree
+
+# Temporary for false positive in checkpatch
+--ignore COMPLEX_MACRO

.checkpatch.conf line 15

Quoted 10 lines
.checkpatch.conf new file +10 -0
+
+# For CONFIG_SYS_I2C_NOPROBES
+--ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
+
+# For simple_strtoul
+--ignore CONSIDER_KSTRTO
+
+# For min/max
+--ignore MINMAX
+

Is this list of exceptions reasonable to you? Should I be looking to ignore or not ignore anything else?

Thanks,
-Joe

#11 lore raw

PATCH v2 1/1 tools: checkpatch.pl from Linux added to tools

In reply to Joe Hershberger

Dear Joe Hershberger,

Quoted 12 lines · In message <[email protected]> you wrote:

Added from Linux - commit 30ecad51849ae132dc6ef6ddb62d499c7257515b

Include config file to ignore common false-positives

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>

---
Changes for v2:
- Remove exceptions that were needed for CONFIG_ROOTPATH patches
- Add exceptions for min/max and simple_strtoul

Quoted 5 lines
 .checkpatch.conf    |   15 +
 tools/checkpatch.pl | 3337 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3352 insertions(+), 0 deletions(-)
 create mode 100644 .checkpatch.conf
 create mode 100755 tools/checkpatch.pl

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The optimum committee has no members.
                                                   - Norman Augustine
#12 lore raw
In reply to Wolfgang Denk
Quoted 13 lines · Wolfgang Denk

Dear Joe Hershberger,

Quoted 7 lines · In message <CANr=Z=Y+Q6AoJ-+gkc+YDeAPGcLsaQkPCzAmhJcRNwts9jXJzw@mail.gmail.com>…

I'm attempting to make the files I touched in several recent patch-series chechkpatch.pl compliant.

I've hit several cases which fail and probably shouldn't. ?For each of these cases, should the warning / error just be ignored or reported to checkpatch maintainers or altered some other way?

Please see this message / thread:

Quoted 8 lines

http://thread.gmane.org/gmane.linux.kernel/1130494/focus=1172475

It would be best if we
1) copied the current checkpatch.pl from Linux to tools/checkpatch.pl ? (which would also make it easier for all to use the same version) and
2) provide a customized U-Boot specific .config file that takes care ? about things like the ones you list.

Done.

Quoted 5 lines
Quoted 2 lines

ERROR: need consistent spacing around '/' (ctx:WxV) +#define CONFIG_ROOTPATH ? ? ? ? ? ? ? ?/nfs/root/path

Actually this is IMO wrong. ?Should it not be "/nfs/root/path" instead?

Potentially it should be a defined as string literal in the future. It is currently expected to not be a string in common/env_embedded.c, common/env_common.c, and tools/env/fw_env.c where it uses MK_STR. Potentially a future cleanup could change all of these references, however it would break any external definitions of CONFIG_ROOTPATH that may be passed in from the environment (expecting the MK_STR).

Quoted 5 lines
Quoted 3 lines

ERROR: Macros with complex values should be enclosed in parenthesis +#define CONFIG_UBOOTPATH ? ? ? u-boot.bin

Ditto here.

This seems to be local to these files and can be made into a string literal.

Quoted 15 lines
Quoted 7 lines

ERROR: Macros with complex values should be enclosed in parenthesis #218: FILE: include/configs/MPC8313ERDB.h:274:
+#define CONFIG_SYS_NAND_BR_PRELIM ? ? ?(CONFIG_SYS_NAND_BASE \
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | (2<<BR_DECC_SHIFT) ? ?/* Use HW ECC */ \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | BR_PS_8 ? ? ? ? ? ? ? /* Port Size = 8 bit */ \

Quoted 6 lines
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | BR_PS_8 ? ? ? ? ? ? ? /* 8 bit port */ \
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | BR_MS_FCM ? ? ? ? ? ? /* MSEL = FCM */ \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | BR_V ) ? ? ? ? ? ? ? ?/* valid */

-#define CONFIG_SYS_NAND_OR_PRELIM ? ? ?( 0xFFFF8000 ? ? ? ? ? ?/* length 32K */ \
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | BR_V) ? ? ? ? ? ? ? ? /* valid */

I think this one should actually be reported.

Done.

-Joe

#13 lore raw
In reply to Wolfgang Denk
Quoted 6 lines · On Sunday 09 October 2011 15:22:33 Wolfgang Denk wrote:
Quoted 2 lines · Joe Hershberger

ERROR: need consistent spacing around '/' (ctx:WxV)
+#define CONFIG_ROOTPATH /nfs/root/path

Actually this is IMO wrong. Should it not be "/nfs/root/path" instead?

no. please look at all the code that uses MK_STR() in the tree.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111011/22c73de0/attachment.pgp

#14 lore raw

Dear Mike Frysinger,

Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 6 lines
Quoted 3 lines

ERROR: need consistent spacing around '/' (ctx:WxV)
+#define CONFIG_ROOTPATH /nfs/root/path

Actually this is IMO wrong. Should it not be "/nfs/root/path" instead?

no. please look at all the code that uses MK_STR() in the tree.

Yes. The MK_STR() should be cleaned up as well, of course.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Few people do business well who do nothing else.
                                       -- Philip Earl of Chesterfield
#15 lore raw
Quoted 10 lines · On Wednesday 12 October 2011 03:36:46 Wolfgang Denk wrote:
Quoted 7 lines · Mike Frysinger
Quoted 5 lines
Quoted 2 lines

ERROR: need consistent spacing around '/' (ctx:WxV)
+#define CONFIG_ROOTPATH /nfs/root/path

Actually this is IMO wrong. Should it not be "/nfs/root/path" instead?

no. please look at all the code that uses MK_STR() in the tree.

Yes. The MK_STR() should be cleaned up as well, of course.

some of these can be converted away (like CONFIG_ROOTPATH), but MK_STR() itself cannot go away as we have some defines which normally get used as numbers but we want to embed as a string into the env. like CONFIG_BAUDRATE.

back to the topic at hand, i don't think we should be keeping out new board ports because a much larger tree-wide issue exists. cleaning up things like CONFIG_ROOTPATH, while i think is fine, is non-trivial for most people, and is certainly way more than the new or even semi-regular contributor can tackle.

perhaps we should start a top level TODO file where we can start logging all the known items we want to get done, and for people who feel like tackling something crazy, they can pick off items from there. and for people who are submitting new boards and see these warnings, they can consult the top level TODO to see that "ok, it's a known issue, but i can ignore it in my specific patchset for now".
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111012/46464d1c/attachment.pgp

#16 lore raw

Dear Mike Frysinger,

Quoted 2 lines · In message <[email protected]> you wrote:
Quoted 2 lines

Yes. The MK_STR() should be cleaned up as well, of course.

Please read as: "... the use of MK_STR() should be cleaned up..."

Quoted 3 lines

some of these can be converted away (like CONFIG_ROOTPATH), but MK_STR() itself cannot go away as we have some defines which normally get used as numbers but we want to embed as a string into the env. like CONFIG_BAUDRATE.

I did not intend to suggest to remove MK_STR()

Quoted 6 lines

perhaps we should start a top level TODO file where we can start logging al> l the known items we want to get done, and for people who feel like tackling> something crazy, they can pick off items from there. and for people who ar> e submitting new boards and see these warnings, they can consult the top leve> l TODO to see that "ok, it's a known issue, but i can ignore it in my specifi> c patchset for now".

You mean something like http://www.denx.de/wiki/U-Boot/Tasks ?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There is a biblical analogy I'd like to draw here.   Casts are to C++
Programmers what the apple was to Eve.         - Scott Douglas Meyers
#17 lore raw
Quoted 9 lines · On Wednesday 12 October 2011 14:41:33 Wolfgang Denk wrote:
Quoted 6 lines · Mike Frysinger

perhaps we should start a top level TODO file where we can start logging all the known items we want to get done, and for people who feel like tackling something crazy, they can pick off items from there. and for people who are submitting new boards and see these warnings, they can consult the top level TODO to see that "ok, it's a known issue, but i can ignore it in my specific patchset for now".

You mean something like http://www.denx.de/wiki/U-Boot/Tasks ?

ah, i vaguely recalled seeing something in the past, but couldn't find it in the source tree. maybe a dummy TODO file that just said:
please visit http://www.denx.de/wiki/U-Boot/Tasks
would be good ?
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111012/88de7c1f/attachment.pgp

#18 lore raw

PATCH 1/2 common: cosmetic: CONFIG_ROOTPATH checkpatch compliance

In reply to Wolfgang Denk

Remove MK_STR from places that consume CONFIG_ROOTPATH to force all definitions to be string literals.

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 common/env_common.c               |    2 +-
 common/env_embedded.c             |    2 +-
 include/configs/DB64360.h         |    2 +-
 include/configs/DB64460.h         |    2 +-
 include/configs/MPC8313ERDB.h     |    2 +-
 include/configs/MPC8323ERDB.h     |    2 +-
 include/configs/MPC8349EMDS.h     |    2 +-
 include/configs/MPC8349ITX.h      |    4 ++--
 include/configs/MPC8360ERDK.h     |    2 +-
 include/configs/MPC837XERDB.h     |    2 +-
 include/configs/MPC8536DS.h       |    2 +-
 include/configs/MPC8540ADS.h      |    2 +-
 include/configs/MPC8541CDS.h      |    2 +-
 include/configs/MPC8544DS.h       |    2 +-
 include/configs/MPC8548CDS.h      |    2 +-
 include/configs/MPC8555CDS.h      |    2 +-
 include/configs/MPC8560ADS.h      |    2 +-
 include/configs/MPC8568MDS.h      |    2 +-
 include/configs/MPC8569MDS.h      |    2 +-
 include/configs/MPC8572DS.h       |    2 +-
 include/configs/MPC8610HPCD.h     |    2 +-
 include/configs/MPC8641HPCN.h     |    2 +-
 include/configs/P1010RDB.h        |    2 +-
 include/configs/P1022DS.h         |    2 +-
 include/configs/P1_P2_RDB.h       |    2 +-
 include/configs/P2020DS.h         |    2 +-
 include/configs/P2041RDB.h        |    2 +-
 include/configs/PN62.h            |    2 +-
 include/configs/RPXlite_DW.h      |    2 +-
 include/configs/RRvision.h        |    2 +-
 include/configs/SBC8540.h         |    2 +-
 include/configs/SIMPC8313.h       |    2 +-
 include/configs/aria.h            |    2 +-
 include/configs/bct-brettl2.h     |    2 +-
 include/configs/bf537-minotaur.h  |    2 +-
 include/configs/bf537-srv1.h      |    2 +-
 include/configs/bfin_adi_common.h |    2 +-
 include/configs/blackstamp.h      |    2 +-
 include/configs/blackvme.h        |    2 +-
 include/configs/corenet_ds.h      |    2 +-
 include/configs/debris.h          |    2 +-
 include/configs/dnp5370.h         |    2 +-
 include/configs/gr_cpci_ax2000.h  |    2 +-
 include/configs/gr_ep2s60.h       |    2 +-
 include/configs/gr_xc3s_1500.h    |    2 +-
 include/configs/grsim.h           |    2 +-
 include/configs/grsim_leon2.h     |    2 +-
 include/configs/idmr.h            |    2 +-
 include/configs/inka4x0.h         |    2 +-
 include/configs/mecp5123.h        |    2 +-
 include/configs/mpc5121ads.h      |    2 +-
 include/configs/p1_p2_rdb_pc.h    |    2 +-
 include/configs/pm9263.h          |    2 +-
 include/configs/quantum.h         |    2 +-
 include/configs/sbc8349.h         |    2 +-
 include/configs/sbc8548.h         |    2 +-
 include/configs/sbc8560.h         |    2 +-
 include/configs/sbc8641d.h        |    2 +-
 include/configs/stxgp3.h          |    2 +-
 include/configs/stxssa.h          |    2 +-
 include/configs/vme8349.h         |    2 +-
 tools/env/fw_env.c                |    2 +-
 62 files changed, 63 insertions(+), 63 deletions(-)
common/env_common.c +1 -1
index 19149b5..596af82 100644
@@ -100,7 +100,7 @@ const uchar default_environment[] = {
 	"preboot="	CONFIG_PREBOOT			"\0"
 #endif
 #ifdef	CONFIG_ROOTPATH
-	"rootpath="	MK_STR(CONFIG_ROOTPATH)		"\0"
+	"rootpath="	CONFIG_ROOTPATH			"\0"
 #endif
 #ifdef	CONFIG_GATEWAYIP
 	"gatewayip="	MK_STR(CONFIG_GATEWAYIP)	"\0"
common/env_embedded.c +1 -1
index e438575..9b3018a 100644
@@ -154,7 +154,7 @@ env_t environment __PPCENV__ = {
 	"autoload="	CONFIG_SYS_AUTOLOAD			"\0"
 #endif
 #ifdef	CONFIG_ROOTPATH
-	"rootpath="	MK_STR(CONFIG_ROOTPATH)		"\0"
+	"rootpath="	CONFIG_ROOTPATH			"\0"
 #endif
 #ifdef	CONFIG_GATEWAYIP
 	"gatewayip="	MK_STR(CONFIG_GATEWAYIP)	"\0"
include/configs/DB64360.h +1 -1
index 1f825fd..c3f3a24 100644
@@ -201,7 +201,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 
 #define CONFIG_SERIAL		"No. 1"
 #define CONFIG_SERVERIP		10.2.1.126
-#define CONFIG_ROOTPATH /mnt/yellow_dog_mini
+#define CONFIG_ROOTPATH		"/mnt/yellow_dog_mini"
 
 
 #define CONFIG_TESTDRAMDATA	y
include/configs/DB64460.h +1 -1
index 4218774..d48f092 100644
@@ -139,7 +139,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 
 #define CONFIG_SERIAL		"No. 1"
 #define CONFIG_SERVERIP		10.2.1.126
-#define CONFIG_ROOTPATH /mnt/yellow_dog_mini
+#define CONFIG_ROOTPATH		"/mnt/yellow_dog_mini"
 
 
 #define CONFIG_TESTDRAMDATA	y
include/configs/MPC8313ERDB.h +1 -1
index 7f52bb1..aa7c114 100644
@@ -597,7 +597,7 @@
 #define CONFIG_NETDEV		eth1
 
 #define CONFIG_HOSTNAME		mpc8313erdb
-#define CONFIG_ROOTPATH		/nfs/root/path
+#define CONFIG_ROOTPATH		"/nfs/root/path"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE		mpc8313erdb.dtb
include/configs/MPC8323ERDB.h +1 -1
index a8657b1..5b73137 100644
@@ -519,7 +519,7 @@
 #define CONFIG_NETDEV		eth1
 
 #define CONFIG_HOSTNAME		mpc8323erdb
-#define CONFIG_ROOTPATH		/nfsroot
+#define CONFIG_ROOTPATH		"/nfsroot"
 #define CONFIG_RAMDISKFILE	rootfs.ext2.gz.uboot
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
include/configs/MPC8349EMDS.h +1 -1
index 865d317..0fde1b2 100644
@@ -696,7 +696,7 @@
 #endif
 
 #define CONFIG_HOSTNAME		mpc8349emds
-#define CONFIG_ROOTPATH		/nfsroot/rootfs
+#define CONFIG_ROOTPATH		"/nfsroot/rootfs"
 #define CONFIG_BOOTFILE		uImage
 
 #define CONFIG_LOADADDR		800000	/* default location for tftp and bootm */
include/configs/MPC8349ITX.h +2 -2
index 4999004..feabe77 100644
@@ -681,7 +681,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #endif
 
 /* Default path and filenames */
-#define CONFIG_ROOTPATH		/nfsroot/rootfs
+#define CONFIG_ROOTPATH		"/nfsroot/rootfs"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
@@ -698,7 +698,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #define CONFIG_BOOTARGS \
 	"root=/dev/nfs rw" \
-	" nfsroot=" MK_STR(CONFIG_SERVERIP) ":" MK_STR(CONFIG_ROOTPATH) \
+	" nfsroot=" MK_STR(CONFIG_SERVERIP) ":" CONFIG_ROOTPATH		\
 	" ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":"	\
 		MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \
 		MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \
include/configs/MPC8360ERDK.h +1 -1
index 909e8ab..cbe5a49 100644
@@ -501,7 +501,7 @@
 #define CONFIG_HOSTNAME	mpc8360erdk
 #define CONFIG_BOOTFILE	uImage
 
-#define CONFIG_ROOTPATH		/nfsroot/
+#define CONFIG_ROOTPATH		"/nfsroot/"
 
 #define	CONFIG_BOOTDELAY 2	/* -1 disables auto-boot */
 #undef	CONFIG_BOOTARGS		/* the boot command will set bootargs */
include/configs/MPC837XERDB.h +1 -1
index d0e4b2c..0163c6a 100644
@@ -642,7 +642,7 @@
 #define CONFIG_NETDEV		eth1
 
 #define CONFIG_HOSTNAME		mpc837x_rdb
-#define CONFIG_ROOTPATH		/nfsroot
+#define CONFIG_ROOTPATH		"/nfsroot"
 #define CONFIG_RAMDISKFILE	rootfs.ext2.gz.uboot
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
include/configs/MPC8536DS.h +1 -1
index 3efe937..5787f04 100644
@@ -736,7 +736,7 @@
 #define CONFIG_IPADDR		192.168.1.254
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
include/configs/MPC8540ADS.h +1 -1
index 301efbe..85211cf 100644
@@ -437,7 +437,7 @@
 #define CONFIG_IPADDR    192.168.1.253
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/nfsroot
+#define CONFIG_ROOTPATH		"/nfsroot"
 #define CONFIG_BOOTFILE		your.uImage
 
 #define CONFIG_SERVERIP  192.168.1.1
include/configs/MPC8541CDS.h +1 -1
index b2503a4..4664a48 100644
@@ -449,7 +449,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_IPADDR    192.168.1.253
 
 #define CONFIG_HOSTNAME  unknown
-#define CONFIG_ROOTPATH  /nfsroot
+#define CONFIG_ROOTPATH  "/nfsroot"
 #define CONFIG_BOOTFILE  your.uImage
 
 #define CONFIG_SERVERIP  192.168.1.1
include/configs/MPC8544DS.h +1 -1
index 97b5569..9027319 100644
@@ -467,7 +467,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_IPADDR	192.168.1.251
 
 #define CONFIG_HOSTNAME	8544ds_unknown
-#define CONFIG_ROOTPATH	/nfs/mpc85xx
+#define CONFIG_ROOTPATH	"/nfs/mpc85xx"
 #define CONFIG_BOOTFILE	8544ds/uImage.uboot
 #define CONFIG_UBOOTPATH	8544ds/u-boot.bin	/* TFTP server */
 
include/configs/MPC8548CDS.h +1 -1
index 63e23c2..ba2c5c7 100644
@@ -509,7 +509,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_IPADDR	 192.168.1.253
 
 #define CONFIG_HOSTNAME	 unknown
-#define CONFIG_ROOTPATH	 /nfsroot
+#define CONFIG_ROOTPATH	 "/nfsroot"
 #define CONFIG_BOOTFILE	8548cds/uImage.uboot
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
include/configs/MPC8555CDS.h +1 -1
index efd4280..f0fe469 100644
@@ -447,7 +447,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_IPADDR    192.168.1.253
 
 #define CONFIG_HOSTNAME  unknown
-#define CONFIG_ROOTPATH  /nfsroot
+#define CONFIG_ROOTPATH  "/nfsroot"
 #define CONFIG_BOOTFILE  your.uImage
 
 #define CONFIG_SERVERIP  192.168.1.1
include/configs/MPC8560ADS.h +1 -1
index 8cf2bf2..b1fa972 100644
@@ -480,7 +480,7 @@
 #define CONFIG_IPADDR    192.168.1.253
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/nfsroot
+#define CONFIG_ROOTPATH		"/nfsroot"
 #define CONFIG_BOOTFILE		your.uImage
 
 #define CONFIG_SERVERIP  192.168.1.1
include/configs/MPC8568MDS.h +1 -1
index 994e7ae..65dd0b2 100644
@@ -470,7 +470,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_IPADDR    192.168.1.253
 
 #define CONFIG_HOSTNAME  unknown
-#define CONFIG_ROOTPATH  /nfsroot
+#define CONFIG_ROOTPATH  "/nfsroot"
 #define CONFIG_BOOTFILE  your.uImage
 
 #define CONFIG_SERVERIP  192.168.1.1
include/configs/MPC8569MDS.h +1 -1
index a4734eb..cfaf47f 100644
@@ -591,7 +591,7 @@ extern unsigned long get_clock_freq(void);
  * Environment Configuration
  */
 #define CONFIG_HOSTNAME mpc8569mds
-#define CONFIG_ROOTPATH  /nfsroot
+#define CONFIG_ROOTPATH  "/nfsroot"
 #define CONFIG_BOOTFILE  your.uImage
 
 #define CONFIG_SERVERIP  192.168.1.1
include/configs/MPC8572DS.h +1 -1
index da20278..547f752 100644
@@ -722,7 +722,7 @@
 #define CONFIG_IPADDR		192.168.1.254
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
include/configs/MPC8610HPCD.h +1 -1
index c90b69d..aabfb44 100644
@@ -530,7 +530,7 @@
 #define CONFIG_IPADDR		192.168.1.100
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	8610hpcd/u-boot.bin
 
include/configs/MPC8641HPCN.h +1 -1
index 2bd67c3..cfe5fc7 100644
@@ -695,7 +695,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_IPADDR		192.168.1.100
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
include/configs/P1010RDB.h +1 -1
index ca6178a..27d30c9 100644
@@ -719,7 +719,7 @@ extern unsigned long get_sdram_size(void);
 #endif
 
 #define CONFIG_HOSTNAME		P1010RDB
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
include/configs/P1022DS.h +1 -1
index d892b67..57000c2 100644
@@ -481,7 +481,7 @@
  */
 
 #define CONFIG_HOSTNAME		p1022ds
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
include/configs/P1_P2_RDB.h +1 -1
index ba74a15..765477a 100644
@@ -642,7 +642,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 #define CONFIG_HOSTNAME		P2020RDB
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
include/configs/P2020DS.h +1 -1
index 3fa38da..c69e092 100644
@@ -719,7 +719,7 @@
 #define CONFIG_IPADDR		192.168.1.254
 
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
include/configs/P2041RDB.h +1 -1
index 91c250f..e76745c 100644
@@ -570,7 +570,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin
 
include/configs/PN62.h +1 -1
index d562877..dae4577 100644
@@ -76,7 +76,7 @@
 
 #define CONFIG_SERVERIP		10.0.0.201
 #define CONFIG_IPADDR		10.0.0.200
-#define CONFIG_ROOTPATH		/opt/eldk/ppc_82xx
+#define CONFIG_ROOTPATH		"/opt/eldk/ppc_82xx"
 #define CONFIG_NETMASK		255.255.255.0
 #undef CONFIG_BOOTARGS
 #if 0
include/configs/RPXlite_DW.h +1 -1
index 7b561cb..62c3fda 100644
@@ -472,7 +472,7 @@
 #define CONFIG_ETHADDR	00:10:EC:00:37:5B
 #define CONFIG_IPADDR	172.16.115.7
 #define CONFIG_SERVERIP 172.16.115.6
-#define CONFIG_ROOTPATH /workspace/myfilesystem/target/
+#define CONFIG_ROOTPATH "/workspace/myfilesystem/target/"
 #define CONFIG_BOOTFILE uImage.rpxusb
 #define CONFIG_HOSTNAME LITE_H1_DW
 
include/configs/RRvision.h +1 -1
index 7dcc14c..0f8084e 100644
@@ -60,7 +60,7 @@
 #define CONFIG_IPADDR                 10.0.0.5
 #define CONFIG_SERVERIP               10.0.0.2
 #define CONFIG_NETMASK                255.0.0.0
-#define CONFIG_ROOTPATH               /opt/eldk/ppc_8xx
+#define CONFIG_ROOTPATH               "/opt/eldk/ppc_8xx"
 #define CONFIG_BOOTCOMMAND            "run flash_self"
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
include/configs/SBC8540.h +1 -1
index 7a96530..55b1644 100644
@@ -425,7 +425,7 @@
 #define CONFIG_GATEWAYIP	YourGatewayIP
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_HOSTNAME		SBC8560
-#define CONFIG_ROOTPATH		YourRootPath
+#define CONFIG_ROOTPATH		"YourRootPath"
 #define CONFIG_BOOTFILE		YourImageName
 
 #endif	/* __CONFIG_H */
include/configs/SIMPC8313.h +1 -1
index e006b55..3068774 100644
@@ -489,7 +489,7 @@
 #define CONFIG_NETDEV		eth1
 
 #define CONFIG_HOSTNAME		simpc8313
-#define CONFIG_ROOTPATH		/tftpboot/
+#define CONFIG_ROOTPATH		"/tftpboot/"
 #define CONFIG_BOOTFILE		/tftpboot/uImage
 #define CONFIG_UBOOTPATH	u-boot-nand.bin	/* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE		simpc8313.dtb
include/configs/aria.h +1 -1
index 0619cf7..33fc5fa 100644
@@ -537,7 +537,7 @@
 
 #define CONFIG_HOSTNAME			aria
 #define CONFIG_BOOTFILE			aria/uImage
-#define CONFIG_ROOTPATH			/opt/eldk/ppc_6xx
+#define CONFIG_ROOTPATH			"/opt/eldk/ppc_6xx"
 
 #define CONFIG_LOADADDR			400000	/* default load addr */
 
include/configs/bct-brettl2.h +1 -1
index 72d0948..e8e2667 100644
@@ -72,7 +72,7 @@
 #define CONFIG_IPADDR		192.168.233.224
 #define CONFIG_GATEWAYIP	192.168.233.1
 #define CONFIG_SERVERIP		192.168.233.53
-#define CONFIG_ROOTPATH		/romfs/brettl2
+#define CONFIG_ROOTPATH		"/romfs/brettl2"
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR	02:80:ad:20:31:e8 */
 #endif
include/configs/bf537-minotaur.h +1 -1
index c6ae4f1..ef9d236 100644
@@ -85,7 +85,7 @@
 #endif
 
 #define CONFIG_SYS_AUTOLOAD	"no"
-#define CONFIG_ROOTPATH		/romfs
+#define CONFIG_ROOTPATH		"/romfs"
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR	02:80:ad:20:31:42 */
 
include/configs/bf537-srv1.h +1 -1
index da3681d..52d5d97 100644
@@ -85,7 +85,7 @@
 #endif
 
 #define CONFIG_SYS_AUTOLOAD	"no"
-#define CONFIG_ROOTPATH		/romfs
+#define CONFIG_ROOTPATH		"/romfs"
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR	02:80:ad:20:31:42 */
 
include/configs/bfin_adi_common.h +1 -1
index bae2d76..3fbf5c6 100644
@@ -265,7 +265,7 @@
 #  define CONFIG_SERVERIP	192.168.0.2
 # endif
 # ifndef CONFIG_ROOTPATH
-#  define CONFIG_ROOTPATH	/romfs
+#  define CONFIG_ROOTPATH	"/romfs"
 # endif
 # ifdef CONFIG_CMD_DHCP
 #  ifndef CONFIG_SYS_AUTOLOAD
include/configs/blackstamp.h +1 -1
index 63791be..64fce30 100644
@@ -75,7 +75,7 @@
 #define CONFIG_GATEWAYIP	192.168.0.1
 #define CONFIG_SERVERIP		192.168.0.2
 #define CONFIG_HOSTNAME		blackstamp
-#define CONFIG_ROOTPATH		/checkout/uClinux-dist/romfs
+#define CONFIG_ROOTPATH		"/checkout/uClinux-dist/romfs"
 #define CONFIG_SYS_AUTOLOAD		"no"
 
 /* To remove hardcoding and enable MAC storage in EEPROM  */
include/configs/blackvme.h +1 -1
index b425b7b..f2dc6aa 100644
@@ -81,7 +81,7 @@
 #define CONFIG_GATEWAYIP	169.254.144.144	/* dedic card  */
 #define CONFIG_SERVERIP	169.254.144.144	/* tftp server */
 #define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_ROOTPATH	/export/uClinux-dist/romfs	/*NFS*/
+#define CONFIG_ROOTPATH		"/export/uClinux-dist/romfs"	/*NFS*/
 #define CFG_AUTOLOAD		"no"
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
include/configs/corenet_ds.h +1 -1
index 0075210..3da6d97 100644
@@ -626,7 +626,7 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
include/configs/debris.h +1 -1
index 60c70eb..8473420 100644
@@ -81,7 +81,7 @@
 #undef CONFIG_SYS_AUTOLOAD
 
 /* rootpath */
-#define CONFIG_ROOTPATH /tftpboot/target
+#define CONFIG_ROOTPATH "/tftpboot/target"
 
 /* gatewayip */
 #define CONFIG_GATEWAYIP 192.168.0.1
include/configs/dnp5370.h +1 -1
index 4ab48c7..f2f4102 100644
@@ -47,7 +47,7 @@
  * Network Settings
  */
 #ifndef __ADSPBF534__
-#define CONFIG_ROOTPATH        /romfs
+#define CONFIG_ROOTPATH        "/romfs"
 
 #define CONFIG_BFIN_MAC         1
 #define CONFIG_PHY_ADDR         0
include/configs/gr_cpci_ax2000.h +1 -1
index a127a2b..0ec4af6 100644
@@ -135,7 +135,7 @@
 #define CONFIG_GATEWAYIP 192.168.0.1
 #define CONFIG_SERVERIP 192.168.0.20
 #define CONFIG_IPADDR 192.168.0.206
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  ax2000
 #define CONFIG_BOOTFILE  /uImage
 
include/configs/gr_ep2s60.h +1 -1
index 643efc4..9c5f4df 100644
@@ -123,7 +123,7 @@
 #define CONFIG_GATEWAYIP 192.168.0.1
 #define CONFIG_SERVERIP 192.168.0.20
 #define CONFIG_IPADDR 192.168.0.207
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  ml401
 #define CONFIG_BOOTFILE  /uImage
 
include/configs/gr_xc3s_1500.h +1 -1
index e13299e..8973955 100644
@@ -99,7 +99,7 @@
 #define CONFIG_GATEWAYIP 192.168.0.1
 #define CONFIG_SERVERIP 192.168.0.20
 #define CONFIG_IPADDR 192.168.0.206
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
 #define CONFIG_BOOTFILE  /uImage
 
include/configs/grsim.h +1 -1
index f868d96..df2b500 100644
@@ -121,7 +121,7 @@
 #define CONFIG_GATEWAYIP 192.168.0.1
 #define CONFIG_SERVERIP 192.168.0.81
 #define CONFIG_IPADDR 192.168.0.80
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
 #define CONFIG_BOOTFILE  /uImage
 
include/configs/grsim_leon2.h +1 -1
index ed1008f..94b270e 100644
@@ -118,7 +118,7 @@
 #define CONFIG_GATEWAYIP 192.168.0.1
 #define CONFIG_SERVERIP 192.168.0.81
 #define CONFIG_IPADDR 192.168.0.80
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
 #define CONFIG_BOOTFILE  /uImage
 
include/configs/idmr.h +1 -1
index 4bc36b9..3fe8f70 100644
@@ -52,7 +52,7 @@
 #define CONFIG_ETHPRIME
 #define CONFIG_IPADDR		192.168.30.1
 #define CONFIG_SERVERIP		192.168.1.1
-#define CONFIG_ROOTPATH
+#define CONFIG_ROOTPATH		""
 #define CONFIG_GATEWAYIP	192.168.1.1
 #define CONFIG_NETMASK		255.255.0.0
 #define CONFIG_HOSTNAME		idmr
include/configs/inka4x0.h +1 -1
index b19d544..0d9dbef 100644
@@ -135,7 +135,7 @@
 #define	CONFIG_NETMASK		255.255.255.0
 #define HOSTNAME		inka4x0
 #define CONFIG_BOOTFILE		/tftpboot/inka4x0/uImage
-#define	CONFIG_ROOTPATH		/opt/eldk/ppc_6xx
+#define	CONFIG_ROOTPATH		"/opt/eldk/ppc_6xx"
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
include/configs/mecp5123.h +1 -1
index 19ef254..c0bed27 100644
@@ -373,7 +373,7 @@
 
 #define CONFIG_HOSTNAME		mecp512x
 #define CONFIG_BOOTFILE		/tftpboot/mecp512x/uImage
-#define CONFIG_ROOTPATH		/tftpboot/mecp512x/target_root
+#define CONFIG_ROOTPATH		"/tftpboot/mecp512x/target_root"
 
 #define CONFIG_LOADADDR		400000	/* def. location for tftp and bootm */
 
include/configs/mpc5121ads.h +1 -1
index 4288894..e284a0f 100644
@@ -526,7 +526,7 @@
 
 #define CONFIG_HOSTNAME		mpc5121ads
 #define CONFIG_BOOTFILE		mpc5121ads/uImage
-#define CONFIG_ROOTPATH		/opt/eldk/ppc_6xx
+#define CONFIG_ROOTPATH		"/opt/eldk/ppc_6xx"
 
 #define CONFIG_LOADADDR		400000	/* default location for tftp and bootm */
 
include/configs/p1_p2_rdb_pc.h +1 -1
index b9b89cf..3755f12 100644
@@ -858,7 +858,7 @@
  * Environment Configuration
  */
 #define CONFIG_HOSTNAME		unknown
-#define CONFIG_ROOTPATH		/opt/nfsroot
+#define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
include/configs/pm9263.h +1 -1
index 57a0416..1f7543c 100644
@@ -352,7 +352,7 @@
 #define CONFIG_SYS_JFFS2_FIRST_SECTOR	11
 
 #define CONFIG_BOOTCOMMAND		"run flashboot"
-#define CONFIG_ROOTPATH			/ronetix/rootfs
+#define CONFIG_ROOTPATH			"/ronetix/rootfs"
 #define CONFIG_AUTOBOOT_PROMPT		"autoboot in %d seconds\n"
 
 #define CONFIG_CON_ROT			"fbcon=rotate:3 "
include/configs/quantum.h +1 -1
index 3ff80d2..dcfa29a 100644
@@ -59,7 +59,7 @@
 #define CONFIG_SERVERIP 10.10.69.49
 #define CONFIG_NETMASK	255.255.255.0
 #define CONFIG_HOSTNAME QUANTUM
-#define CONFIG_ROOTPATH /opt/eldk/pcc_8xx
+#define CONFIG_ROOTPATH "/opt/eldk/pcc_8xx"
 
 #define CONFIG_BOOTARGS	 "root=/dev/ram rw"
 
include/configs/sbc8349.h +1 -1
index fae95d7..c87370a 100644
@@ -610,7 +610,7 @@
 #endif
 
 #define CONFIG_HOSTNAME		SBC8349
-#define CONFIG_ROOTPATH		/tftpboot/rootfs
+#define CONFIG_ROOTPATH		"/tftpboot/rootfs"
 #define CONFIG_BOOTFILE		uImage
 
 #define CONFIG_LOADADDR		800000	/* default location for tftp and bootm */
include/configs/sbc8548.h +1 -1
index 171058c..163ead9 100644
@@ -527,7 +527,7 @@
 #define CONFIG_IPADDR	 192.168.0.55
 
 #define CONFIG_HOSTNAME	 sbc8548
-#define CONFIG_ROOTPATH	 /opt/eldk/ppc_85xx
+#define CONFIG_ROOTPATH	 "/opt/eldk/ppc_85xx"
 #define CONFIG_BOOTFILE	 /uImage
 #define CONFIG_UBOOTPATH /u-boot.bin	/* TFTP server */
 
include/configs/sbc8560.h +1 -1
index d219925..65d35c8 100644
@@ -428,7 +428,7 @@
  */
 
 #define CONFIG_HOSTNAME		SBC8560
-#define CONFIG_ROOTPATH		/home/ppc
+#define CONFIG_ROOTPATH		"/home/ppc"
 #define CONFIG_BOOTFILE		uImage
 
 #define	CONFIG_EXTRA_ENV_SETTINGS		\
include/configs/sbc8641d.h +1 -1
index 61551ec..70763e7 100644
@@ -565,7 +565,7 @@
 #define CONFIG_IPADDR		192.168.0.50
 
 #define CONFIG_HOSTNAME		sbc8641d
-#define CONFIG_ROOTPATH		/opt/eldk/ppc_74xx
+#define CONFIG_ROOTPATH		"/opt/eldk/ppc_74xx"
 #define CONFIG_BOOTFILE		uImage
 
 #define CONFIG_SERVERIP		192.168.0.2
include/configs/stxgp3.h +1 -1
index 90d249b..9ecca1d 100644
@@ -377,7 +377,7 @@
 #define CONFIG_GATEWAYIP	192.168.85.1
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_HOSTNAME		STX_GP3
-#define CONFIG_ROOTPATH		/gppproot
+#define CONFIG_ROOTPATH		"/gppproot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_LOADADDR		0x1000000
 
include/configs/stxssa.h +1 -1
index 3d385b4..863cae1 100644
@@ -426,7 +426,7 @@
 #define CONFIG_GATEWAYIP	192.168.85.1
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_HOSTNAME		STX_SSA
-#define CONFIG_ROOTPATH		/gppproot
+#define CONFIG_ROOTPATH		"/gppproot"
 #define CONFIG_BOOTFILE		uImage
 #define CONFIG_LOADADDR		0x1000000
 
include/configs/vme8349.h +1 -1
index fe2bc1d..4129bb4 100644
@@ -545,7 +545,7 @@
 #endif
 
 #define CONFIG_HOSTNAME		VME8349
-#define CONFIG_ROOTPATH		/tftpboot/rootfs
+#define CONFIG_ROOTPATH		"/tftpboot/rootfs"
 #define CONFIG_BOOTFILE		uImage
 
 #define CONFIG_LOADADDR		800000	/* def location for tftp and bootm */
tools/env/fw_env.c +1 -1
index ed6b53f..413c088 100644
@@ -175,7 +175,7 @@ static char default_environment[] = {
 	"autoload=" CONFIG_SYS_AUTOLOAD "\0"
 #endif
 #ifdef	CONFIG_ROOTPATH
-	"rootpath=" MK_STR (CONFIG_ROOTPATH) "\0"
+	"rootpath=" CONFIG_ROOTPATH "\0"
 #endif
 #ifdef	CONFIG_GATEWAYIP
 	"gatewayip=" MK_STR (CONFIG_GATEWAYIP) "\0"
Signature · 1 line
1.6.0.2
#20 lore raw

PATCH 1/2 common: cosmetic: CONFIG_ROOTPATH checkpatch compliance

In reply to Joe Hershberger

Dear Joe Hershberger,

Quoted 61 lines · In message <[email protected]> you wrote:

Remove MK_STR from places that consume CONFIG_ROOTPATH to force all definitions to be string literals.

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 common/env_common.c               |    2 +-
 common/env_embedded.c             |    2 +-
 include/configs/DB64360.h         |    2 +-
 include/configs/DB64460.h         |    2 +-
 include/configs/MPC8313ERDB.h     |    2 +-
 include/configs/MPC8323ERDB.h     |    2 +-
 include/configs/MPC8349EMDS.h     |    2 +-
 include/configs/MPC8349ITX.h      |    4 ++--
 include/configs/MPC8360ERDK.h     |    2 +-
 include/configs/MPC837XERDB.h     |    2 +-
 include/configs/MPC8536DS.h       |    2 +-
 include/configs/MPC8540ADS.h      |    2 +-
 include/configs/MPC8541CDS.h      |    2 +-
 include/configs/MPC8544DS.h       |    2 +-
 include/configs/MPC8548CDS.h      |    2 +-
 include/configs/MPC8555CDS.h      |    2 +-
 include/configs/MPC8560ADS.h      |    2 +-
 include/configs/MPC8568MDS.h      |    2 +-
 include/configs/MPC8569MDS.h      |    2 +-
 include/configs/MPC8572DS.h       |    2 +-
 include/configs/MPC8610HPCD.h     |    2 +-
 include/configs/MPC8641HPCN.h     |    2 +-
 include/configs/P1010RDB.h        |    2 +-
 include/configs/P1022DS.h         |    2 +-
 include/configs/P1_P2_RDB.h       |    2 +-
 include/configs/P2020DS.h         |    2 +-
 include/configs/P2041RDB.h        |    2 +-
 include/configs/PN62.h            |    2 +-
 include/configs/RPXlite_DW.h      |    2 +-
 include/configs/RRvision.h        |    2 +-
 include/configs/SBC8540.h         |    2 +-
 include/configs/SIMPC8313.h       |    2 +-
 include/configs/aria.h            |    2 +-
 include/configs/bct-brettl2.h     |    2 +-
 include/configs/bf537-minotaur.h  |    2 +-
 include/configs/bf537-srv1.h      |    2 +-
 include/configs/bfin_adi_common.h |    2 +-
 include/configs/blackstamp.h      |    2 +-
 include/configs/blackvme.h        |    2 +-
 include/configs/corenet_ds.h      |    2 +-
 include/configs/debris.h          |    2 +-
 include/configs/dnp5370.h         |    2 +-
 include/configs/gr_cpci_ax2000.h  |    2 +-
 include/configs/gr_ep2s60.h       |    2 +-
 include/configs/gr_xc3s_1500.h    |    2 +-
 include/configs/grsim.h           |    2 +-
 include/configs/grsim_leon2.h     |    2 +-
 include/configs/idmr.h            |    2 +-
 include/configs/inka4x0.h         |    2 +-
 include/configs/mecp5123.h        |    2 +-
 include/configs/mpc5121ads.h      |    2 +-
 include/configs/p1_p2_rdb_pc.h    |    2 +-
 include/configs/pm9263.h          |    2 +-
 include/configs/quantum.h         |    2 +-
 include/configs/sbc8349.h         |    2 +-
Quoted 8 lines
 include/configs/sbc8548.h         |    2 +-
 include/configs/sbc8560.h         |    2 +-
 include/configs/sbc8641d.h        |    2 +-
 include/configs/stxgp3.h          |    2 +-
 include/configs/stxssa.h          |    2 +-
 include/configs/vme8349.h         |    2 +-
 tools/env/fw_env.c                |    2 +-
 62 files changed, 63 insertions(+), 63 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 8 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Every revolutionary idea - in science, politics, art, or  whatever  -
evokes three stages of reaction in a hearer:
  1. It is completely impossible - don't waste my time.
  2. It is possible, but it is not worth doing.
  3. I said it was a good idea all along.
#21 lore raw

PATCH 2/2 common: cosmetic: CONFIG_BOOTFILE checkpatch compliance

In reply to Wolfgang Denk

Remove MK_STR from places that consume CONFIG_BOOTFILE to force all definitions to be string literals.

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 common/env_common.c              |    2 +-
 common/env_embedded.c            |    2 +-
 doc/README.usb                   |    2 +-
 include/configs/MPC8313ERDB.h    |    2 +-
 include/configs/MPC8323ERDB.h    |    2 +-
 include/configs/MPC8349EMDS.h    |    2 +-
 include/configs/MPC8349ITX.h     |    2 +-
 include/configs/MPC8360ERDK.h    |    2 +-
 include/configs/MPC837XERDB.h    |    2 +-
 include/configs/MPC8536DS.h      |    2 +-
 include/configs/MPC8540ADS.h     |    2 +-
 include/configs/MPC8541CDS.h     |    2 +-
 include/configs/MPC8544DS.h      |    2 +-
 include/configs/MPC8548CDS.h     |    2 +-
 include/configs/MPC8555CDS.h     |    2 +-
 include/configs/MPC8560ADS.h     |    2 +-
 include/configs/MPC8568MDS.h     |    2 +-
 include/configs/MPC8569MDS.h     |    2 +-
 include/configs/MPC8572DS.h      |    2 +-
 include/configs/MPC8610HPCD.h    |    2 +-
 include/configs/MPC8641HPCN.h    |    2 +-
 include/configs/P1010RDB.h       |    2 +-
 include/configs/P1022DS.h        |    2 +-
 include/configs/P1023RDS.h       |    2 +-
 include/configs/P1_P2_RDB.h      |    2 +-
 include/configs/P2020DS.h        |    2 +-
 include/configs/P2041RDB.h       |    2 +-
 include/configs/RPXlite_DW.h     |    2 +-
 include/configs/SBC8540.h        |    2 +-
 include/configs/SIMPC8313.h      |    2 +-
 include/configs/am3517_crane.h   |    2 +-
 include/configs/am3517_evm.h     |    2 +-
 include/configs/aria.h           |    2 +-
 include/configs/corenet_ds.h     |    2 +-
 include/configs/debris.h         |    2 +-
 include/configs/gr_cpci_ax2000.h |    2 +-
 include/configs/gr_ep2s60.h      |    2 +-
 include/configs/gr_xc3s_1500.h   |    2 +-
 include/configs/grsim.h          |    2 +-
 include/configs/grsim_leon2.h    |    2 +-
 include/configs/idmr.h           |    2 +-
 include/configs/inka4x0.h        |    2 +-
 include/configs/mecp5123.h       |    2 +-
 include/configs/mpc5121ads.h     |    2 +-
 include/configs/mpc7448hpc2.h    |    2 +-
 include/configs/mpr2.h           |    2 +-
 include/configs/ms7720se.h       |    2 +-
 include/configs/omap3_evm.h      |    2 +-
 include/configs/p1_p2_rdb_pc.h   |    2 +-
 include/configs/sbc8349.h        |    2 +-
 include/configs/sbc8548.h        |    2 +-
 include/configs/sbc8560.h        |    2 +-
 include/configs/sbc8641d.h       |    2 +-
 include/configs/stxgp3.h         |    2 +-
 include/configs/stxssa.h         |    2 +-
 include/configs/vme8349.h        |    2 +-
 tools/env/fw_env.c               |    2 +-
 57 files changed, 57 insertions(+), 57 deletions(-)
common/env_common.c +1 -1
index 596af82..c7e9bea 100644
@@ -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"
common/env_embedded.c +1 -1
index 9b3018a..6ce1307 100644
@@ -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"
doc/README.usb +1 -1
index c4df9cd..ef1d6ba 100644
@@ -169,7 +169,7 @@ All of these can be obtained from the bootp server if not set.
 
 #define CONFIG_IPADDR		10.0.0.2  (replace with your value)
 #define CONFIG_SERVERIP		10.0.0.1  (replace with your value)
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 
 The 'usb start' command should identify the adapter something like this:
include/configs/MPC8313ERDB.h +1 -1
index aa7c114..d8e384a 100644
@@ -598,7 +598,7 @@
 
 #define CONFIG_HOSTNAME		mpc8313erdb
 #define CONFIG_ROOTPATH		"/nfs/root/path"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE		mpc8313erdb.dtb
 
include/configs/MPC8323ERDB.h +1 -1
index 5b73137..5cc9160 100644
@@ -521,7 +521,7 @@
 #define CONFIG_HOSTNAME		mpc8323erdb
 #define CONFIG_ROOTPATH		"/nfsroot"
 #define CONFIG_RAMDISKFILE	rootfs.ext2.gz.uboot
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE		mpc832x_rdb.dtb
 
include/configs/MPC8349EMDS.h +1 -1
index 0fde1b2..541d2f4 100644
@@ -697,7 +697,7 @@
 
 #define CONFIG_HOSTNAME		mpc8349emds
 #define CONFIG_ROOTPATH		"/nfsroot/rootfs"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_LOADADDR		800000	/* default location for tftp and bootm */
 
include/configs/MPC8349ITX.h +1 -1
index feabe77..c57facf 100644
@@ -682,7 +682,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 /* Default path and filenames */
 #define CONFIG_ROOTPATH		"/nfsroot/rootfs"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
 #ifdef CONFIG_MPC8349ITX
include/configs/MPC8360ERDK.h +1 -1
index cbe5a49..705f57a 100644
@@ -499,7 +499,7 @@
 
 #define CONFIG_LOADADDR	a00000
 #define CONFIG_HOSTNAME	mpc8360erdk
-#define CONFIG_BOOTFILE	uImage
+#define CONFIG_BOOTFILE	"uImage"
 
 #define CONFIG_ROOTPATH		"/nfsroot/"
 
include/configs/MPC837XERDB.h +1 -1
index 0163c6a..a26a5bb 100644
@@ -644,7 +644,7 @@
 #define CONFIG_HOSTNAME		mpc837x_rdb
 #define CONFIG_ROOTPATH		"/nfsroot"
 #define CONFIG_RAMDISKFILE	rootfs.ext2.gz.uboot
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE		mpc8379_rdb.dtb
 
include/configs/MPC8536DS.h +1 -1
index 5787f04..1dc3d8b 100644
@@ -737,7 +737,7 @@
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
 #define CONFIG_SERVERIP		192.168.1.1
include/configs/MPC8540ADS.h +1 -1
index 85211cf..ae94a4a 100644
@@ -438,7 +438,7 @@
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/nfsroot"
-#define CONFIG_BOOTFILE		your.uImage
+#define CONFIG_BOOTFILE		"your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1
include/configs/MPC8541CDS.h +1 -1
index 4664a48..bd10dda 100644
@@ -450,7 +450,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CONFIG_HOSTNAME  unknown
 #define CONFIG_ROOTPATH  "/nfsroot"
-#define CONFIG_BOOTFILE  your.uImage
+#define CONFIG_BOOTFILE  "your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1
include/configs/MPC8544DS.h +1 -1
index 9027319..71d8970 100644
@@ -468,7 +468,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_HOSTNAME	8544ds_unknown
 #define CONFIG_ROOTPATH	"/nfs/mpc85xx"
-#define CONFIG_BOOTFILE	8544ds/uImage.uboot
+#define CONFIG_BOOTFILE	"8544ds/uImage.uboot"
 #define CONFIG_UBOOTPATH	8544ds/u-boot.bin	/* TFTP server */
 
 #define CONFIG_SERVERIP	192.168.1.1
include/configs/MPC8548CDS.h +1 -1
index ba2c5c7..2c493aa 100644
@@ -510,7 +510,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CONFIG_HOSTNAME	 unknown
 #define CONFIG_ROOTPATH	 "/nfsroot"
-#define CONFIG_BOOTFILE	8548cds/uImage.uboot
+#define CONFIG_BOOTFILE "8548cds/uImage.uboot"
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
 #define CONFIG_SERVERIP	 192.168.1.1
include/configs/MPC8555CDS.h +1 -1
index f0fe469..ea460e6 100644
@@ -448,7 +448,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CONFIG_HOSTNAME  unknown
 #define CONFIG_ROOTPATH  "/nfsroot"
-#define CONFIG_BOOTFILE  your.uImage
+#define CONFIG_BOOTFILE  "your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1
include/configs/MPC8560ADS.h +1 -1
index b1fa972..8f905cd 100644
@@ -481,7 +481,7 @@
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/nfsroot"
-#define CONFIG_BOOTFILE		your.uImage
+#define CONFIG_BOOTFILE		"your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1
include/configs/MPC8568MDS.h +1 -1
index 65dd0b2..f9c8dfb 100644
@@ -471,7 +471,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CONFIG_HOSTNAME  unknown
 #define CONFIG_ROOTPATH  "/nfsroot"
-#define CONFIG_BOOTFILE  your.uImage
+#define CONFIG_BOOTFILE  "your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1
include/configs/MPC8569MDS.h +1 -1
index cfaf47f..19d3271 100644
@@ -592,7 +592,7 @@ extern unsigned long get_clock_freq(void);
  */
 #define CONFIG_HOSTNAME mpc8569mds
 #define CONFIG_ROOTPATH  "/nfsroot"
-#define CONFIG_BOOTFILE  your.uImage
+#define CONFIG_BOOTFILE  "your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1
include/configs/MPC8572DS.h +1 -1
index 547f752..ffee8fc 100644
@@ -723,7 +723,7 @@
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
 #define CONFIG_SERVERIP		192.168.1.1
include/configs/MPC8610HPCD.h +1 -1
index aabfb44..8fe72dc 100644
@@ -531,7 +531,7 @@
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	8610hpcd/u-boot.bin
 
 #define CONFIG_SERVERIP		192.168.1.1
include/configs/MPC8641HPCN.h +1 -1
index cfe5fc7..215c1c5 100644
@@ -696,7 +696,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
 #define CONFIG_SERVERIP		192.168.1.1
include/configs/P1010RDB.h +1 -1
index 27d30c9..af4609f 100644
@@ -720,7 +720,7 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_HOSTNAME		P1010RDB
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
 /* default location for tftp and bootm */
include/configs/P1022DS.h +1 -1
index 57000c2..01e3d61 100644
@@ -482,7 +482,7 @@
 
 #define CONFIG_HOSTNAME		p1022ds
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
 #define CONFIG_LOADADDR		1000000
include/configs/P1023RDS.h +1 -1
index e906922..013a6ac 100644
@@ -495,7 +495,7 @@ extern unsigned long get_clock_freq(void);
 /*
  * Environment Configuration
  */
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	(u-boot.bin) /* U-Boot image on TFTP server */
 
 /* default location for tftp and bootm */
include/configs/P1_P2_RDB.h +1 -1
index 765477a..883d44e 100644
@@ -643,7 +643,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_HOSTNAME		P2020RDB
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
 /* default location for tftp and bootm */
include/configs/P2020DS.h +1 -1
index c69e092..2d9657a 100644
@@ -720,7 +720,7 @@
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
 #define CONFIG_SERVERIP		192.168.1.1
include/configs/P2041RDB.h +1 -1
index e76745c..9db6a1d 100644
@@ -571,7 +571,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  * Environment Configuration
  */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin
 
 /* default location for tftp and bootm */
include/configs/RPXlite_DW.h +1 -1
index 62c3fda..efc59fe 100644
@@ -473,7 +473,7 @@
 #define CONFIG_IPADDR	172.16.115.7
 #define CONFIG_SERVERIP 172.16.115.6
 #define CONFIG_ROOTPATH "/workspace/myfilesystem/target/"
-#define CONFIG_BOOTFILE uImage.rpxusb
+#define CONFIG_BOOTFILE "uImage.rpxusb"
 #define CONFIG_HOSTNAME LITE_H1_DW
 
 #endif	/* __CONFIG_H */
include/configs/SBC8540.h +1 -1
index 55b1644..ff54289 100644
@@ -426,6 +426,6 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_HOSTNAME		SBC8560
 #define CONFIG_ROOTPATH		"YourRootPath"
-#define CONFIG_BOOTFILE		YourImageName
+#define CONFIG_BOOTFILE		"YourImageName"
 
 #endif	/* __CONFIG_H */
include/configs/SIMPC8313.h +1 -1
index 3068774..2f99641 100644
@@ -490,7 +490,7 @@
 
 #define CONFIG_HOSTNAME		simpc8313
 #define CONFIG_ROOTPATH		"/tftpboot/"
-#define CONFIG_BOOTFILE		/tftpboot/uImage
+#define CONFIG_BOOTFILE		"/tftpboot/uImage"
 #define CONFIG_UBOOTPATH	u-boot-nand.bin	/* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE		simpc8313.dtb
 
include/configs/am3517_crane.h +1 -1
index e23ca45..8842a18 100644
@@ -187,7 +187,7 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY	10
 
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
include/configs/am3517_evm.h +1 -1
index 72dd6f0..1c70b9d 100644
@@ -186,7 +186,7 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY	10
 
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
include/configs/aria.h +1 -1
index 33fc5fa..cf2e7d4 100644
@@ -536,7 +536,7 @@
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME			aria
-#define CONFIG_BOOTFILE			aria/uImage
+#define CONFIG_BOOTFILE			"aria/uImage"
 #define CONFIG_ROOTPATH			"/opt/eldk/ppc_6xx"
 
 #define CONFIG_LOADADDR			400000	/* default load addr */
include/configs/corenet_ds.h +1 -1
index 3da6d97..bc0aeeb 100644
@@ -627,7 +627,7 @@
  * Environment Configuration
  */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 
 /* default location for tftp and bootm */
include/configs/debris.h +1 -1
index 8473420..60c7c40 100644
@@ -93,7 +93,7 @@
 #define CONFIG_HOSTNAME debris
 
 /* bootfile */
-#define CONFIG_BOOTFILE pImage
+#define CONFIG_BOOTFILE "pImage"
 
 /* loadaddr */
 #define CONFIG_LOADADDR 800000
include/configs/gr_cpci_ax2000.h +1 -1
index 0ec4af6..e837f40 100644
@@ -137,7 +137,7 @@
 #define CONFIG_IPADDR 192.168.0.206
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  ax2000
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
include/configs/gr_ep2s60.h +1 -1
index 9c5f4df..0cddeee 100644
@@ -125,7 +125,7 @@
 #define CONFIG_IPADDR 192.168.0.207
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  ml401
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
include/configs/gr_xc3s_1500.h +1 -1
index 8973955..7e8e6f5 100644
@@ -101,7 +101,7 @@
 #define CONFIG_IPADDR 192.168.0.206
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
include/configs/grsim.h +1 -1
index df2b500..c14749b 100644
@@ -123,7 +123,7 @@
 #define CONFIG_IPADDR 192.168.0.80
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
include/configs/grsim_leon2.h +1 -1
index 94b270e..88d2aad 100644
@@ -120,7 +120,7 @@
 #define CONFIG_IPADDR 192.168.0.80
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
include/configs/idmr.h +1 -1
index 3fe8f70..50dd918 100644
@@ -56,7 +56,7 @@
 #define CONFIG_GATEWAYIP	192.168.1.1
 #define CONFIG_NETMASK		255.255.0.0
 #define CONFIG_HOSTNAME		idmr
-#define CONFIG_BOOTFILE		/tftpboot/idmr/uImage
+#define CONFIG_BOOTFILE		"/tftpboot/idmr/uImage"
 #define CONFIG_PREBOOT		"echo;echo Type \\\"run flash_nfs\\\" to mount root " \
 				"filesystem over NFS; echo"
 
include/configs/inka4x0.h +1 -1
index 0d9dbef..2b0b616 100644
@@ -134,7 +134,7 @@
 #define	CONFIG_SERVERIP		192.168.100.1
 #define	CONFIG_NETMASK		255.255.255.0
 #define HOSTNAME		inka4x0
-#define CONFIG_BOOTFILE		/tftpboot/inka4x0/uImage
+#define CONFIG_BOOTFILE		"/tftpboot/inka4x0/uImage"
 #define	CONFIG_ROOTPATH		"/opt/eldk/ppc_6xx"
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
include/configs/mecp5123.h +1 -1
index c0bed27..ed9282b 100644
@@ -372,7 +372,7 @@
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME		mecp512x
-#define CONFIG_BOOTFILE		/tftpboot/mecp512x/uImage
+#define CONFIG_BOOTFILE		"/tftpboot/mecp512x/uImage"
 #define CONFIG_ROOTPATH		"/tftpboot/mecp512x/target_root"
 
 #define CONFIG_LOADADDR		400000	/* def. location for tftp and bootm */
include/configs/mpc5121ads.h +1 -1
index e284a0f..c3d3afd 100644
@@ -525,7 +525,7 @@
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME		mpc5121ads
-#define CONFIG_BOOTFILE		mpc5121ads/uImage
+#define CONFIG_BOOTFILE		"mpc5121ads/uImage"
 #define CONFIG_ROOTPATH		"/opt/eldk/ppc_6xx"
 
 #define CONFIG_LOADADDR		400000	/* default location for tftp and bootm */
include/configs/mpc7448hpc2.h +1 -1
index 700dcda..61d758e 100644
@@ -129,7 +129,7 @@
 #define CONFIG_TSI108_ETH_NUM_PORTS	2
 
 
-#define CONFIG_BOOTFILE		zImage.initrd.elf
+#define CONFIG_BOOTFILE		"zImage.initrd.elf"
 #define CONFIG_LOADADDR		0x400000
 
 /*-------------------------------------------------------------------------- */
include/configs/mpr2.h +1 -1
index f32899f..0f7edff 100644
@@ -35,7 +35,7 @@
 /* Default environment variables */
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
-#define CONFIG_BOOTFILE		/boot/zImage
+#define CONFIG_BOOTFILE		"/boot/zImage"
 #define CONFIG_LOADADDR		0x8E000000
 #define CONFIG_VERSION_VARIABLE
 
include/configs/ms7720se.h +1 -1
index dd79b2d..afa82cf 100644
@@ -41,7 +41,7 @@
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
-#define CONFIG_BOOTFILE		/boot/zImage
+#define CONFIG_BOOTFILE		"/boot/zImage"
 #define CONFIG_LOADADDR		0x8E000000
 
 #define CONFIG_VERSION_VARIABLE
include/configs/omap3_evm.h +1 -1
index 4c95a78..7a76288 100644
@@ -194,7 +194,7 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY	10
 
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
include/configs/p1_p2_rdb_pc.h +1 -1
index 3755f12..53759b7 100644
@@ -859,7 +859,7 @@
  */
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
 /* default location for tftp and bootm */
include/configs/sbc8349.h +1 -1
index c87370a..7de90d5 100644
@@ -611,7 +611,7 @@
 
 #define CONFIG_HOSTNAME		SBC8349
 #define CONFIG_ROOTPATH		"/tftpboot/rootfs"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_LOADADDR		800000	/* default location for tftp and bootm */
 
include/configs/sbc8548.h +1 -1
index 163ead9..ba7612c 100644
@@ -528,7 +528,7 @@
 
 #define CONFIG_HOSTNAME	 sbc8548
 #define CONFIG_ROOTPATH	 "/opt/eldk/ppc_85xx"
-#define CONFIG_BOOTFILE	 /uImage
+#define CONFIG_BOOTFILE	 "/uImage"
 #define CONFIG_UBOOTPATH /u-boot.bin	/* TFTP server */
 
 #define CONFIG_SERVERIP	 192.168.0.2
include/configs/sbc8560.h +1 -1
index 65d35c8..9e43bb0 100644
@@ -429,7 +429,7 @@
 
 #define CONFIG_HOSTNAME		SBC8560
 #define CONFIG_ROOTPATH		"/home/ppc"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define	CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
include/configs/sbc8641d.h +1 -1
index 70763e7..099bdec 100644
@@ -566,7 +566,7 @@
 
 #define CONFIG_HOSTNAME		sbc8641d
 #define CONFIG_ROOTPATH		"/opt/eldk/ppc_74xx"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_SERVERIP		192.168.0.2
 #define CONFIG_GATEWAYIP	192.168.0.1
include/configs/stxgp3.h +1 -1
index 9ecca1d..8383ea4 100644
@@ -378,7 +378,7 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_HOSTNAME		STX_GP3
 #define CONFIG_ROOTPATH		"/gppproot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_LOADADDR		0x1000000
 
 #endif	/* __CONFIG_H */
include/configs/stxssa.h +1 -1
index 863cae1..9289aaf 100644
@@ -427,7 +427,7 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_HOSTNAME		STX_SSA
 #define CONFIG_ROOTPATH		"/gppproot"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_LOADADDR		0x1000000
 
 #else /* ENV IS IN FLASH		-- use a full-blown envionment */
include/configs/vme8349.h +1 -1
index 4129bb4..bdb64ba 100644
@@ -546,7 +546,7 @@
 
 #define CONFIG_HOSTNAME		VME8349
 #define CONFIG_ROOTPATH		"/tftpboot/rootfs"
-#define CONFIG_BOOTFILE		uImage
+#define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_LOADADDR		800000	/* def location for tftp and bootm */
 
tools/env/fw_env.c +1 -1
index 413c088..f1568f2 100644
@@ -187,7 +187,7 @@ static char 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"
Signature · 1 line
1.6.0.2
#22 lore raw

PATCH 2/2 common: cosmetic: CONFIG_BOOTFILE checkpatch compliance

Quoted 2 lines · On Thursday 13 October 2011 19:03:48 Joe Hershberger wrote:

Remove MK_STR from places that consume CONFIG_BOOTFILE to force all definitions to be string literals.

Quoted 2 lines

seems a bit odd to cc yourself in the changelog
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111013/e4dfa55f/attachment.pgp

#23 lore raw

PATCH 2/2 common: cosmetic: CONFIG_BOOTFILE checkpatch compliance

Quoted 5 lines · Mike Frysinger
Quoted 2 lines · On Thursday 13 October 2011 19:03:48 Joe Hershberger wrote:

seems a bit odd to cc yourself in the changelog

Hi Mike,

Just due to the fact that I like to manage the u-boot list through my gmail account, but need to send patches from my work account.

-Joe

#24 lore raw

PATCH 2/2 common: cosmetic: CONFIG_BOOTFILE checkpatch compliance

In reply to Joe Hershberger

Dear Joe Hershberger,

Quoted 56 lines · In message <[email protected]> you wrote:

Remove MK_STR from places that consume CONFIG_BOOTFILE to force all definitions to be string literals.

Cc Joe Hershberger <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 common/env_common.c              |    2 +-
 common/env_embedded.c            |    2 +-
 doc/README.usb                   |    2 +-
 include/configs/MPC8313ERDB.h    |    2 +-
 include/configs/MPC8323ERDB.h    |    2 +-
 include/configs/MPC8349EMDS.h    |    2 +-
 include/configs/MPC8349ITX.h     |    2 +-
 include/configs/MPC8360ERDK.h    |    2 +-
 include/configs/MPC837XERDB.h    |    2 +-
 include/configs/MPC8536DS.h      |    2 +-
 include/configs/MPC8540ADS.h     |    2 +-
 include/configs/MPC8541CDS.h     |    2 +-
 include/configs/MPC8544DS.h      |    2 +-
 include/configs/MPC8548CDS.h     |    2 +-
 include/configs/MPC8555CDS.h     |    2 +-
 include/configs/MPC8560ADS.h     |    2 +-
 include/configs/MPC8568MDS.h     |    2 +-
 include/configs/MPC8569MDS.h     |    2 +-
 include/configs/MPC8572DS.h      |    2 +-
 include/configs/MPC8610HPCD.h    |    2 +-
 include/configs/MPC8641HPCN.h    |    2 +-
 include/configs/P1010RDB.h       |    2 +-
 include/configs/P1022DS.h        |    2 +-
 include/configs/P1023RDS.h       |    2 +-
 include/configs/P1_P2_RDB.h      |    2 +-
 include/configs/P2020DS.h        |    2 +-
 include/configs/P2041RDB.h       |    2 +-
 include/configs/RPXlite_DW.h     |    2 +-
 include/configs/SBC8540.h        |    2 +-
 include/configs/SIMPC8313.h      |    2 +-
 include/configs/am3517_crane.h   |    2 +-
 include/configs/am3517_evm.h     |    2 +-
 include/configs/aria.h           |    2 +-
 include/configs/corenet_ds.h     |    2 +-
 include/configs/debris.h         |    2 +-
 include/configs/gr_cpci_ax2000.h |    2 +-
 include/configs/gr_ep2s60.h      |    2 +-
 include/configs/gr_xc3s_1500.h   |    2 +-
 include/configs/grsim.h          |    2 +-
 include/configs/grsim_leon2.h    |    2 +-
 include/configs/idmr.h           |    2 +-
 include/configs/inka4x0.h        |    2 +-
 include/configs/mecp5123.h       |    2 +-
 include/configs/mpc5121ads.h     |    2 +-
 include/configs/mpc7448hpc2.h    |    2 +-
 include/configs/mpr2.h           |    2 +-
 include/configs/ms7720se.h       |    2 +-
 include/configs/omap3_evm.h      |    2 +-
 include/configs/p1_p2_rdb_pc.h   |    2 +-
 include/configs/sbc8349.h        |    2 +-
Quoted 8 lines
 include/configs/sbc8548.h        |    2 +-
 include/configs/sbc8560.h        |    2 +-
 include/configs/sbc8641d.h       |    2 +-
 include/configs/stxgp3.h         |    2 +-
 include/configs/stxssa.h         |    2 +-
 include/configs/vme8349.h        |    2 +-
 tools/env/fw_env.c               |    2 +-
 57 files changed, 57 insertions(+), 57 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Why can you only have two doors on a chicken coop? If it had four  it
would be a chicken sedan.
#25 lore raw
In reply to Wolfgang Denk
Quoted 13 lines · Wolfgang Denk

Dear Joe Hershberger,

Quoted 7 lines · In message <CANr=Z=Y+Q6AoJ-+gkc+YDeAPGcLsaQkPCzAmhJcRNwts9jXJzw@mail.gmail.com>…

I'm attempting to make the files I touched in several recent patch-series chechkpatch.pl compliant.

I've hit several cases which fail and probably shouldn't. ?For each of these cases, should the warning / error just be ignored or reported to checkpatch maintainers or altered some other way?

Please see this message / thread:

Quoted 8 lines

http://thread.gmane.org/gmane.linux.kernel/1130494/focus=1172475

It would be best if we
1) copied the current checkpatch.pl from Linux to tools/checkpatch.pl ? (which would also make it easier for all to use the same version) and
2) provide a customized U-Boot specific .config file that takes care ? about things like the ones you list.

Hi Wolfgang,

I've run into a few more that may be candidates to ignore.

WARNING:CONSIDER_KSTRTO: consider using kstrto* in preference to simple_strtoul This one seems pretty clear and has been discussed before.

WARNING:NEW_TYPEDEFS: do not add new typedefs
This seems rather limiting... I'm not sure why even Linux would want this, at least when it applies to typedefs of structs. It makes sense if it's a new typedef for int or something.

WARNING:VOLATILE: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
Sometimes using volatile is correct... not sure how this fits in with a policy of 0 errors and 0 warnings... Should it be ignored or not?

Thanks,
-Joe

#26 lore raw
Quoted 2 lines · On Wednesday 12 October 2011 20:56:09 Joe Hershberger wrote:

WARNING:CONSIDER_KSTRTO: consider using kstrto* in preference to simple_strtoul This one seems pretty clear and has been discussed before.

i think we were going to add a .checkpatch.conf to the top level where we could add all the ignored tests

Quoted 4 lines

WARNING:NEW_TYPEDEFS: do not add new typedefs
This seems rather limiting... I'm not sure why even Linux would want this, at least when it applies to typedefs of structs. It makes sense if it's a new typedef for int or something.

Linux has been discouraging new struct typedefs. but it is too broad and catches typedefs that we want (like posix_types.h).

Quoted 4 lines

WARNING:VOLATILE: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
Sometimes using volatile is correct... not sure how this fits in with a policy of 0 errors and 0 warnings... Should it be ignored or not?

"it depends". we'll have to see the specific instance.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111012/3643c9a9/attachment.pgp

#27 lore raw
Quoted 8 lines · Mike Frysinger
Quoted 4 lines · On Wednesday 12 October 2011 20:56:09 Joe Hershberger wrote:

WARNING:NEW_TYPEDEFS: do not add new typedefs
This seems rather limiting... I'm not sure why even Linux would want this, at least when it applies to typedefs of structs. ?It makes sense if it's a new typedef for int or something.

Linux has been discouraging new struct typedefs. ?but it is too broad and catches typedefs that we want (like posix_types.h).

So it's a candidate to ignore, right?

Quoted 6 lines
Quoted 4 lines

WARNING:VOLATILE: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
Sometimes using volatile is correct... not sure how this fits in with a policy of 0 errors and 0 warnings... ?Should it be ignored or not?

"it depends". ?we'll have to see the specific instance.

That's what I was getting at... should we ignore it in checkpatch and simply review any new volatile variables? Or should we not ignore it in checkpatch and have exceptions to "no errors, no warnings"?

I also think that for code cleanup where progress can be incremental, the rules may need to be a little more lenient.

Thanks,
-Joe

#28 lore raw
Quoted 11 lines · On Thursday 13 October 2011 13:14:34 Joe Hershberger wrote:
Quoted 8 lines · Mike Frysinger
Quoted 4 lines · On Wednesday 12 October 2011 20:56:09 Joe Hershberger wrote:

WARNING:NEW_TYPEDEFS: do not add new typedefs
This seems rather limiting... I'm not sure why even Linux would want this, at least when it applies to typedefs of structs. It makes sense if it's a new typedef for int or something.

Linux has been discouraging new struct typedefs. but it is too broad and catches typedefs that we want (like posix_types.h).

So it's a candidate to ignore, right?

it's like the volatiles check. reviewed on a case by case basis.

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

WARNING:VOLATILE: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
Sometimes using volatile is correct... not sure how this fits in with a policy of 0 errors and 0 warnings... Should it be ignored or not?

"it depends". we'll have to see the specific instance.

That's what I was getting at... should we ignore it in checkpatch and simply review any new volatile variables?

if checkpatch ignores it, people won't notice

Quoted 2 lines

Or should we not ignore it in checkpatch and have exceptions to "no errors, no warnings"?

i've always advocated not using checkpatch this way. it's simply another tool which has known bugs and doesn't cover realistic nuances.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111013/41b307a0/attachment.pgp

#29 lore raw
In reply to Joe Hershberger

Dear Joe Hershberger,

Quoted 5 lines · In message <CANr=Z=bmm64Qxv+Zpc=GShY7c2KapAgh9xm-cq79TM1oQ76V5A@mail.gmail.com>…

WARNING:NEW_TYPEDEFS: do not add new typedefs
This seems rather limiting... I'm not sure why even Linux would want this, at least when it applies to typedefs of structs. It makes sense if it's a new typedef for int or something.

See the CodingStyle, start reading at "It's a _mistake_ to use typedef for structures and pointers."

Quoted 4 lines

WARNING:VOLATILE: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
Sometimes using volatile is correct... not sure how this fits in with a policy of 0 errors and 0 warnings... Should it be ignored or not?

There are very, very few cases where a volatile is actually OK, and these should be hiddenin the lowese levels of the implementation. In all cases where we are dealing with device I/O and similar, the volatile shall be removed, and proper I/O accessors be used instead (these may then actually use volatile pointer accesses internally, but usually they don't need to either).

Best regards,

Wolfgang Denk

Signature · 8 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There is a theory which states that if ever anyone discovers  exactly
what  the  Universe is for and why it is here, it will instantly dis-
appear and be replaced by something even more  bizarre  and  inexpli-
cable.  There  is  another  theory which states that this has already
happened.    -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
#30 lore raw
In reply to Joe Hershberger
Quoted 9 lines · Joe Hershberger

Hi Wolfgang,

I'm attempting to make the files I touched in several recent patch-series chechkpatch.pl compliant.

I've hit several cases which fail and probably shouldn't. For each of these cases, should the warning / error just be ignored or reported to checkpatch maintainers or altered some other way?

What is wrong with something like:

ERROR: do not initialise statics to 0 or NULL #35: FILE: serial.c:32:
+static struct serial_device *serial_devices = NULL;

ERROR: do not initialise statics to 0 or NULL #36: FILE: serial.c:33:
+static struct serial_device *serial_current = NULL;

Since it's a bootloader, should we also ignore it with:

--ignore INITIALISED_STATIC

Or maybe not?

Thanks,
Gerlando

#31 lore raw

Dear Gerlando Falauto,

Quoted 7 lines · In message <[email protected]> you wrote:

What is wrong with something like:

ERROR: do not initialise statics to 0 or NULL #35: FILE: serial.c:32:
+static struct serial_device *serial_devices = NULL;

Quoted 5 lines

ERROR: do not initialise statics to 0 or NULL #36: FILE: serial.c:33:
+static struct serial_device *serial_current = NULL;

Since it's a bootloader, should we also ignore it with:

Why? Why don't you just follow the advise and remove the redundant initializers?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Don't you know anything? I should have thought anyone knows that  who
knows anything about anything...      - Terry Pratchett, _Soul Music_
#32 lore raw
Quoted 4 lines · Wolfgang Denk

Dear Gerlando Falauto,

Quoted 1 line · In message<[email protected]> you wrote:
Quoted 8 lines
Quoted 5 lines

What is wrong with something like:

ERROR: do not initialise statics to 0 or NULL #35: FILE: serial.c:32:
+static struct serial_device *serial_devices = NULL;

Why? Why don't you just follow the advise and remove the redundant initializers?

Sorry, I didn't realize it had to do with redundancy, the message was somewhat unclear to me.
I thought the complaint meant something like "you should initialize statics somewhere else", which, in fact, would not make any sense, in ANY context.

I personally would prefer an explicit initialization though, like mama told me to ALWAYS do... wash your hands before you eat, brush your teeth after. (I also like to believe I'm not the only one who had never read ISO/IEC 9899 ?6.7.8#2). :-)

Thanks,
Gerlando Falauto

#33 lore raw
In reply to Gerlando Falauto
Quoted 12 lines · On Thursday 17 November 2011 15:10:22 Gerlando Falauto wrote:
Quoted 8 lines · Joe Hershberger

Hi Wolfgang,

I'm attempting to make the files I touched in several recent patch-series chechkpatch.pl compliant.

I've hit several cases which fail and probably shouldn't. For each of these cases, should the warning / error just be ignored or reported to checkpatch maintainers or altered some other way?

What is wrong with something like:

Quoted 7 lines

ERROR: do not initialise statics to 0 or NULL #35: FILE: serial.c:32:
+static struct serial_device *serial_devices = NULL;

ERROR: do not initialise statics to 0 or NULL #36: FILE: serial.c:33:
+static struct serial_device *serial_current = NULL;

newer gcc is smart enough to put these into .bss. i think older ones were not and put these into .data. in either case, the initialization is redundant (by virtue of the "static"), so i'd just drop the "= NULL".
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20111117/872b3a32/attachment.pgp>