summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2016-05-10 15:12:08 -0500
committerAaron Durbin <adurbin@chromium.org>2016-05-11 21:32:44 +0200
commitbf1e48194494b52a06945490a4fbf322059e7ebd (patch)
tree80376e22606f9b8b80451373cbe68071f437f88c /src/lib
parent044e4b574548e1b416acf6b17d56093096985e90 (diff)
downloadcoreboot-bf1e48194494b52a06945490a4fbf322059e7ebd.tar.xz
lib: remove FLASHMAP_OFFSET config variable
The FLASHMAP_OFFSET config variable is used in lib/fmap.c, however the fmdtool creates a fmap_config.h with a FMAP_OFFSET #define. Those 2 values are not consistent. Therefore, remove the Kconfig variable and defer to the #define generated by fmdtool. Change-Id: Ib4ecbc429e142b3e250106eea59fea1caa222917 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/14765 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Leroy P Leahy <leroy.p.leahy@intel.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.inc7
-rw-r--r--src/lib/fmap.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 4c6a395efc..734b517b01 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -186,6 +186,13 @@ $(call src-to-obj,smm,$(dir)/cbfs.c) : $(obj)/fmap_config.h
$(call src-to-obj,verstage,$(dir)/cbfs.c) : $(obj)/fmap_config.h
$(call src-to-obj,postcar,$(dir)/cbfs.c) : $(obj)/fmap_config.h
+$(call src-to-obj,bootblock,$(dir)/fmap.c) : $(obj)/fmap_config.h
+$(call src-to-obj,romstage,$(dir)/fmap.c) : $(obj)/fmap_config.h
+$(call src-to-obj,ramstage,$(dir)/fmap.c) : $(obj)/fmap_config.h
+$(call src-to-obj,smm,$(dir)/fmap.c) : $(obj)/fmap_config.h
+$(call src-to-obj,verstage,$(dir)/fmap.c) : $(obj)/fmap_config.h
+$(call src-to-obj,postcar,$(dir)/fmap.c) : $(obj)/fmap_config.h
+
romstage-y += bootmode.c
ramstage-y += bootmode.c
verstage-y += bootmode.c
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
index 54e54ba6b7..bf99037f54 100644
--- a/src/lib/fmap.c
+++ b/src/lib/fmap.c
@@ -21,6 +21,8 @@
#include <stddef.h>
#include <string.h>
+#include "fmap_config.h"
+
/*
* See http://code.google.com/p/flashmap/ for more information on FMAP.
*/
@@ -32,7 +34,7 @@ int find_fmap_directory(struct region_device *fmrd)
const struct region_device *boot;
struct fmap *fmap;
size_t fmap_size;
- size_t offset = CONFIG_FLASHMAP_OFFSET;
+ size_t offset = FMAP_OFFSET;
boot_device_init();
boot = boot_device_ro();