diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-11-11 01:42:17 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-11-21 22:49:48 +0000 |
| commit | 755db95d1a36a4bd64519d7e05b00d62e848c458 (patch) | |
| tree | 301582945323865890ae28e54ab8725592690618 /src/soc/nvidia | |
| parent | 7470c902d80d04730ac1147336339cc057db1be9 (diff) | |
(console,drivers/uart)/Kconfig: Fix dependencies
The dependencies of CONSOLE_SERIAL and DRIVERS_UART were somehow
backwards. Fix that. Now, CONSOLE_SERIAL depends on DRIVERS_UART,
because it's using its interface. The individual UART drivers
select DRIVERS_UART, because they implement the interface and
depend on the common UART code.
Some guards had to be fixed (using CONSOLE_SERIAL now instead of
DRIVERS_UART). Some other guards that were only about compilation
of units were removed. We want to build test as much as possible,
right?
Change-Id: I0ea73a8909f07202b23c88db93df74cf9dc8abf9
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/29572
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc/nvidia')
| -rw-r--r-- | src/soc/nvidia/tegra124/Makefile.inc | 10 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra210/Makefile.inc | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc index 2f0f470f8f..fb5389fa2f 100644 --- a/src/soc/nvidia/tegra124/Makefile.inc +++ b/src/soc/nvidia/tegra124/Makefile.inc @@ -16,15 +16,13 @@ bootblock-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c bootblock-y += ../tegra/pingroup.c bootblock-y += ../tegra/pinmux.c bootblock-y += ../tegra/apbmisc.c -ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += uart.c -endif +bootblock-y += uart.c verstage-y += verstage.c verstage-y += dma.c verstage-y += monotonic_timer.c verstage-y += spi.c -verstage-$(CONFIG_DRIVERS_UART) += uart.c +verstage-y += uart.c verstage-y += ../tegra/gpio.c verstage-y += ../tegra/i2c.c verstage-y += ../tegra/pinmux.c @@ -46,7 +44,7 @@ romstage-y += ../tegra/i2c.c romstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c romstage-y += ../tegra/pinmux.c romstage-y += cache.c -romstage-$(CONFIG_DRIVERS_UART) += uart.c +romstage-y += uart.c ramstage-y += cbmem.c ramstage-y += clock.c @@ -65,7 +63,7 @@ ramstage-y += ../tegra/i2c.c ramstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c ramstage-y += ../tegra/pinmux.c ramstage-y += ../tegra/usb.c -ramstage-$(CONFIG_DRIVERS_UART) += uart.c +ramstage-y += uart.c rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c diff --git a/src/soc/nvidia/tegra210/Makefile.inc b/src/soc/nvidia/tegra210/Makefile.inc index a2b50c96c2..e213751308 100644 --- a/src/soc/nvidia/tegra210/Makefile.inc +++ b/src/soc/nvidia/tegra210/Makefile.inc @@ -18,16 +18,14 @@ bootblock-y += ../tegra/pingroup.c bootblock-y += ../tegra/pinmux.c bootblock-y += ../tegra/apbmisc.c bootblock-y += ../tegra/usb.c -ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += uart.c -endif +bootblock-y += uart.c verstage-y += dma.c verstage-y += monotonic_timer.c verstage-y += spi.c verstage-y += padconfig.c verstage-y += funitcfg.c -verstage-$(CONFIG_DRIVERS_UART) += uart.c +verstage-y += uart.c verstage-y += ../tegra/gpio.c verstage-y += ../tegra/i2c.c verstage-y += ../tegra/pinmux.c @@ -57,7 +55,7 @@ romstage-y += ../tegra/gpio.c romstage-y += ../tegra/i2c.c romstage-y += ../tegra/pinmux.c romstage-y += ../tegra/usb.c -romstage-$(CONFIG_DRIVERS_UART) += uart.c +romstage-y += uart.c ramstage-y += addressmap.c ramstage-y += cbmem.c @@ -92,7 +90,7 @@ ramstage-y += ../tegra/i2c.c ramstage-y += ../tegra/pinmux.c ramstage-y += ramstage.c ramstage-y += mmu_operations.c -ramstage-$(CONFIG_DRIVERS_UART) += uart.c +ramstage-y += uart.c ramstage-y += ../tegra/usb.c ramstage-$(CONFIG_HAVE_MTC) += mtc.c ramstage-y += stage_entry.S |