Skip to contentSkip to conversation

fdt: Correct global_data condition in main

PATCH Superseded Simon Glass 4 participants 5 messages Nov 28, 2012 – Nov 29, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fdt: Correct global_data condition in main

We need an extra condition here in case we want to use fdt without the silent console/cmdline editing/post options.

Note: It might be acceptable instead to just always declare this here.

#1 lore raw

PATCH 1/1 fdt: Correct global_data condition in main

Dear Simon Glass,

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

We need an extra condition here in case we want to use fdt without the silent console/cmdline editing/post options.

Note: It might be acceptable instead to just always declare this here. From what I can tell it has no code size impact to declare it on any architecture.

I think we should get rid of the #ifdef

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
Virtue is a relative term.
	-- Spock, "Friday's Child", stardate 3499.1
#2 lore raw

PATCH 1/1 fdt: Correct global_data condition in main

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 4 lines · Wolfgang Denk

Dear Simon Glass,

In message <[email protected]> you wrote:

Quoted 8 lines
Quoted 6 lines

We need an extra condition here in case we want to use fdt without the silent console/cmdline editing/post options.

Note: It might be acceptable instead to just always declare this here. From what I can tell it has no code size impact to declare it on any architecture.

I think we should get rid of the #ifdef

Agreed.

- --
Tom

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

iQIcBAEBAgAGBQJQtkL6AAoJENk4IS6UOR1WspwQAJIwyZFufp5bhoO2kNi6XqeX MEruF51azSAoFURFdqpFQDCUAg1eGipABTlhefb3ufmYfuW+pF9aOMfCewYfRNmz nnCf/qbxbQ4s+k87H9RpQGUEf2iRDBmJCenYFw1u6/504tJszgYZprbdeTXTLMR5 1Hll+gNFauqBBR/LL+fmiyuXez1yli6FXR2+31AntUfk+CKpD6SOKgM3UFvzxLuC YIIdgIzyEqD8fKs1f5FcZv08t61dXUu5yNjLMHc3qyeuyRhMHpFMpjFQYqXYY0IT mFv7au9433bJHSvwXd6po/6u7T2lwoCispqlVmSIoP8/GvdQswPorWSn13fFpIsW fmXMVVACkB0cCZCI+NkHi2mP7douNEp+foR5MBbd5NVKiZ1lKkAJ9/EjkCsicydp 7ozjF23PNTq5gkWHg0A/jZQBUKi94vGcM4VUbXlb4kYI/fStZTzl2g/I/jAAI3CY d/dEfZ4oF8PSGSlPN4I4yd8qwZtdUfQJyPZu1Z5MPgM4alBA29cTKDSy/sofnPhL dS7hpQBPF3oFvCPlcEZrxX95oekgAkzQwKHz+I0cjS0uzKYmfhMUkDT40KxcnMYx V5dohdMmlnPMwYzgt7lnD/n7p6XEgaEnSJBT/Ft0ygc4E1NE+pU/LGTdMZt4HK/r ewTQRer9rcBmXQ+W4fPz
=D685
-----END PGP SIGNATURE-----

#3 lore raw

PATCH v2 1/1 fdt: Correct global_data condition in main

In reply to Simon Glass

We need an extra condition here in case we want to use fdt without the silent console/cmdline editing/post options. It is easier to just remove the #ifdef.

---
Changes in v2:
- Remove the #ifdef as it is getting out of hand

 common/main.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
common/main.c +0 -2
index 8052d42..5362781 100644
@@ -53,9 +53,7 @@
 #include <linux/ctype.h>
 #include <menu.h>
 
-#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
 DECLARE_GLOBAL_DATA_PTR;
-#endif
 
 /*
  * Board-specific Platform code can reimplement show_boot_progress () if needed
Signature · 1 line
1.7.7.3
#4 lore raw

PATCH v2 1/1 fdt: Correct global_data condition in main

Hi Simon,

Quoted 18 lines · Simon Glass

We need an extra condition here in case we want to use fdt without the silent console/cmdline editing/post options. It is easier to just remove the #ifdef.

---
Changes in v2:
- Remove the #ifdef as it is getting out of hand

 common/main.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
common/main.c +0 -0
index 8052d42..5362781 100644

common/main.c line 59

Quoted 9 lines
common/main.c +0 -2
@@ -53,9 +53,7 @@
 #include <linux/ctype.h>
 #include <menu.h>
 
-#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
 DECLARE_GLOBAL_DATA_PTR;
-#endif
 
 /*
  * Board-specific Platform code can reimplement show_boot_progress () if needed

Applied to u-boot-fdt, pull request coming.

Thanks,
gvb