1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00

internal.c: De-maze the pre-processor wraps a little

This makes it again easier to parse internal.c by consolidating
some processor wraps and labeling the ends of others.

BUG=none
BRANCH=none
TEST=builds

Change-Id: I32fb1a3fff7afa671f08fb2cc2ad406772f5e10f
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/46815
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2020-10-26 19:08:42 +11:00 committed by Angel Pons
parent dad2f7c336
commit 74fd0300b8

View File

@ -113,7 +113,7 @@ int register_superio(struct superio s)
return 0; return 0;
} }
#endif #endif /* IS_X86 */
static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr) chipaddr addr)
@ -281,9 +281,7 @@ int internal_init(void)
msg_pinfo("Continuing anyway.\n"); msg_pinfo("Continuing anyway.\n");
} }
} }
#endif
#if IS_X86
is_laptop = 2; /* Assume that we don't know by default. */ is_laptop = 2; /* Assume that we don't know by default. */
dmi_init(); dmi_init();
@ -299,7 +297,7 @@ int internal_init(void)
* FIXME: Find a replacement for DMI on non-x86. * FIXME: Find a replacement for DMI on non-x86.
* FIXME: Enable Super I/O probing once port I/O is possible. * FIXME: Enable Super I/O probing once port I/O is possible.
*/ */
#endif #endif /* IS_X86 */
/* Check laptop whitelist. */ /* Check laptop whitelist. */
board_handle_before_laptop(); board_handle_before_laptop();
@ -333,7 +331,7 @@ int internal_init(void)
ret = 1; ret = 1;
goto internal_init_exit; goto internal_init_exit;
} }
#endif #endif /* IS_X86 */
if (internal_buses_supported & BUS_NONSPI) if (internal_buses_supported & BUS_NONSPI)
register_par_master(&par_master_internal, internal_buses_supported); register_par_master(&par_master_internal, internal_buses_supported);