diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-28 11:24:19 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-01-27 22:54:32 +0100 |
| commit | ae98e83eb256c17a4a8d535bba4107611126db3d (patch) | |
| tree | de963b2d1cd3652e51ec17da112ff7642ddb0e72 /src/lib/rmodule.c | |
| parent | 2fb6b40ed0d4c4d169d4b909ad784e1841b50242 (diff) | |
| download | coreboot-ae98e83eb256c17a4a8d535bba4107611126db3d.tar.xz | |
CBMEM: Always use DYNAMIC_CBMEM
Drop the implementation of statically allocated high memory
region for CBMEM. There is no longer the need to explicitly
select DYNAMIC_CBMEM, it is the only remaining choice.
Change-Id: Iadf6f27a134e05daa1038646d0b4e0b8f9f0587a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7851
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib/rmodule.c')
| -rw-r--r-- | src/lib/rmodule.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c index d7c2326f12..8d96e8d86f 100644 --- a/src/lib/rmodule.c +++ b/src/lib/rmodule.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <assert.h> +#include <cbmem.h> +#include <cbfs_core.h> #include <stdint.h> #include <stdlib.h> #include <string.h> @@ -249,10 +251,6 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size, return region_alignment - sizeof(struct rmodule_header); } -#if CONFIG_DYNAMIC_CBMEM -#include <cbmem.h> -#include <cbfs_core.h> - int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage) { struct rmodule rmod_stage; @@ -307,5 +305,3 @@ int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl) return rmodule_stage_load(rsl, stage); } - -#endif /* DYNAMIC_CBMEM */ |