aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stuge <peter@stuge.se>2013-05-12 01:25:07 +0200
committerDavid Hendricks <dhendrix@chromium.org>2013-05-12 20:42:20 +0200
commitc49ae3c655172c98b31bde50796fccf42683ee9f (patch)
tree358df0f098524a1405e2989f7fb334341c1fb55b
parent08d0baa77aaa9430b0f6c03cfaef8666bf19c4ce (diff)
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)/board/i386_pcengines_alix1c/ Change-Id: I4764d90c39ccdb4dc7e7a9aef7525c306614e1a8 Signed-off-by: Peter Stuge <peter@stuge.se> Reviewed-on: http://review.coreboot.org/3245 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: David Hendricks <dhendrix@chromium.org>
-rw-r--r--src/mainboard/pcengines/alix1c/Kconfig2
-rw-r--r--src/mainboard/pcengines/alix1c/cmos.default11
2 files changed, 0 insertions, 13 deletions
diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig
index fab87108ec..315b7edbf6 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 189c691630..0000000000
--- 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