From eea8cca0617c6227b72125b0adeba36759476368 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Mon, 29 Sep 2008 17:24:44 +0000 Subject: [PATCH] The defconfig should not have a payload specified to play nice with buildrom. Informally acked by Ron. Signed-off-by: Jordan Crouse Acked-by: Jordan Crouse git-svn-id: svn://coreboot.org/repository/coreboot-v3@875 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- mainboard/amd/serengeti/defconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mainboard/amd/serengeti/defconfig b/mainboard/amd/serengeti/defconfig index a3fb61a5ff..8b146e3191 100644 --- a/mainboard/amd/serengeti/defconfig +++ b/mainboard/amd/serengeti/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# coreboot version: 3.0."869" -# Fri Sep 19 15:57:34 2008 +# coreboot version: 3.0."874" +# Mon Sep 29 10:45:42 2008 # # @@ -26,7 +26,6 @@ CONFIG_MAINBOARD_DIR="amd/serengeti" # CONFIG_BOARD_AMD_DB800 is not set # CONFIG_BOARD_AMD_NORWICH is not set CONFIG_BOARD_AMD_SERENGETI=y -# CONFIG_BOARD_AMP_TINYGX is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set CONFIG_COREBOOT_ROMSIZE_KB_512=y @@ -117,7 +116,5 @@ CONFIG_SUPERIO_WINBOND_W83627HF=y # Payload # # CONFIG_PAYLOAD_ELF_LOADER is not set -CONFIG_PAYLOAD_ELF=y -# CONFIG_PAYLOAD_NONE is not set -CONFIG_PAYLOAD_FILE="../eb-5.4.3-via-velocity.elf" -# CONFIG_ZERO_AFTER_PAYLOAD is not set +# CONFIG_PAYLOAD_ELF is not set +CONFIG_PAYLOAD_NONE=y