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>

2 files changed, 0 insertions, 33 deletions

diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index c2e73144c7..ca7a5f4c5c 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -118,8 +118,6 @@ struct cbmem_id_to_name {
 
 struct cbmem_entry;
 
-#if CONFIG_DYNAMIC_CBMEM
-
 /*
  * The dynamic cbmem infrastructure allows for growing cbmem dynamically as
  * things are added. It requires an external function, cbmem_top(), to be
@@ -171,35 +169,6 @@ int cbmem_entry_remove(const struct cbmem_entry *entry);
 void *cbmem_entry_start(const struct cbmem_entry *entry);
 u64 cbmem_entry_size(const struct cbmem_entry *entry);
 
-#else /* !CONFIG_DYNAMIC_CBMEM */
-
-/* Allocation with static CBMEM is resolved at build time. We start
- * with 128kB and conditionally add some of the most greedy CBMEM
- * table entries.
- */
-#define _CBMEM_SZ_MINIMAL	( 128 * 1024 )
-
-#define _CBMEM_SZ_TOTAL	\
-	(_CBMEM_SZ_MINIMAL + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE + \
-	HIGH_MEMORY_SAVE + HIGH_MEMORY_SCRATCH)
-
-#define HIGH_MEMORY_SIZE	ALIGN_UP(_CBMEM_SZ_TOTAL, 0x10000)
-
-#ifndef __PRE_RAM__
-void cbmem_late_set_table(uint64_t base, uint64_t size);
-#endif
-
-void get_cbmem_table(uint64_t *base, uint64_t *size);
-struct cbmem_entry *get_cbmem_toc(void);
-
-static inline const struct cbmem_entry *cbmem_entry_find(uint32_t id)
-{
-	return NULL;
-}
-#endif /* CONFIG_DYNAMIC_CBMEM */
-
-/* Common API between cbmem and dynamic cbmem. */
-
 /* Returns 0 if old cbmem was recovered. Recovery is only attempted if
  * s3resume is non-zero. */
 int cbmem_recovery(int s3resume);
diff --git a/src/include/rmodule.h b/src/include/rmodule.h
index d229cf816a..76b855a22e 100644
--- a/src/include/rmodule.h
+++ b/src/include/rmodule.h
@@ -54,7 +54,6 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size,
 /* Support for loading rmodule stages. This API is only available when
  * using dynamic cbmem because it uses the dynamic cbmem API to obtain
  * the backing store region for the stage. */
-#if CONFIG_DYNAMIC_CBMEM
 struct cbfs_stage;
 struct cbmem_entry;
 
@@ -70,7 +69,6 @@ struct rmod_stage_load {
 /* Both of the following functions return 0 on success, -1 on error. */
 int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage);
 int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl);
-#endif
 
 struct rmodule {
 	void *location;