From fb21e254c8eee93100e26eb3354556e8d50ddeb3 Mon Sep 17 00:00:00 2001 From: Julien Viard de Galbert Date: Fri, 7 Feb 2020 11:42:48 +0100 Subject: [PATCH] Use utk nvram-compact and invalidate So building with UTK also cleanup the NVRAM on winterfell Signed-off-by: Julien Viard de Galbert --- Makefile | 1 + boards/winterfell/Makefile.board | 7 +++++++ boards/winterfell/nvar-keep.txt | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 boards/winterfell/nvar-keep.txt diff --git a/Makefile b/Makefile index cef9d30..488bd40 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,7 @@ $(BUILD)/linuxboot.rom: bin/utk $(DXE_FFS) $(ROM) \ remove_dxes_except boards/$(BOARD)/image-files.txt \ $(foreach ffs,$(DXE_FFS), insert_dxe $(ffs)) \ + $(UTK_EXTRA_OPS) \ save $@ endif diff --git a/boards/winterfell/Makefile.board b/boards/winterfell/Makefile.board index 7c5971c..f74b211 100644 --- a/boards/winterfell/Makefile.board +++ b/boards/winterfell/Makefile.board @@ -64,3 +64,10 @@ $(BUILD)/nvram1.ffs: $(NVRAM1_FFS) $(BUILD)/nvram2.ffs: $(NVRAM2_FFS) ./bin/nvram-compact < $< > $@ +# +# UTK Compact the NVRAM region +# + +nvram-nvar-keep := boards/$(BOARD)/nvar-keep.txt + +UTK_EXTRA_OPS := invalidate_nvar_except $(nvram-nvar-keep) nvram-compact diff --git a/boards/winterfell/nvar-keep.txt b/boards/winterfell/nvar-keep.txt new file mode 100644 index 0000000..88f9428 --- /dev/null +++ b/boards/winterfell/nvar-keep.txt @@ -0,0 +1,3 @@ +StdDefaults +CpuS3Resume +Setup