[U-Boot,v2,2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type

Submitted by Otavio Salvador on Dec. 28, 2012, 7:17 p.m.

Details

Message ID 1356722226-23186-3-git-send-email-otavio@ossystems.com.br
State Changes Requested
Delegated to: Stefano Babic
Headers show

Commit Message

Otavio Salvador Dec. 28, 2012, 7:17 p.m.
For a generic environment, we shouldn't have a fixed rootfs filesystem
so we drop it from env.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
 - reformat environment change to fit in 80 cols

 include/configs/mx28evk.h |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Stefano Babic Jan. 5, 2013, 4:50 p.m.
On 28/12/2012 20:17, Otavio Salvador wrote:
> For a generic environment, we shouldn't have a fixed rootfs filesystem
> so we drop it from env.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Hi Otavio,

> Changes in v2:
>  - reformat environment change to fit in 80 cols
> 
>  include/configs/mx28evk.h |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
> index 8b89b25..ac9522f 100644
> --- a/include/configs/mx28evk.h
> +++ b/include/configs/mx28evk.h
> @@ -292,11 +292,9 @@
>  	"console_mainline=ttyAMA0\0" \
>  	"mmcdev=0\0" \
>  	"mmcpart=2\0" \
> -	"mmcroot=/dev/mmcblk0p3 rw\0" \
> -	"mmcrootfstype=ext3 rootwait\0"	\
> -	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} " \
> -		"root=${mmcroot} " \
> -		"rootfstype=${mmcrootfstype}\0"	\
> +	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
> +	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} "
> +		"root=${mmcroot}\0" \
>  	"loadbootscript="  \
>  		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
>  	"bootscript=echo Running bootscript from mmc ...; "	\
> 

I still get errors running checkpatch, for example:

WARNING: line over 80 characters
#554: FILE: include/configs/mx53loco.h:162:
+			"if run ${get_cmd} ${ftd_addr} ${ftd_file}; then "	\

WARNING: line over 80 characters
#560: FILE: include/configs/mx53loco.h:168:
+					"echo ERROR: Cannot load the DT, aborting...; " \

WARNING: line over 80 characters
#617: FILE: include/configs/mx6qsabrelite.h:177:
+			"if fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}; then " \

Can you fix it and resubmit, please ? I will then apply the patchset.

Thanks,
Stefano Babic
Otavio Salvador Jan. 7, 2013, 12:05 p.m.
On Sat, Jan 5, 2013 at 2:50 PM, Stefano Babic <sbabic@denx.de> wrote:
> On 28/12/2012 20:17, Otavio Salvador wrote:
>> For a generic environment, we shouldn't have a fixed rootfs filesystem
>> so we drop it from env.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>
> Hi Otavio,
>
>> Changes in v2:
>>  - reformat environment change to fit in 80 cols
>>
>>  include/configs/mx28evk.h |    8 +++-----
>>  1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
>> index 8b89b25..ac9522f 100644
>> --- a/include/configs/mx28evk.h
>> +++ b/include/configs/mx28evk.h
>> @@ -292,11 +292,9 @@
>>       "console_mainline=ttyAMA0\0" \
>>       "mmcdev=0\0" \
>>       "mmcpart=2\0" \
>> -     "mmcroot=/dev/mmcblk0p3 rw\0" \
>> -     "mmcrootfstype=ext3 rootwait\0" \
>> -     "mmcargs=setenv bootargs console=${console_mainline},${baudrate} " \
>> -             "root=${mmcroot} " \
>> -             "rootfstype=${mmcrootfstype}\0" \
>> +     "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
>> +     "mmcargs=setenv bootargs console=${console_mainline},${baudrate} "
>> +             "root=${mmcroot}\0" \
>>       "loadbootscript="  \
>>               "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
>>       "bootscript=echo Running bootscript from mmc ...; "     \
>>
>
> I still get errors running checkpatch, for example:
>
> WARNING: line over 80 characters
> #554: FILE: include/configs/mx53loco.h:162:
> +                       "if run ${get_cmd} ${ftd_addr} ${ftd_file}; then "      \
>
> WARNING: line over 80 characters
> #560: FILE: include/configs/mx53loco.h:168:
> +                                       "echo ERROR: Cannot load the DT, aborting...; " \
>
> WARNING: line over 80 characters
> #617: FILE: include/configs/mx6qsabrelite.h:177:
> +                       "if fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}; then " \
>
> Can you fix it and resubmit, please ? I will then apply the patchset.

It does seem too ugly to keep splitting those lines.

The problem here is the use of tags to indent the string.

I'd like to ask if we can relax this rule for the environments as it
will make it confusing to read when looking at the code for no profit
(in my point of  view).

Regards,

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Tom Rini Jan. 7, 2013, 2:07 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01/07/2013 07:05 AM, Otavio Salvador wrote:
> On Sat, Jan 5, 2013 at 2:50 PM, Stefano Babic <sbabic@denx.de> 
> wrote:
>> On 28/12/2012 20:17, Otavio Salvador wrote:
>>> For a generic environment, we shouldn't have a fixed rootfs 
>>> filesystem so we drop it from env.
>>> 
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---
>> 
>> Hi Otavio,
>> 
>>> Changes in v2: - reformat environment change to fit in 80 cols
>>> 
>>> include/configs/mx28evk.h |    8 +++----- 1 file changed, 3 
>>> insertions(+), 5 deletions(-)
>>> 
>>> diff --git a/include/configs/mx28evk.h 
>>> b/include/configs/mx28evk.h index 8b89b25..ac9522f 100644 --- 
>>> a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ 
>>> -292,11 +292,9 @@ "console_mainline=ttyAMA0\0" \ "mmcdev=0\0" \
>>> "mmcpart=2\0" \ -     "mmcroot=/dev/mmcblk0p3 rw\0" \ - 
>>> "mmcrootfstype=ext3 rootwait\0" \ -     "mmcargs=setenv 
>>> bootargs console=${console_mainline},${baudrate} " \ - 
>>> "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ +
>>> "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \ +     "mmcargs=setenv
>>> bootargs console=${console_mainline},${baudrate} " + 
>>> "root=${mmcroot}\0" \ "loadbootscript="  \ "fatload mmc 
>>> ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ 
>>> "bootscript=echo Running bootscript from mmc ...; "     \
>>> 
>> 
>> I still get errors running checkpatch, for example:
>> 
>> WARNING: line over 80 characters #554: FILE: 
>> include/configs/mx53loco.h:162: +                       "if run 
>> ${get_cmd} ${ftd_addr} ${ftd_file}; then "      \
>> 
>> WARNING: line over 80 characters #560: FILE: 
>> include/configs/mx53loco.h:168: + "echo ERROR: Cannot load the
>> DT, aborting...; " \
>> 
>> WARNING: line over 80 characters #617: FILE: 
>> include/configs/mx6qsabrelite.h:177: +                       "if 
>> fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}; then " 
>> \
>> 
>> Can you fix it and resubmit, please ? I will then apply the 
>> patchset.
> 
> It does seem too ugly to keep splitting those lines.
> 
> The problem here is the use of tags to indent the string.
> 
> I'd like to ask if we can relax this rule for the environments as 
> it will make it confusing to read when looking at the code for no 
> profit (in my point of  view).

Replied in 5/6, where the issues are popping up from.

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQIcBAEBAgAGBQJQ6taPAAoJENk4IS6UOR1WA9YP/1LOjmBk/kM3BM5PTW6nQd5m
lr5qrSgL7FE1RdurP2v3d+4TGddMnamyiJeHyoImVFnZVIKUiorjDiWppLzca0GS
kR3z4Xj+r7MoGvXe6oQfNBdmbrKfc2uUd8Nw4UDlvEiMWYQRHZ+kKyED98dT1BvD
/UZfXhzbzSQWqrkyWyQkNkU853n3Wg2lHC2C58o7MpCqOJ1RhvFJxdvIOSVFOJkG
RshbQFdlDFfgJYkNT1Aa9lAEk6Rb4xHT6V+d2Ezcyhj6VmjmMzwimDwCUaXlr98x
bPLSX80e8g6/f2ZDtc/f/VslgGpdE87WTSLFxOAk7TcBTTI1ukeCcqYKMr/OHtzs
zDWdHkO3ZxB55mgsZRL3jxRrVMeyM6xfWaQjtorOOIdCpqLBr+f3U6QZm8UvB6+J
kQqgoHk+kldqulMygqIGPLijKF4AMYgcB0HUH8aKPYtde/WlXPhijwAKSQSqIPho
emaF0c0ArSiGqh4ELKkZFNgtbmqmOZK8UwlnNRrCBYtBd4iXYrojRw1nGoCWjiko
EP59M738cp6rEmT6I7+H5yt3ik8FcECNYnmMfTLkoF9RF47BPrV+qZM2bSJVe3y4
zJHd2LWXcoJyAEmgLKcqZ9UjOnV2/U/1k9Rxri6O6K5U2OGlC8TeLaIiwcv+3xzk
BvNbtMlZhcVIxbyfxVdo
=yO3w
-----END PGP SIGNATURE-----

Patch hide | download patch | download mbox

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 8b89b25..ac9522f 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -292,11 +292,9 @@ 
 	"console_mainline=ttyAMA0\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rw\0" \
-	"mmcrootfstype=ext3 rootwait\0"	\
-	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} " \
-		"root=${mmcroot} " \
-		"rootfstype=${mmcrootfstype}\0"	\
+	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
+	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} "
+		"root=${mmcroot}\0" \
 	"loadbootscript="  \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; "	\