From 5cb876cc1fef34e238e37facb36a77dbc45ced9a Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 8 Jun 2018 18:31:43 +0200 Subject: mainboard: Get rid of device_t in ramstage Use of device_t has been abandoned in ramstage. Change-Id: I07e00afbbd2c19cf3ea6e08f228eb39e45f1ad0c Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26983 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/emulation/qemu-armv7/mainboard.c | 2 +- src/mainboard/emulation/qemu-i440fx/acpi.h | 3 ++- src/mainboard/emulation/qemu-i440fx/mainboard.c | 2 +- src/mainboard/emulation/qemu-power8/mainboard.c | 2 +- src/mainboard/emulation/qemu-q35/mainboard.c | 2 +- src/mainboard/emulation/qemu-riscv/mainboard.c | 2 +- src/mainboard/emulation/spike-riscv/mainboard.c | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/mainboard/emulation') diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c index 39c2361eea..d91d77a097 100644 --- a/src/mainboard/emulation/qemu-armv7/mainboard.c +++ b/src/mainboard/emulation/qemu-armv7/mainboard.c @@ -50,7 +50,7 @@ static void init_gfx(void) set_vbe_mode_info_valid(&edid, framebuffer); } -static void mainboard_enable(device_t dev) +static void mainboard_enable(struct device *dev) { int discovered; if (!dev) { diff --git a/src/mainboard/emulation/qemu-i440fx/acpi.h b/src/mainboard/emulation/qemu-i440fx/acpi.h index f2ffdeb486..5fc860b743 100644 --- a/src/mainboard/emulation/qemu-i440fx/acpi.h +++ b/src/mainboard/emulation/qemu-i440fx/acpi.h @@ -1 +1,2 @@ -unsigned long northbridge_write_acpi_tables(device_t device, unsigned long start); +unsigned long northbridge_write_acpi_tables(struct device *device, + unsigned long start); diff --git a/src/mainboard/emulation/qemu-i440fx/mainboard.c b/src/mainboard/emulation/qemu-i440fx/mainboard.c index 63b18331d0..b2439bb1d4 100644 --- a/src/mainboard/emulation/qemu-i440fx/mainboard.c +++ b/src/mainboard/emulation/qemu-i440fx/mainboard.c @@ -26,7 +26,7 @@ static const unsigned char qemu_i440fx_irqs[] = { 11, 10, 10, 11, }; -static void qemu_nb_init(device_t dev) +static void qemu_nb_init(struct device *dev) { /* Map memory at 0xc0000 - 0xfffff */ int i; diff --git a/src/mainboard/emulation/qemu-power8/mainboard.c b/src/mainboard/emulation/qemu-power8/mainboard.c index 3c86fadb65..6d75bb1aae 100644 --- a/src/mainboard/emulation/qemu-power8/mainboard.c +++ b/src/mainboard/emulation/qemu-power8/mainboard.c @@ -17,7 +17,7 @@ #include #include -static void mainboard_enable(device_t dev) +static void mainboard_enable(struct device *dev) { if (!dev) { diff --git a/src/mainboard/emulation/qemu-q35/mainboard.c b/src/mainboard/emulation/qemu-q35/mainboard.c index d107c11415..9b9375179b 100644 --- a/src/mainboard/emulation/qemu-q35/mainboard.c +++ b/src/mainboard/emulation/qemu-q35/mainboard.c @@ -43,7 +43,7 @@ intel_gma_get_controller_info(void) return &gfx_controller_info; } -static void qemu_nb_init(device_t dev) +static void qemu_nb_init(struct device *dev) { /* Map memory at 0xc0000 - 0xfffff */ int i; diff --git a/src/mainboard/emulation/qemu-riscv/mainboard.c b/src/mainboard/emulation/qemu-riscv/mainboard.c index b0e00e8e49..7061bcfd35 100644 --- a/src/mainboard/emulation/qemu-riscv/mainboard.c +++ b/src/mainboard/emulation/qemu-riscv/mainboard.c @@ -17,7 +17,7 @@ #include #include -static void mainboard_enable(device_t dev) +static void mainboard_enable(struct device *dev) { if (!dev) { diff --git a/src/mainboard/emulation/spike-riscv/mainboard.c b/src/mainboard/emulation/spike-riscv/mainboard.c index 6ccbd93a3e..5d2b0b9c7b 100644 --- a/src/mainboard/emulation/spike-riscv/mainboard.c +++ b/src/mainboard/emulation/spike-riscv/mainboard.c @@ -17,7 +17,7 @@ #include #include -static void mainboard_enable(device_t dev) +static void mainboard_enable(struct device *dev) { /* * Size of the emulated system RAM. On hardware, this would be external -- cgit v1.2.3