coreboot-gerrit February 2014

coreboot-gerrit@coreboot.org

1 participants
1135 discussions

Patch set updated for coreboot: 646af2b rambi: disable internal pullups on ram_id[2:0]
by Aaron Durbin 05 Feb '14

05 Feb '14

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4885 -gerrit commit 646af2b9fb914abc23465af968fd93875455eb1c Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed Oct 16 09:21:55 2013 -0700 rambi: disable internal pullups on ram_id[2:0] The ram_id[2:0] signals have stuffing options for pull up/down with values of 10K. However, the default pulldown values for these pads are 20K. Therefore, one can't read a high value because of the high voltage threshold is 0.65 * Vref. Therefore the high signals are marginal at best. Fix this issue by disabling the internal pull for the pads connected to ram_id[2:0]. BUG=chrome-os-partner:23350 BRANCH=None TEST=Built and checked that ram_id[2:0] is properly read now. Change-Id: Ib414d5798b472574337d1b71b87a4cf92f40c762 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://chromium-review.googlesource.com/173211 Reviewed-by: Shawn Nematbakhsh <shawnn(a)chromium.org> Reviewed-by: Bernie Thompson <bhthompson(a)chromium.org> --- src/mainboard/google/rambi/romstage.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c index d15a21d..369ebad 100644 --- a/src/mainboard/google/rambi/romstage.c +++ b/src/mainboard/google/rambi/romstage.c @@ -37,14 +37,29 @@ #define GPIO_SSUS_38_PAD 50 #define GPIO_SSUS_39_PAD 58 +static inline void disable_internal_pull(int pad) +{ + const int pull_mask = ~(0xf << 7); + write32(ssus_pconf0(pad), read32(ssus_pconf0(pad)) & pull_mask); +} + static void *get_spd_pointer(char *spd_file_content, int total_spds) { int ram_id = 0; + /* The ram_id[2:0] pullups on rambi are too large for the default 20K + * pulldown on the pad. Therefore, disable the internal pull resistor to + * read high values correctly. */ + disable_internal_pull(GPIO_SSUS_37_PAD); + disable_internal_pull(GPIO_SSUS_38_PAD); + disable_internal_pull(GPIO_SSUS_39_PAD); + ram_id |= (ssus_get_gpio(GPIO_SSUS_37_PAD) << 0); ram_id |= (ssus_get_gpio(GPIO_SSUS_38_PAD) << 1); ram_id |= (ssus_get_gpio(GPIO_SSUS_39_PAD) << 2); + printk(BIOS_DEBUG, "ram_id=%d, total_spds: %d\n", ram_id, total_spds); + if (ram_id >= total_spds) return NULL;

1 0

Patch set updated for coreboot: 5cd4af4 baytrail: correct MMC pci location
by Aaron Durbin 05 Feb '14

05 Feb '14

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4884 -gerrit commit 5cd4af4cc868f7ff86e6fe0f2b8ff4b3ec025f84 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Fri Oct 11 08:39:54 2013 -0500 baytrail: correct MMC pci location The original documentation was incorrect. Fix the pci device for the MMC port to reflect reality. MMC is at 00:17.0 with a device id of 0x0f50. BUG=None BRANCH=None TEST=Built. Change-Id: Ic18665b7dda5f386e72d1a5255e4e57d5b631eb0 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://chromium-review.googlesource.com/172772 Reviewed-by: Shawn Nematbakhsh <shawnn(a)chromium.org> --- src/soc/intel/baytrail/baytrail/pci_devs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/soc/intel/baytrail/baytrail/pci_devs.h b/src/soc/intel/baytrail/baytrail/pci_devs.h index 46c6ea6..8b0335e 100644 --- a/src/soc/intel/baytrail/baytrail/pci_devs.h +++ b/src/soc/intel/baytrail/baytrail/pci_devs.h @@ -32,11 +32,6 @@ #define GFX_FUNC 0 # define GFX_DEVID 0x0f31 -/* MMC Port */ -#define MMC_DEV 16 -#define MMC_FUNC 0 -# define MMC_DEVID 0x0f14 - /* SDIO Port */ #define SDIO_DEV 17 #define SDIO_FUNC 0 @@ -63,6 +58,11 @@ #define LPE_FUNC 0 # define LPE_DEVID 0x0f28 +/* MMC Port */ +#define MMC_DEV 23 +#define MMC_FUNC 0 +# define MMC_DEVID 0x0f50 + /* Serial IO 1 */ #define SIO1_DEV 24 # define SIO_DMA1_DEV SIO1_DEV

1 0

Patch set updated for coreboot: e6eed1e rambi: add BSP lapic device
by Aaron Durbin 05 Feb '14

05 Feb '14

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4887 -gerrit commit e6eed1ed6bc8512cb6382d2be86115e50bee0103 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Mon Oct 21 12:11:17 2013 -0500 rambi: add BSP lapic device There's some baked in assumptions internal to coreboot that the BSP's cpu device exists in the device tree. Therefore provide one in the device tree. BUG=chrome-os-partner:22862 BRANCH=None TEST=Compiled and booted with other changes. Change-Id: I22ba10964760ee8efbc5bbd5d4ce65daf31b3839 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://chromium-review.googlesource.com/173702 --- src/mainboard/google/rambi/devicetree.cb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/rambi/devicetree.cb b/src/mainboard/google/rambi/devicetree.cb index 376aab6..c6ea97c 100644 --- a/src/mainboard/google/rambi/devicetree.cb +++ b/src/mainboard/google/rambi/devicetree.cb @@ -1,5 +1,7 @@ chip soc/intel/baytrail - device cpu_cluster 0 on end + device cpu_cluster 0 on + device lapic 0 on end + end device domain 0 on device pci 00.0 on end # SoC router device pci 02.0 on end # GFX

1 0

Patch set updated for coreboot: 6ac41dc baytrail: Modify GPIO pull-up specification method
by Aaron Durbin 05 Feb '14

05 Feb '14

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4886 -gerrit commit 6ac41dcf8fec62a24ab2df6e3c56d82c22839127 Author: Shawn Nematbakhsh <shawnn(a)chromium.org> Date: Fri Oct 18 17:13:18 2013 -0700 baytrail: Modify GPIO pull-up specification method Minor style changes to the way GPIO pull-ups are specified in board-specific GPIO maps. Intent is to allow calls to GPIO_FUNC macro from such maps. BUG=chrome-os-partner:22863 TEST=Manual. Build + boot on bayleybay. Change-Id: I80134b65d22d3ad8a049837dccc0985e321645da Signed-off-by: Shawn Nematbakhsh <shawnn(a)chromium.org> Reviewed-on: https://chromium-review.googlesource.com/173748 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Commit-Queue: David James <davidjames(a)chromium.org> Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/soc/intel/baytrail/baytrail/gpio.h | 49 +++++++++++++--------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/src/soc/intel/baytrail/baytrail/gpio.h b/src/soc/intel/baytrail/baytrail/gpio.h index a180ba7..8d7925b 100644 --- a/src/soc/intel/baytrail/baytrail/gpio.h +++ b/src/soc/intel/baytrail/baytrail/gpio.h @@ -105,9 +105,9 @@ #define PAD_PU_40K (3 << 9) /* config0[8:7] - Pull assign */ -#define PAD_PU_DISABLE (0 << 7) -#define PAD_PU_UP (1 << 7) -#define PAD_PU_DOWN (2 << 7) +#define PAD_PULL_DISABLE (0 << 7) +#define PAD_PULL_UP (1 << 7) +#define PAD_PULL_DOWN (2 << 7) /* config0[2:0] - Func. pin mux */ #define PAD_FUNC0 0x0 @@ -146,7 +146,7 @@ * legacy config -- so also configure the pad regs as GPIO. We rely upon * the fact that all GPNCORE pads are function 0 GPIO. */ #define GPIO_INPUT_PU_10K \ - { .pad_conf0 = PAD_PU_10K | PAD_PU_UP | PAD_CONFIG0_DEFAULT \ + { .pad_conf0 = PAD_PU_10K | PAD_PULL_UP | PAD_CONFIG0_DEFAULT \ | PAD_FUNC0, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_val = PAD_VAL_INPUT_ENABLE, \ @@ -154,7 +154,7 @@ .io_sel = GPIO_DIR_INPUT } #define GPIO_INPUT_PD_10K \ - { .pad_conf0 = PAD_PU_10K | PAD_PU_DOWN | PAD_CONFIG0_DEFAULT \ + { .pad_conf0 = PAD_PU_10K | PAD_PULL_DOWN | PAD_CONFIG0_DEFAULT \ | PAD_FUNC0, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_val = PAD_VAL_INPUT_ENABLE, \ @@ -162,7 +162,7 @@ .io_sel = GPIO_DIR_INPUT } #define GPIO_INPUT_NOPU \ - { .pad_conf0 = PAD_PU_10K | PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \ + { .pad_conf0 = PAD_PU_10K | PAD_PULL_DISABLE | PAD_CONFIG0_DEFAULT \ | PAD_FUNC0, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_val = PAD_VAL_INPUT_ENABLE, \ @@ -170,7 +170,7 @@ .io_sel = GPIO_DIR_INPUT } #define GPIO_OUT_LOW \ - { .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \ + { .pad_conf0 = PAD_PULL_DISABLE | PAD_CONFIG0_DEFAULT \ | PAD_FUNC0, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_val = PAD_VAL_OUTPUT_ENABLE | PAD_VAL_LOW, \ @@ -179,7 +179,7 @@ .gp_lvl = GPIO_LEVEL_LOW } #define GPIO_OUT_HIGH \ - { .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \ + { .pad_conf0 = PAD_PULL_DISABLE | PAD_CONFIG0_DEFAULT \ | PAD_FUNC0, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_val = PAD_VAL_OUTPUT_ENABLE | PAD_VAL_HIGH, \ @@ -188,34 +188,21 @@ .gp_lvl = GPIO_LEVEL_HIGH } /* Define no-pull / PU / PD configs for each functional config option */ -#define _GPIO_FUNC(_func, _pu, _str) \ +#define GPIO_FUNC(_func, _pudir, _str) \ { .use_sel = GPIO_USE_PAD, \ - .pad_conf0 = PAD_FUNC##_func | PAD_PU_##_pu | PAD_PU_##_str | \ + .pad_conf0 = PAD_FUNC##_func | PAD_##_pudir | PAD_PU_##_str | \ PAD_CONFIG0_DEFAULT, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_val = PAD_VAL_DEFAULT } -#define GPIO_FUNC0 _GPIO_FUNC(0, DISABLE, 10K) -#define GPIO_FUNC0_PU_10K _GPIO_FUNC(0, UP, 10K) -#define GPIO_FUNC0_PD_10K _GPIO_FUNC(0, DOWN, 10K) -#define GPIO_FUNC1 _GPIO_FUNC(1, DISABLE, 10K) -#define GPIO_FUNC1_PU_10K _GPIO_FUNC(1, UP, 10K) -#define GPIO_FUNC1_PD_10K _GPIO_FUNC(1, DOWN, 10K) -#define GPIO_FUNC2 _GPIO_FUNC(2, DISABLE, 10K) -#define GPIO_FUNC2_PU_10K _GPIO_FUNC(2, UP, 10K) -#define GPIO_FUNC2_PD_10K _GPIO_FUNC(2, DOWN, 10K) -#define GPIO_FUNC3 _GPIO_FUNC(3, DISABLE, 10K) -#define GPIO_FUNC3_PU_10K _GPIO_FUNC(3, UP, 10K) -#define GPIO_FUNC3_PD_10K _GPIO_FUNC(3, DOWN, 10K) -#define GPIO_FUNC4 _GPIO_FUNC(4, DISABLE, 10K) -#define GPIO_FUNC4_PU_10K _GPIO_FUNC(4, UP, 10K) -#define GPIO_FUNC4_PD_10K _GPIO_FUNC(4, DOWN, 10K) -#define GPIO_FUNC5 _GPIO_FUNC(5, DISABLE, 10K) -#define GPIO_FUNC5_PU_10K _GPIO_FUNC(5, UP, 10K) -#define GPIO_FUNC5_PD_10K _GPIO_FUNC(5, DOWN, 10K) -#define GPIO_FUNC6 _GPIO_FUNC(6, DISABLE, 10K) -#define GPIO_FUNC6_PU_10K _GPIO_FUNC(6, UP, 10K) -#define GPIO_FUNC6_PD_10K _GPIO_FUNC(6, DOWN, 10K) +/* Default functional configs -- no PU */ +#define GPIO_FUNC0 GPIO_FUNC(0, PULL_DISABLE, 10K) +#define GPIO_FUNC1 GPIO_FUNC(1, PULL_DISABLE, 10K) +#define GPIO_FUNC2 GPIO_FUNC(2, PULL_DISABLE, 10K) +#define GPIO_FUNC3 GPIO_FUNC(3, PULL_DISABLE, 10K) +#define GPIO_FUNC4 GPIO_FUNC(4, PULL_DISABLE, 10K) +#define GPIO_FUNC5 GPIO_FUNC(5, PULL_DISABLE, 10K) +#define GPIO_FUNC6 GPIO_FUNC(6, PULL_DISABLE, 10K) /* End marker */ #define GPIO_LIST_END 0xffffffff

1 0

New patch to review for coreboot: 727ac7a console: Remove DEBUG_SMI temporarily
by Kyösti Mälkki 05 Feb '14

05 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5142 -gerrit commit 727ac7a58b50279a67a4b2cd430372781f9dc58b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jan 26 11:32:51 2014 +0200 console: Remove DEBUG_SMI temporarily Existing code compiled serial communication in SMM even when DEBUG_SMI was not selected, if serial console was enabled. Followup will re-enable DEBUG_SMI output with tighter security policy and possibly wider support for consoles. Change-Id: Ic5e25cd7453cb2243f7ac592b093fba752a299f7 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/console/Makefile.inc | 3 +- src/cpu/x86/smm/Makefile.inc | 2 -- src/cpu/x86/smm/smihandler.c | 3 +- src/cpu/x86/smm/smiutil.c | 67 ------------------------------------ src/cpu/x86/smm/smm_module_handler.c | 4 +++ src/include/console/console.h | 1 + 6 files changed, 8 insertions(+), 72 deletions(-) diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 62be1d2..54d59cd 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -5,8 +5,7 @@ ramstage-y += vsprintf.c ramstage-y += post.c ramstage-y += die.c -smm-y += printk.c -smm-y += vtxprintf.c +smm-$(CONFIG_DEBUG_SMI) += vtxprintf.c printk.c smm-$(CONFIG_SMM_TSEG) += die.c romstage-$(CONFIG_EARLY_CONSOLE) += vtxprintf.c diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index b595a36..06ba2a3 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -21,7 +21,6 @@ ifeq ($(CONFIG_SMM_MODULES),y) smmstub-y += smm_stub.S smmstub-y += smm_module_header.c -smm-y += smiutil.c smm-y += smm_module_header.c smm-y += smm_module_handler.c @@ -79,7 +78,6 @@ SMM_LDSCRIPT := smm.ld endif smm-y += smihandler.c -smm-y += smiutil.c $(obj)/cpu/x86/smm/smm.o: $$(smm-objs) $(LIBGCC_FILE_NAME) $(CC) $(LDFLAGS) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(smm-objs) $(LIBGCC_FILE_NAME) -Wl,--end-group diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c index fc30909..e8f79fe 100644 --- a/src/cpu/x86/smm/smihandler.c +++ b/src/cpu/x86/smm/smihandler.c @@ -148,8 +148,9 @@ void smi_handler(u32 smm_revision) node=nodeid(); +#if CONFIG_DEBUG_SMI console_init(); - +#endif printk(BIOS_SPEW, "\nSMI# #%d\n", node); switch (smm_revision) { diff --git a/src/cpu/x86/smm/smiutil.c b/src/cpu/x86/smm/smiutil.c deleted file mode 100644 index 13ee12e..0000000 --- a/src/cpu/x86/smm/smiutil.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include <arch/io.h> -#include <cpu/x86/cache.h> -#include <cpu/x86/smm.h> -#include <console/console.h> -#include <console/vtxprintf.h> - -#if CONFIG_CONSOLE_SERIAL8250MEM -static u32 serial8250mem_base_address = 0; -#endif - -void console_tx_flush(void) -{ -} - -void console_tx_byte(unsigned char byte) -{ - if (byte == '\n') - console_tx_byte('\r'); - -#if CONFIG_CONSOLE_SERIAL8250MEM - if (serial8250mem_base_address) - uart8250_mem_tx_byte(serial8250mem_base_address, byte); -#endif -#if CONFIG_CONSOLE_SERIAL8250 - uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); -#endif -#if CONFIG_CONSOLE_NE2K - ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); -#endif -} - -void console_init(void) -{ -#if CONFIG_DEBUG_SMI - console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; -#if CONFIG_CONSOLE_SERIAL8250 - uart_init(); -#endif -#if CONFIG_CONSOLE_SERIAL8250MEM - serial8250mem_base_address = uart_mem_init(); -#endif -#else - console_loglevel = 1; -#endif -} - diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c index 444e335..ddf03ed 100644 --- a/src/cpu/x86/smm/smm_module_handler.c +++ b/src/cpu/x86/smm/smm_module_handler.c @@ -121,7 +121,9 @@ void smm_handler_start(void *arg, int cpu, const struct smm_runtime *runtime) smm_runtime = runtime; if (cpu >= CONFIG_MAX_CPUS) { +#if CONFIG_DEBUG_SMI console_init(); +#endif printk(BIOS_CRIT, "Invalid CPU number assigned in SMM stub: %d\n", cpu); return; @@ -141,7 +143,9 @@ void smm_handler_start(void *arg, int cpu, const struct smm_runtime *runtime) smi_backup_pci_address(); +if CONFIG_DEBUG_SMI console_init(); +#endif printk(BIOS_SPEW, "\nSMI# #%d\n", cpu); diff --git a/src/include/console/console.h b/src/include/console/console.h index c5f5297..78307a3 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -89,6 +89,7 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, void hexdump32(char LEVEL, const void *d, int len); #if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \ + defined(__SMM__) && !CONFIG_DEBUG_SMI || \ (defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE static inline void printk(int LEVEL, const char *fmt, ...);

1 0

New patch to review for coreboot: f8f0f06 console: Drop IO and Oxford (PCI) UARTs on armv7
by Kyösti Mälkki 05 Feb '14

05 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5141 -gerrit commit f8f0f06ddb987f8a6686fa59800a22d77d5a659b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Feb 3 19:43:08 2014 +0200 console: Drop IO and Oxford (PCI) UARTs on armv7 Change-Id: Ia410b61c4babdfa3c984539527a9739462d3ad80 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/armv7/early_console.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c index 84f97ba..b6339fc 100644 --- a/src/arch/armv7/early_console.c +++ b/src/arch/armv7/early_console.c @@ -26,21 +26,9 @@ void console_tx_byte(unsigned char byte) if (byte == '\n') console_tx_byte('\r'); -#if CONFIG_CONSOLE_SERIAL8250MEM - if (oxford_oxpcie_present) { - uart8250_mem_tx_byte( - CONFIG_OXFORD_OXPCIE_BASE_ADDRESS + 0x1000, byte); - } -#endif -#if CONFIG_CONSOLE_SERIAL8250 - uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); -#endif #if CONFIG_CONSOLE_SERIAL_UART uart_tx_byte(byte); #endif -#if CONFIG_USBDEBUG - usbdebug_tx_byte(0, byte); -#endif #if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__) cbmemc_tx_byte(byte); #endif @@ -48,18 +36,9 @@ void console_tx_byte(unsigned char byte) static void _console_tx_flush(void) { -#if CONFIG_CONSOLE_SERIAL8250MEM - uart8250_mem_tx_flush(CONFIG_OXFORD_OXPCIE_BASE_ADDRESS + 0x1000); -#endif -#if CONFIG_CONSOLE_SERIAL8250 - uart8250_tx_flush(CONFIG_TTYS0_BASE); -#endif #if CONFIG_CONSOLE_SERIAL_UART uart_tx_flush(); #endif -#if CONFIG_USBDEBUG - usbdebug_tx_flush(0); -#endif } int do_printk(int msg_level, const char *fmt, ...)

1 0

New patch to review for coreboot: ea32b94 console: Drop extra uart_init()
by Kyösti Mälkki 05 Feb '14

05 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5140 -gerrit commit ea32b942498c3ee7d7fb17f1a21d970bdc310279 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Feb 3 13:07:59 2014 +0200 console: Drop extra uart_init() This call is already in console_init(). Change-Id: Ie0cb3595af514e37efac5ac5d474f52ba551bf22 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/mainboard/advansus/a785e-i/romstage.c | 1 - src/mainboard/amd/dinar/romstage.c | 1 - src/mainboard/amd/torpedo/romstage.c | 1 - src/mainboard/asus/m5a88-v/romstage.c | 1 - src/mainboard/avalue/eax-785e/romstage.c | 1 - src/mainboard/supermicro/h8qgi/romstage.c | 1 - src/mainboard/supermicro/h8scm/romstage.c | 1 - src/mainboard/supermicro/x6dhr_ig2/romstage.c | 1 - src/mainboard/tyan/s8226/romstage.c | 1 - 9 files changed, 9 deletions(-) diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c index c1366d5..490d146 100644 --- a/src/mainboard/advansus/a785e-i/romstage.c +++ b/src/mainboard/advansus/a785e-i/romstage.c @@ -102,7 +102,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) w83627hf_set_clksel_48(PNP_DEV(0x2e, 0)); w83627hf_enable_serial(0, CONFIG_TTYS0_BASE); - uart_init(); console_init(); printk(BIOS_DEBUG, "\n"); diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c index a124905..91b385f 100644 --- a/src/mainboard/amd/dinar/romstage.c +++ b/src/mainboard/amd/dinar/romstage.c @@ -70,7 +70,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) } post_code(0x31); - uart_init(); console_init(); /* diff --git a/src/mainboard/amd/torpedo/romstage.c b/src/mainboard/amd/torpedo/romstage.c index a2da0f0..f6204b9 100644 --- a/src/mainboard/amd/torpedo/romstage.c +++ b/src/mainboard/amd/torpedo/romstage.c @@ -62,7 +62,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) kbc1100_early_init(CONFIG_SIO_PORT); post_code(0x32); - uart_init(); post_code(0x33); console_init(); } diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c index af8e5fa..db8b7b5 100644 --- a/src/mainboard/asus/m5a88-v/romstage.c +++ b/src/mainboard/asus/m5a88-v/romstage.c @@ -101,7 +101,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) sb800_clk_output_48Mhz(); it8721f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); printk(BIOS_DEBUG, "\n"); diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c index 8d4e4b2..69cefd9 100644 --- a/src/mainboard/avalue/eax-785e/romstage.c +++ b/src/mainboard/avalue/eax-785e/romstage.c @@ -102,7 +102,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) w83627hf_set_clksel_48(PNP_DEV(CONFIG_SIO_PORT, 0)); w83627hf_enable_serial(0, CONFIG_TTYS0_BASE); - uart_init(); console_init(); printk(BIOS_DEBUG, "\n"); diff --git a/src/mainboard/supermicro/h8qgi/romstage.c b/src/mainboard/supermicro/h8qgi/romstage.c index e9f359a..ea4ed8e 100644 --- a/src/mainboard/supermicro/h8qgi/romstage.c +++ b/src/mainboard/supermicro/h8qgi/romstage.c @@ -52,7 +52,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) sb7xx_51xx_disable_wideio(0); post_code(0x34); - uart_init(); post_code(0x35); console_init(); diff --git a/src/mainboard/supermicro/h8scm/romstage.c b/src/mainboard/supermicro/h8scm/romstage.c index 61640c9..9ee1dfa 100644 --- a/src/mainboard/supermicro/h8scm/romstage.c +++ b/src/mainboard/supermicro/h8scm/romstage.c @@ -57,7 +57,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) sb7xx_51xx_disable_wideio(0); post_code(0x34); - uart_init(); post_code(0x35); console_init(); diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c index 7cfe818..4690a0c 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c @@ -64,7 +64,6 @@ static void main(unsigned long bist) w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); /* Halt if there was a built in self test failure */ diff --git a/src/mainboard/tyan/s8226/romstage.c b/src/mainboard/tyan/s8226/romstage.c index f0b21e2..a6c33e8 100644 --- a/src/mainboard/tyan/s8226/romstage.c +++ b/src/mainboard/tyan/s8226/romstage.c @@ -58,7 +58,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) sb7xx_51xx_disable_wideio(0); post_code(0x34); - uart_init(); post_code(0x35); console_init();

1 0

New patch to review for coreboot: abedcd3 uart8250: Drop includes in superio
by Kyösti Mälkki 05 Feb '14

05 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5139 -gerrit commit abedcd314645f914bd84c76841cd13cf7d83908b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jan 30 16:45:29 2014 +0200 uart8250: Drop includes in superio Change-Id: If723896cc31da75dbb3a63d5dc959764e96fded1 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/southbridge/via/vt82c686/chip.h | 1 - src/superio/fintek/f71805f/superio.c | 1 - src/superio/fintek/f71859/superio.c | 1 - src/superio/fintek/f71863fg/chip.h | 1 - src/superio/fintek/f71863fg/superio.c | 1 - src/superio/fintek/f71869ad/chip.h | 1 - src/superio/fintek/f71869ad/superio.c | 1 - src/superio/fintek/f71872/chip.h | 1 - src/superio/fintek/f71889/chip.h | 1 - src/superio/fintek/f71889/superio.c | 1 - src/superio/fintek/f81865f/chip.h | 1 - src/superio/intel/i3100/superio.c | 1 - src/superio/ite/it8661f/superio.c | 1 - src/superio/ite/it8671f/chip.h | 1 - src/superio/ite/it8671f/superio.c | 1 - src/superio/ite/it8673f/chip.h | 1 - src/superio/ite/it8673f/superio.c | 1 - src/superio/ite/it8705f/superio.c | 1 - src/superio/ite/it8712f/chip.h | 1 - src/superio/ite/it8712f/superio.c | 1 - src/superio/ite/it8716f/chip.h | 1 - src/superio/ite/it8716f/superio.c | 1 - src/superio/ite/it8718f/chip.h | 1 - src/superio/ite/it8718f/superio.c | 1 - src/superio/ite/it8721f/chip.h | 1 - src/superio/ite/it8721f/superio.c | 1 - src/superio/ite/it8772f/chip.h | 1 - src/superio/ite/it8772f/superio.c | 1 - src/superio/nsc/pc8374/chip.h | 1 - src/superio/nsc/pc8374/superio.c | 1 - src/superio/nsc/pc87309/chip.h | 1 - src/superio/nsc/pc87309/superio.c | 1 - src/superio/nsc/pc87351/chip.h | 1 - src/superio/nsc/pc87351/superio.c | 1 - src/superio/nsc/pc87360/chip.h | 1 - src/superio/nsc/pc87360/superio.c | 1 - src/superio/nsc/pc87366/chip.h | 1 - src/superio/nsc/pc87366/superio.c | 1 - src/superio/nsc/pc87382/superio.c | 1 - src/superio/nsc/pc87384/superio.c | 1 - src/superio/nsc/pc87392/superio.c | 1 - src/superio/nsc/pc87417/chip.h | 1 - src/superio/nsc/pc87417/superio.c | 1 - src/superio/nsc/pc87427/chip.h | 1 - src/superio/nsc/pc97307/chip.h | 1 - src/superio/nsc/pc97317/chip.h | 1 - src/superio/nuvoton/wpcm450/chip.h | 1 - src/superio/nuvoton/wpcm450/superio.c | 1 - src/superio/renesas/m3885x/superio.c | 1 - src/superio/smsc/fdc37m60x/chip.h | 1 - src/superio/smsc/fdc37m60x/superio.c | 1 - src/superio/smsc/fdc37n972/chip.h | 1 - src/superio/smsc/fdc37n972/fdc37n972.c | 1 - src/superio/smsc/kbc1100/chip.h | 1 - src/superio/smsc/kbc1100/superio.c | 1 - src/superio/smsc/lpc47b272/chip.h | 1 - src/superio/smsc/lpc47b272/superio.c | 1 - src/superio/smsc/lpc47b397/chip.h | 1 - src/superio/smsc/lpc47b397/superio.c | 1 - src/superio/smsc/lpc47m10x/chip.h | 1 - src/superio/smsc/lpc47m10x/superio.c | 1 - src/superio/smsc/lpc47m15x/chip.h | 1 - src/superio/smsc/lpc47m15x/superio.c | 1 - src/superio/smsc/lpc47n217/superio.c | 1 - src/superio/smsc/lpc47n227/chip.h | 1 - src/superio/smsc/lpc47n227/superio.c | 1 - src/superio/smsc/mec1308/chip.h | 1 - src/superio/smsc/sch4037/chip.h | 1 - src/superio/smsc/sch4037/superio.c | 1 - src/superio/smsc/sio1036/chip.h | 2 -- src/superio/smsc/sio1036/superio.c | 1 - src/superio/smsc/sio10n268/chip.h | 1 - src/superio/smsc/sio10n268/sio10n268.c | 1 - src/superio/smsc/smscsuperio/chip.h | 1 - src/superio/smsc/smscsuperio/superio.c | 1 - src/superio/via/vt1211/vt1211.c | 1 - src/superio/winbond/w83627dhg/chip.h | 1 - src/superio/winbond/w83627dhg/superio.c | 1 - src/superio/winbond/w83627ehg/chip.h | 1 - src/superio/winbond/w83627ehg/superio.c | 1 - src/superio/winbond/w83627hf/chip.h | 1 - src/superio/winbond/w83627hf/superio.c | 1 - src/superio/winbond/w83627thg/chip.h | 1 - src/superio/winbond/w83627thg/superio.c | 1 - src/superio/winbond/w83627uhg/chip.h | 1 - src/superio/winbond/w83627uhg/superio.c | 1 - src/superio/winbond/w83697hf/chip.h | 1 - src/superio/winbond/w83697hf/superio.c | 1 - src/superio/winbond/w83977f/chip.h | 1 - src/superio/winbond/w83977f/superio.c | 1 - src/superio/winbond/w83977tf/chip.h | 1 - src/superio/winbond/w83977tf/superio.c | 1 - 92 files changed, 93 deletions(-) diff --git a/src/southbridge/via/vt82c686/chip.h b/src/southbridge/via/vt82c686/chip.h index b62617d..5c4959f 100644 --- a/src/southbridge/via/vt82c686/chip.h +++ b/src/southbridge/via/vt82c686/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_via_vt82c686_config { struct pc_keyboard keyboard; diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c index 4a31606..fa9608f 100644 --- a/src/superio/fintek/f71805f/superio.c +++ b/src/superio/fintek/f71805f/superio.c @@ -24,7 +24,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <stdlib.h> -#include <uart8250.h> #include "f71805f.h" static void f71805f_init(device_t dev) diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c index 2736c0b..8eca710 100644 --- a/src/superio/fintek/f71859/superio.c +++ b/src/superio/fintek/f71859/superio.c @@ -25,7 +25,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <stdlib.h> -#include <uart8250.h> #include "f71859.h" static void f71859_init(device_t dev) diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h index 5558d70..9084824 100644 --- a/src/superio/fintek/f71863fg/chip.h +++ b/src/superio/fintek/f71863fg/chip.h @@ -23,7 +23,6 @@ #include <pc80/keyboard.h> #include <device/device.h> -#include <uart8250.h> struct superio_fintek_f71863fg_config { diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c index 4159e6d..29b5ab3 100644 --- a/src/superio/fintek/f71863fg/superio.c +++ b/src/superio/fintek/f71863fg/superio.c @@ -24,7 +24,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <stdlib.h> -#include <uart8250.h> #include "chip.h" #include "f71863fg.h" diff --git a/src/superio/fintek/f71869ad/chip.h b/src/superio/fintek/f71869ad/chip.h index 78f3664..5b18c33 100644 --- a/src/superio/fintek/f71869ad/chip.h +++ b/src/superio/fintek/f71869ad/chip.h @@ -23,7 +23,6 @@ #include <pc80/keyboard.h> #include <device/device.h> -#include <uart8250.h> struct superio_fintek_f71869ad_config { struct pc_keyboard keyboard; diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c index 442ca00..c9aa0b3 100644 --- a/src/superio/fintek/f71869ad/superio.c +++ b/src/superio/fintek/f71869ad/superio.c @@ -24,7 +24,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <stdlib.h> -#include <uart8250.h> #include "chip.h" #include "f71869ad.h" diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h index ef10403..a6ac51f 100644 --- a/src/superio/fintek/f71872/chip.h +++ b/src/superio/fintek/f71872/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_FINTEK_F71872_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_fintek_f71872_config { diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h index 6199223..2895efc 100644 --- a/src/superio/fintek/f71889/chip.h +++ b/src/superio/fintek/f71889/chip.h @@ -23,7 +23,6 @@ #include <pc80/keyboard.h> #include <device/device.h> -#include <uart8250.h> struct superio_fintek_f71889_config { diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c index 450f938..71edafc 100644 --- a/src/superio/fintek/f71889/superio.c +++ b/src/superio/fintek/f71889/superio.c @@ -24,7 +24,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <stdlib.h> -#include <uart8250.h> #include "chip.h" #include "f71889.h" diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h index 735018b..fc17c0f 100644 --- a/src/superio/fintek/f81865f/chip.h +++ b/src/superio/fintek/f81865f/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_FINTEK_F81865_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> /* This chip doesn't have keyboard and mouse support. */ diff --git a/src/superio/intel/i3100/superio.c b/src/superio/intel/i3100/superio.c index f791d9d..d0c5066 100644 --- a/src/superio/intel/i3100/superio.c +++ b/src/superio/intel/i3100/superio.c @@ -21,7 +21,6 @@ #include <stdlib.h> #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include "i3100.h" #include <arch/io.h> diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c index 812af78..4b7aa00 100644 --- a/src/superio/ite/it8661f/superio.c +++ b/src/superio/ite/it8661f/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <stdlib.h> #include "it8661f.h" diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h index 13b2079..7d5c1d4 100644 --- a/src/superio/ite/it8671f/chip.h +++ b/src/superio/ite/it8671f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8671f_config { diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c index 423dbfe..21c70ec 100644 --- a/src/superio/ite/it8671f/superio.c +++ b/src/superio/ite/it8671f/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h index ef19d17..c5fd8de 100644 --- a/src/superio/ite/it8673f/chip.h +++ b/src/superio/ite/it8673f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8673f_config { diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c index 080c3bd..baa1ae1 100644 --- a/src/superio/ite/it8673f/superio.c +++ b/src/superio/ite/it8673f/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c index 1dedf45..0df7f2d 100644 --- a/src/superio/ite/it8705f/superio.c +++ b/src/superio/ite/it8705f/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <stdlib.h> #include "it8705f.h" diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h index ffa0d04..1f159cd 100644 --- a/src/superio/ite/it8712f/chip.h +++ b/src/superio/ite/it8712f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8712f_config { diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c index 619b260..2fd3440 100644 --- a/src/superio/ite/it8712f/superio.c +++ b/src/superio/ite/it8712f/superio.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <arch/io.h> #include <stdlib.h> diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h index 12a4d89..33a265a 100644 --- a/src/superio/ite/it8716f/chip.h +++ b/src/superio/ite/it8716f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8716f_config { diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c index 4b58bb4..8cf3c5f 100644 --- a/src/superio/ite/it8716f/superio.c +++ b/src/superio/ite/it8716f/superio.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pnp.h> #include <console/console.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <arch/io.h> #include <stdlib.h> diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h index 8f84fdb..a23687c 100644 --- a/src/superio/ite/it8718f/chip.h +++ b/src/superio/ite/it8718f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8718f_config { diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index 17c7fad..998d271 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/ite/it8721f/chip.h b/src/superio/ite/it8721f/chip.h index 0ac4d03..bd04460 100644 --- a/src/superio/ite/it8721f/chip.h +++ b/src/superio/ite/it8721f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8721f_config { struct pc_keyboard keyboard; diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c index 6305d75..27eab49 100644 --- a/src/superio/ite/it8721f/superio.c +++ b/src/superio/ite/it8721f/superio.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h index 010c59a..9c9aaa6 100644 --- a/src/superio/ite/it8772f/chip.h +++ b/src/superio/ite/it8772f/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_ite_it8772f_config { struct pc_keyboard keyboard; diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 5004c10..e7e82a8 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <arch/io.h> #include <stdlib.h> diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h index 523abdf..40a9b60 100644 --- a/src/superio/nsc/pc8374/chip.h +++ b/src/superio/nsc/pc8374/chip.h @@ -23,7 +23,6 @@ #define SUPERIO_NSC_PC8374_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc8374_config { diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c index af50316..71cde2c 100644 --- a/src/superio/nsc/pc8374/superio.c +++ b/src/superio/nsc/pc8374/superio.c @@ -24,7 +24,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h index f6f2782..e769a85 100644 --- a/src/superio/nsc/pc87309/chip.h +++ b/src/superio/nsc/pc87309/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_NSC_PC87309_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc87309_config { diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c index 2aede74..52fc14f 100644 --- a/src/superio/nsc/pc87309/superio.c +++ b/src/superio/nsc/pc87309/superio.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h index 90dbf17..39faee4 100644 --- a/src/superio/nsc/pc87351/chip.h +++ b/src/superio/nsc/pc87351/chip.h @@ -23,7 +23,6 @@ #define SUPERIO_NSC_PC87351_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc87351_config { diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c index 56d373b..4d9469e 100644 --- a/src/superio/nsc/pc87351/superio.c +++ b/src/superio/nsc/pc87351/superio.c @@ -24,7 +24,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h index a19196d..e48c0f2 100644 --- a/src/superio/nsc/pc87360/chip.h +++ b/src/superio/nsc/pc87360/chip.h @@ -23,7 +23,6 @@ #define SUPERIO_NSC_PC87360_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc87360_config { diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c index 054353a..92731e7 100644 --- a/src/superio/nsc/pc87360/superio.c +++ b/src/superio/nsc/pc87360/superio.c @@ -24,7 +24,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h index a9d2b9f..0ce8abd 100644 --- a/src/superio/nsc/pc87366/chip.h +++ b/src/superio/nsc/pc87366/chip.h @@ -23,7 +23,6 @@ #define SUPERIO_NSC_PC87366_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc87366_config { diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c index 95945c8..1874ab3 100644 --- a/src/superio/nsc/pc87366/superio.c +++ b/src/superio/nsc/pc87366/superio.c @@ -24,7 +24,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c index ce0189d..3c0cda0 100644 --- a/src/superio/nsc/pc87382/superio.c +++ b/src/superio/nsc/pc87382/superio.c @@ -23,7 +23,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "pc87382.h" diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c index 8fd33d7..f5248b8 100644 --- a/src/superio/nsc/pc87384/superio.c +++ b/src/superio/nsc/pc87384/superio.c @@ -23,7 +23,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "pc87384.h" diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c index 3afc556..d67539f 100644 --- a/src/superio/nsc/pc87392/superio.c +++ b/src/superio/nsc/pc87392/superio.c @@ -23,7 +23,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <stdlib.h> #include "pc87392.h" diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h index 8752dc8..8c1e8e0 100644 --- a/src/superio/nsc/pc87417/chip.h +++ b/src/superio/nsc/pc87417/chip.h @@ -24,7 +24,6 @@ #define SUPERIO_NSC_PC87417_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc87417_config { diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index 52f20d3..3b91f36 100644 --- a/src/superio/nsc/pc87417/superio.c +++ b/src/superio/nsc/pc87417/superio.c @@ -25,7 +25,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h index 2464a44..4500aa9 100644 --- a/src/superio/nsc/pc87427/chip.h +++ b/src/superio/nsc/pc87427/chip.h @@ -23,7 +23,6 @@ #define SUPERIO_NSC_PC87427_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc87427_config { diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h index a190221..e0c1330 100644 --- a/src/superio/nsc/pc97307/chip.h +++ b/src/superio/nsc/pc97307/chip.h @@ -29,7 +29,6 @@ #endif #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc97307_config { diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h index 8aaeddd..d896916 100644 --- a/src/superio/nsc/pc97317/chip.h +++ b/src/superio/nsc/pc97317/chip.h @@ -29,7 +29,6 @@ #endif #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nsc_pc97317_config { diff --git a/src/superio/nuvoton/wpcm450/chip.h b/src/superio/nuvoton/wpcm450/chip.h index 4bbcb9b..cc4054f 100644 --- a/src/superio/nuvoton/wpcm450/chip.h +++ b/src/superio/nuvoton/wpcm450/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_NUVOTON_WPCM450_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_nuvoton_wpcm450_config { diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c index 6a48b72..fabb546 100644 --- a/src/superio/nuvoton/wpcm450/superio.c +++ b/src/superio/nuvoton/wpcm450/superio.c @@ -23,7 +23,6 @@ #include <device/pnp.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c index 56e9c07..34d7d11 100644 --- a/src/superio/renesas/m3885x/superio.c +++ b/src/superio/renesas/m3885x/superio.c @@ -23,7 +23,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <assert.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h index 0ca235c..a143f65 100644 --- a/src/superio/smsc/fdc37m60x/chip.h +++ b/src/superio/smsc/fdc37m60x/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_fdc37m60x_config { diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c index af30572..92a1783 100644 --- a/src/superio/smsc/fdc37m60x/superio.c +++ b/src/superio/smsc/fdc37m60x/superio.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h index b09e4ce..e4126a7 100644 --- a/src/superio/smsc/fdc37n972/chip.h +++ b/src/superio/smsc/fdc37n972/chip.h @@ -22,7 +22,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_fdc37n972_config { diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c index 3265e6b..cab4540 100644 --- a/src/superio/smsc/fdc37n972/fdc37n972.c +++ b/src/superio/smsc/fdc37n972/fdc37n972.c @@ -20,7 +20,6 @@ #include <stdlib.h> #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include "chip.h" #include "fdc37n972.h" diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h index 552098c..59ffb42 100644 --- a/src/superio/smsc/kbc1100/chip.h +++ b/src/superio/smsc/kbc1100/chip.h @@ -21,7 +21,6 @@ #define SUPERIO_SMSC_KBC1100_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_kbc1100_config { diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c index c56694c..3a834a0 100644 --- a/src/superio/smsc/kbc1100/superio.c +++ b/src/superio/smsc/kbc1100/superio.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h index 625514c..5a42f4a 100644 --- a/src/superio/smsc/lpc47b272/chip.h +++ b/src/superio/smsc/lpc47b272/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_SMSC_LPC47B272_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_lpc47b272_config { diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c index 8901ec4..fb39c28 100644 --- a/src/superio/smsc/lpc47b272/superio.c +++ b/src/superio/smsc/lpc47b272/superio.c @@ -30,7 +30,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h index ebfbd42..e4ad5b1 100644 --- a/src/superio/smsc/lpc47b397/chip.h +++ b/src/superio/smsc/lpc47b397/chip.h @@ -24,7 +24,6 @@ #define SUPERIO_SMSC_LPC47B397_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_lpc47b397_config { diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index ff6e405..3d81350 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -27,7 +27,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h index f2e0860..2d947be 100644 --- a/src/superio/smsc/lpc47m10x/chip.h +++ b/src/superio/smsc/lpc47m10x/chip.h @@ -26,7 +26,6 @@ #define SUPERIO_SMSC_LPC47M10X_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_lpc47m10x_config { diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index c1f3c2c..1a697f2 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -29,7 +29,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h index 47544d7..757fa73 100644 --- a/src/superio/smsc/lpc47m15x/chip.h +++ b/src/superio/smsc/lpc47m15x/chip.h @@ -21,7 +21,6 @@ #define SUPERIO_SMSC_LPC47M15X_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_lpc47m15x_config { diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index 7e400fc..b142dde 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c index 0b62f9d..0b470f6 100644 --- a/src/superio/smsc/lpc47n217/superio.c +++ b/src/superio/smsc/lpc47n217/superio.c @@ -29,7 +29,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <assert.h> #include <stdlib.h> #include "lpc47n217.h" diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h index da78b65..3f26d8b 100644 --- a/src/superio/smsc/lpc47n227/chip.h +++ b/src/superio/smsc/lpc47n227/chip.h @@ -22,7 +22,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_lpc47n227_config { diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index 4c11042..eda2622 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <assert.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/mec1308/chip.h b/src/superio/smsc/mec1308/chip.h index 83d15a3..733cd34 100644 --- a/src/superio/smsc/mec1308/chip.h +++ b/src/superio/smsc/mec1308/chip.h @@ -21,7 +21,6 @@ #define SUPERIO_SMSC_MEC1308_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_mec1308_config { struct pc_keyboard keyboard; diff --git a/src/superio/smsc/sch4037/chip.h b/src/superio/smsc/sch4037/chip.h index a295a0d..b1fee00 100644 --- a/src/superio/smsc/sch4037/chip.h +++ b/src/superio/smsc/sch4037/chip.h @@ -21,7 +21,6 @@ #define SUPERIO_SCH_4037_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_sch4037_config { diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c index 96d35fe..b7f100a 100644 --- a/src/superio/smsc/sch4037/superio.c +++ b/src/superio/smsc/sch4037/superio.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/sio1036/chip.h b/src/superio/smsc/sio1036/chip.h index a19ce1d..c19ce43 100644 --- a/src/superio/smsc/sio1036/chip.h +++ b/src/superio/smsc/sio1036/chip.h @@ -21,10 +21,8 @@ #define SUPERIO_SMSC_SIO1036_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_sio1036_config { - struct uart8250 com1; }; #endif //SUPERIO_SMSC_SIO1036_CHIP_H diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c index ff7b5d1..4980803 100644 --- a/src/superio/smsc/sio1036/superio.c +++ b/src/superio/smsc/sio1036/superio.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <device/smbus.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h index 1d4577e..cde51d1 100644 --- a/src/superio/smsc/sio10n268/chip.h +++ b/src/superio/smsc/sio10n268/chip.h @@ -22,7 +22,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_sio10n268_config { diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c index 827274f..690c160 100644 --- a/src/superio/smsc/sio10n268/sio10n268.c +++ b/src/superio/smsc/sio10n268/sio10n268.c @@ -20,7 +20,6 @@ #include <stdlib.h> #include <device/device.h> #include <device/pnp.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include "chip.h" #include "sio10n268.h" diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h index 1ba47c6..1e5acfe 100644 --- a/src/superio/smsc/smscsuperio/chip.h +++ b/src/superio/smsc/smscsuperio/chip.h @@ -23,7 +23,6 @@ #include <device/device.h> #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_smsc_smscsuperio_config { diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index 42a9c09..9990aa2 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -39,7 +39,6 @@ #include <device/pnp.h> #include <superio/conf_mode.h> #include <console/console.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c index 68fd999..551f6f0 100644 --- a/src/superio/via/vt1211/vt1211.c +++ b/src/superio/via/vt1211/vt1211.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pnp.h> #include <superio/conf_mode.h> -#include <uart8250.h> #include <stdlib.h> #include "vt1211.h" diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h index c8cf6eb..0bc5374 100644 --- a/src/superio/winbond/w83627dhg/chip.h +++ b/src/superio/winbond/w83627dhg/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_WINBOND_W83627DHG_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83627dhg_config { diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c index a931419..269e57c 100644 --- a/src/superio/winbond/w83627dhg/superio.c +++ b/src/superio/winbond/w83627dhg/superio.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pnp.h> #include <superio/conf_mode.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/winbond/w83627ehg/chip.h b/src/superio/winbond/w83627ehg/chip.h index 26a7112..e073d7d 100644 --- a/src/superio/winbond/w83627ehg/chip.h +++ b/src/superio/winbond/w83627ehg/chip.h @@ -23,7 +23,6 @@ #define SUPERIO_WINBOND_W83627EHG_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83627ehg_config { diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 6f2c9de..62d3311 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -27,7 +27,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <pc80/mc146818rtc.h> #include <stdlib.h> diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h index ac47651..ae527ea 100644 --- a/src/superio/winbond/w83627hf/chip.h +++ b/src/superio/winbond/w83627hf/chip.h @@ -24,7 +24,6 @@ #define SUPERIO_WINBOND_W83627HF_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83627hf_config { diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index 5a4e964..c881743 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -27,7 +27,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <pc80/mc146818rtc.h> #include <stdlib.h> diff --git a/src/superio/winbond/w83627thg/chip.h b/src/superio/winbond/w83627thg/chip.h index 975492a..692715e 100644 --- a/src/superio/winbond/w83627thg/chip.h +++ b/src/superio/winbond/w83627thg/chip.h @@ -24,7 +24,6 @@ #define SUPERIO_WINBOND_W83627THG_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83627thg_config { diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c index 257cd0a..f6aba10 100644 --- a/src/superio/winbond/w83627thg/superio.c +++ b/src/superio/winbond/w83627thg/superio.c @@ -26,7 +26,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include "chip.h" #include "w83627thg.h" diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h index d69f17f..cf8edfb 100644 --- a/src/superio/winbond/w83627uhg/chip.h +++ b/src/superio/winbond/w83627uhg/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_WINBOND_W83627UHG_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83627uhg_config { diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c index 9de7ac0..5775ff5 100644 --- a/src/superio/winbond/w83627uhg/superio.c +++ b/src/superio/winbond/w83627uhg/superio.c @@ -26,7 +26,6 @@ #include <string.h> #include <stdint.h> #include <stdlib.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include "chip.h" #include "w83627uhg.h" diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h index f075c2e..df9ce4b 100644 --- a/src/superio/winbond/w83697hf/chip.h +++ b/src/superio/winbond/w83697hf/chip.h @@ -21,7 +21,6 @@ #ifndef SUPERIO_WINBOND_W83697HF_CHIP_H #define SUPERIO_WINBOND_W83697HF_CHIP_H -#include <uart8250.h> struct superio_winbond_w83697hf_config { unsigned int hwmon_fan1_divisor; diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c index 79ebcc9..f896078 100644 --- a/src/superio/winbond/w83697hf/superio.c +++ b/src/superio/winbond/w83697hf/superio.c @@ -25,7 +25,6 @@ #include <console/console.h> #include <string.h> #include <lib.h> -#include <uart8250.h> #include <pc80/mc146818rtc.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h index 6414048..7363445 100644 --- a/src/superio/winbond/w83977f/chip.h +++ b/src/superio/winbond/w83977f/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_WINBOND_W83977F_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83977f_config { diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c index 6756830..32ecf18 100644 --- a/src/superio/winbond/w83977f/superio.c +++ b/src/superio/winbond/w83977f/superio.c @@ -24,7 +24,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h" diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h index 84e7402..ddcf1b5 100644 --- a/src/superio/winbond/w83977tf/chip.h +++ b/src/superio/winbond/w83977tf/chip.h @@ -24,7 +24,6 @@ #define SUPERIO_WINBOND_W83977TF_CHIP_H #include <pc80/keyboard.h> -#include <uart8250.h> struct superio_winbond_w83977tf_config { diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c index 0200d26..7f2dffb 100644 --- a/src/superio/winbond/w83977tf/superio.c +++ b/src/superio/winbond/w83977tf/superio.c @@ -26,7 +26,6 @@ #include <superio/conf_mode.h> #include <console/console.h> #include <string.h> -#include <uart8250.h> #include <pc80/keyboard.h> #include <stdlib.h> #include "chip.h"

1 0

New patch to review for coreboot: afb6bbe uart8250: Drop unused declarations
by Kyösti Mälkki 05 Feb '14

05 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5138 -gerrit commit afb6bbec7a064304b3b159ba7f37e0a4ced3061f Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Feb 4 20:28:23 2014 +0200 uart8250: Drop unused declarations Change-Id: Ie915ef9dbc45604bd5ca1b610acb12af634fdebe Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/include/uart8250.h | 3 --- src/mainboard/msi/ms9652_fam10/Kconfig | 16 --------------- src/southbridge/amd/cimx/sb700/bootblock.c | 32 ------------------------------ src/southbridge/amd/cimx/sb900/bootblock.c | 32 ------------------------------ 4 files changed, 83 deletions(-) diff --git a/src/include/uart8250.h b/src/include/uart8250.h index e6a318a..bec3637 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -111,9 +111,6 @@ #error Bad ttyS0 baud rate #endif -/* Line Control Settings */ -#define UART_LCS CONFIG_TTYS0_LCS - #if CONFIG_CONSOLE_SERIAL8250 unsigned char uart8250_rx_byte(unsigned base_port); int uart8250_can_rx_byte(unsigned base_port); diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index 8420523..8d1473d 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -76,18 +76,6 @@ config RAMBASE hex default 0x200000 -config TTYS0_BAUD - int - default 115200 - -config TTYS0_BASE - hex - default 0x3f8 - -config TTYS0_LCS - int - default 3 - config DEFAULT_CONSOLE_LOGLEVEL int default 9 @@ -96,10 +84,6 @@ config MAINBOARD_POWER_ON_AFTER_POWER_FAIL bool default y -config CONSOLE_SERIAL8250 - bool - default y - config USBDEBUG bool default n diff --git a/src/southbridge/amd/cimx/sb700/bootblock.c b/src/southbridge/amd/cimx/sb700/bootblock.c index fc7f3c5..1027659 100644 --- a/src/southbridge/amd/cimx/sb700/bootblock.c +++ b/src/southbridge/amd/cimx/sb700/bootblock.c @@ -20,38 +20,6 @@ #include <arch/io.h> -#if CONFIG_CONSOLE_POST - -/* Data */ -#define UART_RBR 0x00 -#define UART_TBR 0x00 - -/* Control */ -#define UART_IER 0x01 -#define UART_IIR 0x02 -#define UART_FCR 0x02 -#define UART_LCR 0x03 -#define UART_MCR 0x04 -#define UART_DLL 0x00 -#define UART_DLM 0x01 - -/* Status */ -#define UART_LSR 0x05 -#define UART_MSR 0x06 -#define UART_SCR 0x07 - -#ifndef CONFIG_TTYS0_DIV -#if ((115200%CONFIG_TTYS0_BAUD) != 0) -#error Bad ttys0 baud rate -#endif -#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) -#endif // CONFIG_TTYS0_DIV - -#define UART_LCS CONFIG_TTYS0_LCS - -#endif // CONFIG_CONSOLE_POST == 1 - - static void sb700_enable_rom(void) { u32 word; diff --git a/src/southbridge/amd/cimx/sb900/bootblock.c b/src/southbridge/amd/cimx/sb900/bootblock.c index 106f664..9108a8b 100644 --- a/src/southbridge/amd/cimx/sb900/bootblock.c +++ b/src/southbridge/amd/cimx/sb900/bootblock.c @@ -19,38 +19,6 @@ #include <arch/io.h> -#if CONFIG_CONSOLE_POST - -/* Data */ -#define UART_RBR 0x00 -#define UART_TBR 0x00 - -/* Control */ -#define UART_IER 0x01 -#define UART_IIR 0x02 -#define UART_FCR 0x02 -#define UART_LCR 0x03 -#define UART_MCR 0x04 -#define UART_DLL 0x00 -#define UART_DLM 0x01 - -/* Status */ -#define UART_LSR 0x05 -#define UART_MSR 0x06 -#define UART_SCR 0x07 - -#ifndef CONFIG_TTYS0_DIV -#if ((115200%CONFIG_TTYS0_BAUD) != 0) -#error Bad ttys0 baud rate -#endif -#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) -#endif // CONFIG_TTYS0_DIV - -#define UART_LCS CONFIG_TTYS0_LCS - -#endif // CONFIG_CONSOLE_POST == 1 - - static void sb900_enable_rom(void) { u32 word;

1 0

New patch to review for coreboot: 4aadd22 uart8250: Drop xmodem support
by Kyösti Mälkki 05 Feb '14

05 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5137 -gerrit commit 4aadd22ae0284aa57427c575d7d1a8c88105654b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jan 30 10:51:32 2014 +0200 uart8250: Drop xmodem support Unused and hard-coded to use uart8250 on IO. Change-Id: I3f84c50039a450a2ae97a5fd2af89992f8567e6c Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/lib/xmodem.c | 173 ------------------------------------------------------- 1 file changed, 173 deletions(-) diff --git a/src/lib/xmodem.c b/src/lib/xmodem.c deleted file mode 100644 index c3bb1d8..0000000 --- a/src/lib/xmodem.c +++ /dev/null @@ -1,173 +0,0 @@ -/* - Copyright 2006 Arastra, Inc. - Copyright 2001, 2002 Georges Menie (www.menie.org) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include <string.h> -#include <delay.h> -#include <uart8250.h> - -static int _inbyte(int msec) -{ - while (!uart8250_can_rx_byte(CONFIG_TTYS0_BASE)) { - udelay(1000); - if (msec-- <= 0) - return -1; - } - return uart8250_rx_byte(CONFIG_TTYS0_BASE); -} - -static void _outbyte(unsigned char c) -{ - uart8250_tx_byte(CONFIG_TTYS0_BASE, c); -} - -static unsigned short crc16_ccitt(const unsigned char *buf, int sz) -{ - unsigned short crc = 0; - while (--sz >= 0) { - int i; - crc ^= (unsigned short) *buf++ << 8; - for (i = 0; i < 8; i++) - if (crc & 0x8000) - crc = crc << 1 ^ 0x1021; - else - crc <<= 1; - } - return crc; -} - -#define SOH 0x01 -#define STX 0x02 -#define EOT 0x04 -#define ACK 0x06 -#define NAK 0x15 -#define CAN 0x18 -#define CTRLZ 0x1A - -#define DLY_1S 1000 -#define MAXRETRANS 25 - -static int check(int crc, const unsigned char *buf, int sz) -{ - if (crc) { - unsigned short crc = crc16_ccitt(buf, sz); - unsigned short tcrc = (buf[sz]<<8)+buf[sz+1]; - if (crc == tcrc) - return 1; - } - else { - int i; - unsigned char cks = 0; - for (i = 0; i < sz; ++i) { - cks += buf[i]; - } - if (cks == buf[sz]) - return 1; - } - - return 0; -} - -static void flushinput(void) -{ - while (_inbyte(((DLY_1S)*3)>>1) >= 0) - ; -} - -int xmodemReceive(unsigned char *dest, int destsz) -{ - unsigned char xbuff[1030]; /* 1024 for XModem 1k + 3 head chars + 2 crc + nul */ - unsigned char *p; - int bufsz, crc = 0; - unsigned char trychar = 'C'; - unsigned char packetno = 1; - int i, c, len = 0; - int retry, retrans = MAXRETRANS; - - for(;;) { - for( retry = 0; retry < 16; ++retry) { - if (trychar) _outbyte(trychar); - if ((c = _inbyte((DLY_1S)<<1)) >= 0) { - switch (c) { - case SOH: - bufsz = 128; - goto start_recv; - case STX: - bufsz = 1024; - goto start_recv; - case EOT: - flushinput(); - _outbyte(ACK); - return len; /* normal end */ - case CAN: - if ((c = _inbyte(DLY_1S)) == CAN) { - flushinput(); - _outbyte(ACK); - return -1; /* canceled by remote */ - } - break; - default: - break; - } - } - } - if (trychar == 'C') { trychar = NAK; continue; } - flushinput(); - _outbyte(CAN); - _outbyte(CAN); - _outbyte(CAN); - return -2; /* sync error */ - - start_recv: - if (trychar == 'C') crc = 1; - trychar = 0; - p = xbuff; - *p++ = c; - for (i = 0; i < (bufsz+(crc?1:0)+3); ++i) { - if ((c = _inbyte(DLY_1S)) < 0) goto reject; - *p++ = c; - } - - if (xbuff[1] == (unsigned char)(~xbuff[2]) && - (xbuff[1] == packetno || xbuff[1] == (unsigned char)packetno-1) && - check(crc, &xbuff[3], bufsz)) { - if (xbuff[1] == packetno) { - register int count = destsz - len; - if (count > bufsz) count = bufsz; - if (count > 0) { - memcpy (&dest[len], &xbuff[3], count); - len += count; - } - ++packetno; - retrans = MAXRETRANS+1; - } - if (--retrans <= 0) { - flushinput(); - _outbyte(CAN); - _outbyte(CAN); - _outbyte(CAN); - return -3; /* too many retry error */ - } - _outbyte(ACK); - continue; - } -reject: - flushinput(); - _outbyte(NAK); - } -}

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2014