From bf1e48194494b52a06945490a4fbf322059e7ebd Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 10 May 2016 15:12:08 -0500 Subject: 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 Reviewed-on: https://review.coreboot.org/14765 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Leroy P Leahy --- Documentation/Intel/Board/board.html | 3 +-- src/Kconfig | 9 --------- src/lib/Makefile.inc | 7 +++++++ src/lib/fmap.c | 4 +++- src/mainboard/google/nyan/Kconfig | 4 ---- src/mainboard/google/nyan_big/Kconfig | 4 ---- src/mainboard/google/nyan_blaze/Kconfig | 4 ---- src/mainboard/intel/amenia/Kconfig | 4 ---- 8 files changed, 11 insertions(+), 28 deletions(-) diff --git a/Documentation/Intel/Board/board.html b/Documentation/Intel/Board/board.html index e157780962..1b2d323091 100644 --- a/Documentation/Intel/Board/board.html +++ b/Documentation/Intel/Board/board.html @@ -65,7 +65,6 @@
  • Configure coreboot build:
    1. Set LOCALVERSION
      2. -
    2. FLASHMAP_OFFSET = 0x00700000
    3. Select vendor for the board
    4. Select the board
    5. CBFS_SIZE = 0x00100000
      6. @@ -238,4 +237,4 @@

      Modified: 20 February 2016

      - \ No newline at end of file + diff --git a/src/Kconfig b/src/Kconfig index e64dd35cab..a11a2da833 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -269,15 +269,6 @@ config NO_STAGE_CACHE Do not save any component in stage cache for resume path. On resume, all components would be read back from CBFS again. -config FLASHMAP_OFFSET - hex "Flash Map Offset" - default 0x00670000 if NORTHBRIDGE_INTEL_SANDYBRIDGE - default 0x00610000 if NORTHBRIDGE_INTEL_IVYBRIDGE - default CBFS_SIZE if !ARCH_X86 - default 0 - help - Offset of flash map in firmware image - # TODO: This doesn't belong here, move to src/arch/x86/Kconfig choice prompt "Bootblock behaviour" 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 #include +#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(); diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index a5ecf84cbc..21f42dafc9 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -82,10 +82,6 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 1 -config FLASHMAP_OFFSET - hex - default 0x00100000 - config DRIVER_TPM_I2C_BUS hex default 0x2 diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index fdd40f6661..7af9657e87 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -83,10 +83,6 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 1 -config FLASHMAP_OFFSET - hex - default 0x00100000 - config DRIVER_TPM_I2C_BUS hex default 0x2 diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index f28fb24413..9fa99d8a34 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -84,10 +84,6 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 1 -config FLASHMAP_OFFSET - hex - default 0x00100000 - config DRIVER_TPM_I2C_BUS hex default 0x2 diff --git a/src/mainboard/intel/amenia/Kconfig b/src/mainboard/intel/amenia/Kconfig index b2c1a8ce19..f5460c7b64 100644 --- a/src/mainboard/intel/amenia/Kconfig +++ b/src/mainboard/intel/amenia/Kconfig @@ -46,10 +46,6 @@ config IFD_BIOS_START hex default 0x1000 -config FLASHMAP_OFFSET - hex - default 0x200000 - config MAX_CPUS int default 8 -- cgit v1.2.3