This is an automated email from Gerrit. "Ryan QIAN <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9599
-- gerrit commit c770f3d687fb0dd752f5e04ee02e77371ad0f57d Author: Ryan QIAN <[email protected]> Date: Mon Apr 27 10:53:56 2026 +0800 contrib/loaders/flash/hpmicro: fix hybrid xpi support check - not only the romapi version, but it still needs to check if the corresponding api is available. Change-Id: I45fdd86a979bf99122758a627234cd8f57fc5621 Signed-off-by: Ryan QIAN <[email protected]> diff --git a/contrib/loaders/flash/hpmicro/openocd_flash_algo.c b/contrib/loaders/flash/hpmicro/openocd_flash_algo.c index 16b66d55d4..14ae38bcd5 100644 --- a/contrib/loaders/flash/hpmicro/openocd_flash_algo.c +++ b/contrib/loaders/flash/hpmicro/openocd_flash_algo.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 HPMicro + * Copyright (c) 2024,2026 HPMicro */ #include "hpm_romapi.h" @@ -13,7 +13,7 @@ #define XPI_USE_PORT_A_MASK (0) #define XPI_USE_PORT_SHIFT (0x8) -#define ROMAPI_SUPPORTS_HYBRIDXPI() (ROM_API_TABLE_ROOT->xpi_nor_driver_if->version >= 0x56010300) +#define ROMAPI_SUPPORTS_HYBRIDXPI() (((ROM_API_TABLE_ROOT->xpi_nor_driver_if->version >= 0x56010300)) && (ROM_API_TABLE_ROOT->xpi_nor_driver_if->enable_hybrid_xpi != NULL)) struct hpm_flash_info_t { uint32_t total_sz_in_bytes; --
