From 76e25b66ae1975212b7863eb91437f92443bfef6 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Wed, 12 Feb 2014 15:54:47 -0600 Subject: google boards: Do not hardcode location of spd.bin spd.bin can reside anywhere in CBFS, and we only use CBFS APIs to access and read it. As such, there is no need to hardcode it, and it can collide with mrc.bin or mrc.cache on some boards. Do not use a specific position for spd.bin, but instead let cbfstool find the optimal placement. Change-Id: I496094d3c0de708813494095b7ac4be8addb4112 Signed-off-by: Alexandru Gagniuc Reviewed-on: http://review.coreboot.org/5210 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/mainboard/google/bolt/Makefile.inc | 1 - src/mainboard/google/falco/Makefile.inc | 1 - src/mainboard/google/link/Makefile.inc | 1 - src/mainboard/google/peppy/Makefile.inc | 1 - src/mainboard/google/rambi/Kconfig | 4 ---- src/mainboard/google/rambi/spd/Makefile.inc | 1 - src/mainboard/google/slippy/Makefile.inc | 1 - src/mainboard/samsung/lumpy/Makefile.inc | 1 - 8 files changed, 11 deletions(-) diff --git a/src/mainboard/google/bolt/Makefile.inc b/src/mainboard/google/bolt/Makefile.inc index 57f6f45e04..4e71be711b 100644 --- a/src/mainboard/google/bolt/Makefile.inc +++ b/src/mainboard/google/bolt/Makefile.inc @@ -43,4 +43,3 @@ $(SPD_BIN): $(SPD_DEPS) cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := 0xfffec000 diff --git a/src/mainboard/google/falco/Makefile.inc b/src/mainboard/google/falco/Makefile.inc index 50a47a5f2c..3269d2dc7d 100644 --- a/src/mainboard/google/falco/Makefile.inc +++ b/src/mainboard/google/falco/Makefile.inc @@ -48,4 +48,3 @@ $(SPD_BIN): $(SPD_DEPS) cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := 0xfffec000 diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc index 8fb69c6464..ba9a5aac8c 100644 --- a/src/mainboard/google/link/Makefile.inc +++ b/src/mainboard/google/link/Makefile.inc @@ -42,4 +42,3 @@ $(SPD_BIN): $(SPD_DEPS) cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := 0xfffec000 diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc index 62fc6b07fe..7f8cae352b 100644 --- a/src/mainboard/google/peppy/Makefile.inc +++ b/src/mainboard/google/peppy/Makefile.inc @@ -49,4 +49,3 @@ $(SPD_BIN): $(SPD_DEPS) cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := 0xfffec000 diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index db6f4e2b40..292d321388 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -32,8 +32,4 @@ config HAVE_ME_BIN bool default n -config SPD_CBFS_ADDRESS - hex "Location of SPD in CBFS" - default 0xfffec000 - endif # BOARD_INTEL_BAYLEYBAY diff --git a/src/mainboard/google/rambi/spd/Makefile.inc b/src/mainboard/google/rambi/spd/Makefile.inc index 84695abd4f..36f4b66823 100644 --- a/src/mainboard/google/rambi/spd/Makefile.inc +++ b/src/mainboard/google/rambi/spd/Makefile.inc @@ -43,4 +43,3 @@ $(SPD_BIN): $(SPD_DEPS) cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := $(CONFIG_SPD_CBFS_ADDRESS) diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc index eb2e7319a3..7a62022e94 100644 --- a/src/mainboard/google/slippy/Makefile.inc +++ b/src/mainboard/google/slippy/Makefile.inc @@ -45,4 +45,3 @@ $(SPD_BIN): $(SPD_DEPS) cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := 0xfffec000 diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc index bd4794220c..bb412ceb00 100644 --- a/src/mainboard/samsung/lumpy/Makefile.inc +++ b/src/mainboard/samsung/lumpy/Makefile.inc @@ -28,4 +28,3 @@ $(SPD_BIN): cbfs-files-y += spd.bin spd.bin-file := $(SPD_BIN) spd.bin-type := 0xab -spd.bin-position := 0xfffdc000 -- cgit v1.2.3