From b0c2fe05544704bc13e7e9d1d9f27802c38ef00f Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 9 May 2016 12:23:01 -0700 Subject: cbfstool/fsp: Rename fsp1_1_relocate FSP 2.0 uses the same relocate logic as FSP 1.1. Thus, rename fsp1_1_relocate to more generic fsp_component_relocate that can be used by cbfstool to relocate either FSP 1.1 or FSP 2.0 components. Allow FSP1.1 driver to still call fsp1_1_relocate which acts as a wrapper for fsp_component_relocate. Change-Id: I14a6efde4d86a340663422aff5ee82175362d1b0 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/14749 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Werner Zeh --- src/commonlib/include/commonlib/fsp.h | 31 +++++++++++++++++++++++++++++++ src/commonlib/include/commonlib/fsp1_1.h | 28 ---------------------------- 2 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 src/commonlib/include/commonlib/fsp.h delete mode 100644 src/commonlib/include/commonlib/fsp1_1.h (limited to 'src/commonlib/include') diff --git a/src/commonlib/include/commonlib/fsp.h b/src/commonlib/include/commonlib/fsp.h new file mode 100644 index 0000000000..84e2c98a8b --- /dev/null +++ b/src/commonlib/include/commonlib/fsp.h @@ -0,0 +1,31 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2016 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _COMMONLIB_FSP_H_ +#define _COMMONLIB_FSP_H_ + +#include +#include + +/* + * Relocate FSP held within buffer defined by size to new_addr. Returns < 0 + * on error, offset to FSP_INFO_HEADER on success. + */ +ssize_t fsp_component_relocate(uintptr_t new_addr, void *fsp, size_t size); + +/* API to relocate fsp 1.1 component. */ +ssize_t fsp1_1_relocate(uintptr_t new_addr, void *fsp, size_t size); + +#endif diff --git a/src/commonlib/include/commonlib/fsp1_1.h b/src/commonlib/include/commonlib/fsp1_1.h deleted file mode 100644 index a5bc193ed2..0000000000 --- a/src/commonlib/include/commonlib/fsp1_1.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2015 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef _COMMONLIB_FSP1_1_H_ -#define _COMMONLIB_FSP1_1_H_ - -#include -#include - -/* - * Relocate FSP held within buffer defined by size to new_addr. Returns < 0 - * on error, offset to FSP_INFO_HEADER on success. - */ -ssize_t fsp1_1_relocate(uintptr_t new_addr, void *fsp, size_t size); - -#endif -- cgit v1.2.3