mb/samsung: Enable VBOOT_VBNV_FLASH
To deprecate VBOOT_VBNV_CMOS [1], replace VBOOT_VBNV_CMOS with
VBOOT_VBNV_FLASH for samsung boards lumpy and stumpy. 0x8000 unused
flash space is allocated for RW_NVRAM.
Previously BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES was selected for
CPU_INTEL_HASWELL, CPU_INTEL_MODEL_{2065X,206AX} and others (see [2]).
However, there seems to be no particular reason on those platforms.
We've dropped the config for haswell. Now drop it for
CPU_INTEL_MODEL_{2065X,206AX}, so that VBOOT_VBNV_FLASH can be enabled.
[1] https://web.archive.org/web/20230115020833/https://issuetracker.google.com/issues/235293589?pli=1
[2] commit 6c2568f4f5
    ("drivers/spi: Add BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES config")
BUG=b:235293589
TEST=./util/abuild/abuild -a -t SAMSUNG_LUMPY -x
Change-Id: I833edd4f7a328b21e81c971ba8a9aec0aad7d3d3
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70296
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yidi Lin <yidilin@google.com>
			
			
This commit is contained in:
		@@ -7,7 +7,6 @@ config CPU_SPECIFIC_OPTIONS
 | 
				
			|||||||
	def_bool y
 | 
						def_bool y
 | 
				
			||||||
	select HAVE_EXP_X86_64_SUPPORT
 | 
						select HAVE_EXP_X86_64_SUPPORT
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES
 | 
					 | 
				
			||||||
	select SSE2
 | 
						select SSE2
 | 
				
			||||||
	select UDELAY_TSC
 | 
						select UDELAY_TSC
 | 
				
			||||||
	select TSC_MONOTONIC_TIMER
 | 
						select TSC_MONOTONIC_TIMER
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@ if CPU_INTEL_MODEL_206AX
 | 
				
			|||||||
config CPU_SPECIFIC_OPTIONS
 | 
					config CPU_SPECIFIC_OPTIONS
 | 
				
			||||||
	def_bool y
 | 
						def_bool y
 | 
				
			||||||
	select ARCH_X86
 | 
						select ARCH_X86
 | 
				
			||||||
	select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES
 | 
					 | 
				
			||||||
	select HAVE_EXP_X86_64_SUPPORT if USE_NATIVE_RAMINIT
 | 
						select HAVE_EXP_X86_64_SUPPORT if USE_NATIVE_RAMINIT
 | 
				
			||||||
	select MMX
 | 
						select MMX
 | 
				
			||||||
	select SSE2
 | 
						select SSE2
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 | 
				
			|||||||
	select HAVE_SPD_IN_CBFS
 | 
						select HAVE_SPD_IN_CBFS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config VBOOT
 | 
					config VBOOT
 | 
				
			||||||
	select VBOOT_VBNV_CMOS
 | 
						select VBOOT_VBNV_FLASH
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config MAINBOARD_DIR
 | 
					config MAINBOARD_DIR
 | 
				
			||||||
	default "samsung/lumpy"
 | 
						default "samsung/lumpy"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,8 @@ FLASH@0xff800000 0x800000 {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	SI_BIOS@0x180000 0x680000 {
 | 
						SI_BIOS@0x180000 0x680000 {
 | 
				
			||||||
		RW_VPD(PRESERVE)@0x0 0x1000
 | 
							RW_VPD(PRESERVE)@0x0 0x1000
 | 
				
			||||||
		RW_UNUSED@0x1000 0x67000
 | 
							RW_UNUSED@0x1000 0x5f000
 | 
				
			||||||
 | 
							RW_NVRAM(PRESERVE)@0x60000 0x8000
 | 
				
			||||||
		RW_SHARED@0x68000 0x18000 {
 | 
							RW_SHARED@0x68000 0x18000 {
 | 
				
			||||||
			RW_ENVIRONMENT@0x0 0x4000
 | 
								RW_ENVIRONMENT@0x0 0x4000
 | 
				
			||||||
			RW_MRC_CACHE@0x4000 0x10000
 | 
								RW_MRC_CACHE@0x4000 0x10000
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
 | 
				
			|||||||
	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 | 
						select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config VBOOT
 | 
					config VBOOT
 | 
				
			||||||
	select VBOOT_VBNV_CMOS
 | 
						select VBOOT_VBNV_FLASH
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config MAINBOARD_DIR
 | 
					config MAINBOARD_DIR
 | 
				
			||||||
	default "samsung/stumpy"
 | 
						default "samsung/stumpy"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,8 @@ FLASH@0xff800000 0x800000 {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	SI_BIOS@0x180000 0x680000 {
 | 
						SI_BIOS@0x180000 0x680000 {
 | 
				
			||||||
		RW_VPD(PRESERVE)@0x0 0x1000
 | 
							RW_VPD(PRESERVE)@0x0 0x1000
 | 
				
			||||||
		RW_UNUSED@0x1000 0x67000
 | 
							RW_UNUSED@0x1000 0x5f000
 | 
				
			||||||
 | 
							RW_NVRAM(PRESERVE)@0x60000 0x8000
 | 
				
			||||||
		RW_SHARED@0x68000 0x18000 {
 | 
							RW_SHARED@0x68000 0x18000 {
 | 
				
			||||||
			RW_ENVIRONMENT@0x0 0x4000
 | 
								RW_ENVIRONMENT@0x0 0x4000
 | 
				
			||||||
			RW_MRC_CACHE@0x4000 0x10000
 | 
								RW_MRC_CACHE@0x4000 0x10000
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user