We already have enum upl_access_type which is good enough, so drop the serial-specific enum.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/upl.h | 7 +------ test/boot/upl.c | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/upl.h b/include/upl.h index 4d0eca88047..9f2a6e7842d 100644 --- a/include/upl.h +++ b/include/upl.h @@ -169,11 +169,6 @@ struct upl_memres { bool no_map; };
-enum upl_serial_access_type { - UPLSAT_MMIO, - UPLSAT_IO, -}; - /* serial defaults */ enum { UPLD_REG_IO_SHIFT = 0, @@ -214,7 +209,7 @@ struct upl_serial { uint reg_offset; uint reg_io_width; ulong virtual_reg; - enum upl_serial_access_type access_type; + enum upl_access_type access_type; };
/** diff --git a/test/boot/upl.c b/test/boot/upl.c index 99f02b7951b..c2b571e06c4 100644 --- a/test/boot/upl.c +++ b/test/boot/upl.c @@ -142,7 +142,7 @@ int upl_get_test_data(struct unit_test_state *uts, struct upl *upl) upl->serial.reg_offset = 0x40; upl->serial.reg_io_width = 1; upl->serial.virtual_reg = 0x20000000; - upl->serial.access_type = UPLSAT_MMIO; + upl->serial.access_type = UPLAT_MMIO;
alist_init_struct(&upl->graphics.reg, struct memregion); ut_assertok(add_region(uts, &upl->graphics.reg, 0xd0000000, 0x10000000));