| Message ID | 1453208711-27193-2-git-send-email-sr@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
Hi Stefan, On Tue, Jan 19, 2016 at 9:05 PM, Stefan Roese <sr@denx.de> wrote: > This patch adds a parameter to the function setup_early_uart() to either > enable or disable the internal BayTrail legacy UART. Since the name > setup_early_uart() does not match its functionality any more, lets > rename it to setup_internal_uart() as well in this patch. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Bin Meng <bmeng.cn@gmail.com> > Cc: Simon Glass <sjg@chromium.org> > --- > arch/x86/cpu/baytrail/early_uart.c | 10 +++++++--- > arch/x86/include/asm/u-boot-x86.h | 2 +- > arch/x86/lib/fsp/fsp_support.c | 2 +- > 3 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c > index b64a3a9..471d592 100644 > --- a/arch/x86/cpu/baytrail/early_uart.c > +++ b/arch/x86/cpu/baytrail/early_uart.c > @@ -59,11 +59,15 @@ static void x86_pci_write_config32(int dev, unsigned int where, u32 value) > } > > /* This can be called after memory-mapped PCI is working */ > -int setup_early_uart(void) > +int setup_internal_uart(int enable) > { > - /* Enable the legacy UART hardware. */ > + /* Enable or disable the legacy UART hardware */ > x86_pci_write_config32(PCI_DEV_CONFIG(0, LPC_DEV, LPC_FUNC), UART_CONT, > - 1); > + enable); > + > + /* All done for the disable part, so just return */ > + if (!enable) > + return 0; > > /* > * Set up the pads to the UART function. This allows the signals to > diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h > index dbf8e95..cc5c953 100644 > --- a/arch/x86/include/asm/u-boot-x86.h > +++ b/arch/x86/include/asm/u-boot-x86.h > @@ -45,7 +45,7 @@ void dram_init_banksize(void); > int default_print_cpuinfo(void); > > /* Set up a UART which can be used with printch(), printhex8(), etc. */ > -int setup_early_uart(void); > +int setup_internal_uart(int enable); > > void setup_pcat_compatibility(void); > > diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c > index 875c96a..29fa060 100644 > --- a/arch/x86/lib/fsp/fsp_support.c > +++ b/arch/x86/lib/fsp/fsp_support.c > @@ -111,7 +111,7 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf) > #endif > > #ifdef CONFIG_DEBUG_UART > - setup_early_uart(); > + setup_internal_uart(1); > #endif > > fsp_hdr = find_fsp_header(); > -- There is one more instance of setup_early_uart() in README.x86 that needs to be changed. Other than that, Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Regards, Bin
diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c index b64a3a9..471d592 100644 --- a/arch/x86/cpu/baytrail/early_uart.c +++ b/arch/x86/cpu/baytrail/early_uart.c @@ -59,11 +59,15 @@ static void x86_pci_write_config32(int dev, unsigned int where, u32 value) } /* This can be called after memory-mapped PCI is working */ -int setup_early_uart(void) +int setup_internal_uart(int enable) { - /* Enable the legacy UART hardware. */ + /* Enable or disable the legacy UART hardware */ x86_pci_write_config32(PCI_DEV_CONFIG(0, LPC_DEV, LPC_FUNC), UART_CONT, - 1); + enable); + + /* All done for the disable part, so just return */ + if (!enable) + return 0; /* * Set up the pads to the UART function. This allows the signals to diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index dbf8e95..cc5c953 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -45,7 +45,7 @@ void dram_init_banksize(void); int default_print_cpuinfo(void); /* Set up a UART which can be used with printch(), printhex8(), etc. */ -int setup_early_uart(void); +int setup_internal_uart(int enable); void setup_pcat_compatibility(void); diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c index 875c96a..29fa060 100644 --- a/arch/x86/lib/fsp/fsp_support.c +++ b/arch/x86/lib/fsp/fsp_support.c @@ -111,7 +111,7 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf) #endif #ifdef CONFIG_DEBUG_UART - setup_early_uart(); + setup_internal_uart(1); #endif fsp_hdr = find_fsp_header();
This patch adds a parameter to the function setup_early_uart() to either enable or disable the internal BayTrail legacy UART. Since the name setup_early_uart() does not match its functionality any more, lets rename it to setup_internal_uart() as well in this patch. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/baytrail/early_uart.c | 10 +++++++--- arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/lib/fsp/fsp_support.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)