diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-06-25 23:17:43 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-08-01 15:57:11 +0200 |
| commit | ef844011491df76eb4976905f2037732e0520295 (patch) | |
| tree | 45145bccdf8679ee4873c67349b5dc2025009a5c /src/lib | |
| parent | 0aede1185be6298bbc9501a0c596e64617bad58b (diff) | |
Add directive __SIMPLE_DEVICE__
The tests for __PRE_RAM__ or __SMM__ were repeatedly used
for detection if dev->ops in the devicetree are not available
and simple device model functions need be used.
If a source file build for ramstage had __PRE_RAM__ inserted
at the beginning, the struct device would no longer match the
allocation the object had taken. This problem is fixed by
replacing such cases with explicit __SIMPLE_DEVICE__.
Change-Id: Ib74c9b2d8753e6e37e1a23fcfaa2f3657790d4c0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3555
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/uart8250mem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c index 82248436d3..8d85855f4c 100644 --- a/src/lib/uart8250mem.c +++ b/src/lib/uart8250mem.c @@ -24,9 +24,7 @@ #if CONFIG_USE_OPTION_TABLE #include "option_table.h" #endif -#if !defined(__SMM__) && !defined(__PRE_RAM__) #include <device/device.h> -#endif #include <delay.h> /* Should support 8250, 16450, 16550, 16550A type UARTs */ @@ -129,7 +127,7 @@ u32 uart_mem_init(void) /* Now find the UART base address and calculate the divisor */ #if CONFIG_DRIVERS_OXFORD_OXPCIE -#if defined(MORE_TESTING) && !defined(__SMM__) && !defined(__PRE_RAM__) +#if defined(MORE_TESTING) && !defined(__SIMPLE_DEVICE__) device_t dev = dev_find_device(0x1415, 0xc158, NULL); if (!dev) dev = dev_find_device(0x1415, 0xc11b, NULL); |