Re: [U-Boot] [PATCH 05/82] console: Don't enable CONFIG-CONSOLE_MUX, etc. in SPL

[Simon Glass]

Hi Bin,

On 10 October 2016 at 21:15, Bin Meng  wrote:
> Hi Simon,
>
> Typo of CONFIG-CONSOLE_MUX in the commit title.
>
> On Mon, Sep 26, 2016 at 11:33 AM, Simon Glass  wrote:
>> CONFIG_CONSOLE_MUX and CONFIG_SYS_CONSOLE_IS_IN_ENV are not applicable
>> for SPL. Update the console code to use CONFIG_IS_ENABLED(), so that these
>> options will be inactive in SPL.
>
> I don't understand, what's the difference between CONFIG_IS_ENABLE() and 
> #ifdef?

CONFIG_IS_ENABLED() can have a different value for SPL and U-Boot
proper. It uses CONFIG_xxx or CONFIG_SPL_xxx depending on which is
being built.

>
>>
>> Signed-off-by: Simon Glass 
>> ---
>>
>>  common/console.c | 30 +++---
>>  1 file changed, 15 insertions(+), 15 deletions(-)

Regards,
Simon
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 05/82] console: Don't enable CONFIG-CONSOLE_MUX, etc. in SPL

[Bin Meng]

Hi Simon,

Typo of CONFIG-CONSOLE_MUX in the commit title.

On Mon, Sep 26, 2016 at 11:33 AM, Simon Glass  wrote:
> CONFIG_CONSOLE_MUX and CONFIG_SYS_CONSOLE_IS_IN_ENV are not applicable
> for SPL. Update the console code to use CONFIG_IS_ENABLED(), so that these
> options will be inactive in SPL.

I don't understand, what's the difference between CONFIG_IS_ENABLE() and #ifdef?

>
> Signed-off-by: Simon Glass 
> ---
>
>  common/console.c | 30 +++---
>  1 file changed, 15 insertions(+), 15 deletions(-)
>

[snip]

Regards,
Bin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 05/82] console: Don't enable CONFIG-CONSOLE_MUX, etc. in SPL

[Simon Glass]

CONFIG_CONSOLE_MUX and CONFIG_SYS_CONSOLE_IS_IN_ENV are not applicable
for SPL. Update the console code to use CONFIG_IS_ENABLED(), so that these
options will be inactive in SPL.

Signed-off-by: Simon Glass 
---

 common/console.c | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/console.c b/common/console.c
index 31a9b3e..4d56ed7 100644
--- a/common/console.c
+++ b/common/console.c
@@ -40,14 +40,14 @@ static int on_console(const char *name, const char *value, 
enum env_op op,
case env_op_create:
case env_op_overwrite:
 
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
if (iomux_doenv(console, value))
return 1;
 #else
/* Try assigning specified device */
if (console_assign(console, value) < 0)
return 1;
-#endif /* CONFIG_CONSOLE_MUX */
+#endif
return 0;
 
case env_op_delete:
@@ -84,7 +84,7 @@ static int on_silent(const char *name, const char *value, 
enum env_op op,
 U_BOOT_ENV_CALLBACK(silent, on_silent);
 #endif
 
-#ifdef CONFIG_SYS_CONSOLE_IS_IN_ENV
+#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV)
 /*
  * if overwrite_console returns 1, the stdin, stderr and stdout
  * are switched to the serial port, else the settings in the
@@ -97,7 +97,7 @@ extern int overwrite_console(void);
 #define OVERWRITE_CONSOLE 0
 #endif /* CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE */
 
-#endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */
+#endif /* CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV) */
 
 static int console_setfile(int file, struct stdio_dev * dev)
 {
@@ -144,7 +144,7 @@ static int console_setfile(int file, struct stdio_dev * dev)
return error;
 }
 
-#if defined(CONFIG_CONSOLE_MUX)
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
 /** Console I/O multiplexing ***/
 
 static struct stdio_dev *tstcdev;
@@ -264,7 +264,7 @@ static inline void console_doenv(int file, struct stdio_dev 
*dev)
 {
console_setfile(file, dev);
 }
-#endif /* defined(CONFIG_CONSOLE_MUX) */
+#endif /* CONIFIG_IS_ENABLED(CONSOLE_MUX) */
 
 /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS */
 
@@ -289,7 +289,7 @@ int serial_printf(const char *fmt, ...)
 int fgetc(int file)
 {
if (file < MAX_FILES) {
-#if defined(CONFIG_CONSOLE_MUX)
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
/*
 * Effectively poll for input wherever it may be available.
 */
@@ -727,7 +727,7 @@ void stdio_print_current_devices(void)
}
 }
 
-#ifdef CONFIG_SYS_CONSOLE_IS_IN_ENV
+#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV)
 /* Called after the relocation - use desired console functions */
 int console_init_r(void)
 {
@@ -736,7 +736,7 @@ int console_init_r(void)
 #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
int i;
 #endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
int iomux_err = 0;
 #endif
 
@@ -757,7 +757,7 @@ int console_init_r(void)
inputdev  = search_device(DEV_FLAGS_INPUT,  stdinname);
outputdev = search_device(DEV_FLAGS_OUTPUT, stdoutname);
errdev= search_device(DEV_FLAGS_OUTPUT, stderrname);
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
iomux_err = iomux_doenv(stdin, stdinname);
iomux_err += iomux_doenv(stdout, stdoutname);
iomux_err += iomux_doenv(stderr, stderrname);
@@ -790,7 +790,7 @@ int console_init_r(void)
console_doenv(stdin, inputdev);
}
 
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
 done:
 #endif
 
@@ -820,7 +820,7 @@ done:
return 0;
 }
 
-#else /* CONFIG_SYS_CONSOLE_IS_IN_ENV */
+#else /* !CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV) */
 
 /* Called after the relocation - use desired console functions */
 int console_init_r(void)
@@ -862,7 +862,7 @@ int console_init_r(void)
if (outputdev != NULL) {
console_setfile(stdout, outputdev);
console_setfile(stderr, outputdev);
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
console_devices[stdout][0] = outputdev;
console_devices[stderr][0] = outputdev;
 #endif
@@ -871,7 +871,7 @@ int console_init_r(void)
/* Initializes input console */
if (inputdev != NULL) {
console_setfile(stdin, inputdev);
-#ifdef CONFIG_CONSOLE_MUX
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
console_devices[stdin][0] = inputdev;
 #endif
}
@@ -896,4 +896,4 @@ int console_init_r(void)
return 0;
 }
 
-#endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */
+#endif /* CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV) */
-- 
2.8.0.rc3.226.g39d4020

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot