summaryrefslogtreecommitdiff
path: root/src/pc80
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-09-27 16:26:05 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2011-10-13 20:00:22 +0200
commit491e2a29b9b29565f4023ac7ce32dbb5c284cb6e (patch)
tree8e9363f884486c28ad4a9a755330f22891ddb58a /src/pc80
parentaf2c538ee5b3adae6a51bd0e5c725a6a18688554 (diff)
downloadcoreboot-491e2a29b9b29565f4023ac7ce32dbb5c284cb6e.tar.xz
Enable/fix compilation of i8254 code in ram stage.
Change-Id: I3bbe795d8e6e576be9e94d6cd888e78a116ddbbd Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/254 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'src/pc80')
-rw-r--r--src/pc80/Makefile.inc1
-rw-r--r--src/pc80/i8254.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc
index 4f126f681d..2c8a80ee15 100644
--- a/src/pc80/Makefile.inc
+++ b/src/pc80/Makefile.inc
@@ -1,5 +1,6 @@
ramstage-y += mc146818rtc.c
ramstage-y += isa-dma.c
+ramstage-y += i8254.c
ramstage-y += i8259.c
ramstage-$(CONFIG_UDELAY_IO) += udelay_io.c
ramstage-y += keyboard.c
diff --git a/src/pc80/i8254.c b/src/pc80/i8254.c
index ca993f494c..f75216da47 100644
--- a/src/pc80/i8254.c
+++ b/src/pc80/i8254.c
@@ -35,7 +35,7 @@ void setup_i8254(void)
outb(0x12, TIMER1_PORT);
}
-#if CONFIG_UDELAY_TIMER2
+#if defined(CONFIG_UDELAY_TIMER2) && CONFIG_UDELAY_TIMER2
static void load_timer2(unsigned int ticks)
{
/* Set up the timer gate, turn off the speaker */