[coreboot-gerrit] Patch set updated for coreboot: 8ac7888 Revert "PC Engines ALIX.1C: Add CMOS defaults."

[Paul Menzel]

Paul Menzel ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3245

-gerrit

commit 8ac7888378c7dea2a348b1aaff9ee1260613ee86
Author: Peter Stuge 
Date:   Sun May 12 01:25:07 2013 +0200

Revert "PC Engines ALIX.1C: Add CMOS defaults."

Revert commit f90071faeee3358748d0c8d31e46721b53241e28 [1] as
    it was merged without its dependencies and therefore the source
    tree currently does not build [2][3].

OPTION     option_table.h
            GEN        build.h
            SCONFIG    mainboard/pcengines/alix1c/devicetree.cb
            CC         arch/x86/lib/cbfs_and_run.romstage.o
            CC         arch/x86/lib/memcpy.romstage.o
            CC         arch/x86/lib/memset.romstage.o
            CC         arch/x86/lib/rom_media.romstage.o
            CC         arch/x86/lib/romstage_console.romstage.o
            CC         console/die.romstage.o
            CC         console/post.romstage.o
            CC         console/vtxprintf.romstage.o
            CC         device/device_romstage.romstage.o
            CC         lib/cbfs.romstage.o
            CC         lib/compute_ip_checksum.romstage.o
            CC         lib/gcc.romstage.o
            CC         lib/lzma.romstage.o
            CC         lib/memchr.romstage.o
            CC         lib/memcmp.romstage.o
            CC         lib/memmove.romstage.o
            CC         lib/ramtest.romstage.o
            CC         lib/uart8250.romstage.o
            CC         southbridge/amd/cs5536/smbus.romstage.o
            ROMCC      generated/bootblock.inc
            GEN        generated/bootblock.ld
        make: *** No rule to make target `nvramtool', needed by `coreboot-builds/pcengines_alix1c/coreboot.pre1'.  Stop.
        make: *** Waiting for unfinished jobs....
            OPTION     cmos_layout.bin

[1] http://review.coreboot.org/#/c/3229/
    [2] http://www.coreboot.org/pipermail/coreboot/2013-May/075864.html
    [3] http://qa.coreboot.org/job/coreboot-gerrit/6251/testReport/junit/(root)/boar...

Change-Id: I4764d90c39ccdb4dc7e7a9aef7525c306614e1a8
    Signed-off-by: Peter Stuge 
---
 src/mainboard/asus/m4a785t-m/Kconfig        |  1 -
 src/mainboard/asus/m4a785t-m/cmos.default   | 18 ------------------
 src/mainboard/pcengines/alix1c/Kconfig      |  2 --
 src/mainboard/pcengines/alix1c/cmos.default | 11 -----------
 4 files changed, 32 deletions(-)

diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index 6816d58..10f6838 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
    select SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
    select SUPERIO_ITE_IT8712F
    select HAVE_OPTION_TABLE
-	select HAVE_CMOS_DEFAULT
    select HAVE_PIRQ_TABLE
    select HAVE_MP_TABLE
    select SB_HT_CHAIN_UNITID_OFFSET_ONLY
diff --git a/src/mainboard/asus/m4a785t-m/cmos.default b/src/mainboard/asus/m4a785t-m/cmos.default
deleted file mode 100644
index da086de..0000000
--- a/src/mainboard/asus/m4a785t-m/cmos.default
+++ /dev/null
@@ -1,18 +0,0 @@
-boot_option=Fallback
-last_boot=Fallback
-ECC_memory=Enable
-baud_rate=115200
-hw_scrubber=Enable
-interleave_chip_selects=Enable
-max_mem_clock=400Mhz
-multi_core=Enable
-power_on_after_fail=Disable
-debug_level=Spew
-boot_first=HDD
-boot_second=Fallback_Floppy
-boot_third=Fallback_Network
-boot_index=0xf
-boot_countdown=0xc
-slow_cpu=off
-nmi=Enable
-iommu=Enable
diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig
index fab8710..315b7ed 100644
--- a/src/mainboard/pcengines/alix1c/Kconfig
+++ b/src/mainboard/pcengines/alix1c/Kconfig
@@ -12,8 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
    select UDELAY_TSC
    select BOARD_ROMSIZE_KB_512
    select POWER_BUTTON_DEFAULT_DISABLE
-	select HAVE_OPTION_TABLE
-	select HAVE_CMOS_DEFAULT

config MAINBOARD_DIR
    string
diff --git a/src/mainboard/pcengines/alix1c/cmos.default b/src/mainboard/pcengines/alix1c/cmos.default
deleted file mode 100644
index 189c691..0000000
--- a/src/mainboard/pcengines/alix1c/cmos.default
+++ /dev/null
@@ -1,11 +0,0 @@
-boot_option=Fallback
-last_boot=Fallback
-ECC_memory=Disable
-baud_rate=115200
-power_on_after_fail=Disable
-debug_level=Spew
-boot_first=HDD
-boot_second=Fallback_Floppy
-boot_third=Fallback_Network
-boot_index=0xf
-boot_countdown=0x7f