From 18f4d343f5c90ea241a04819e10708c6f1a4d0cc Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Tue, 28 Mar 2017 12:11:02 -0400
Subject: avr: Remove F_CPU compile time definition

Directly use the Kconfig defined CONFIG_CLOCK_FREQ in the code and
avoid defining F_CPU.  Also, remove the unnecessary O2 option - that
is already the default from the main makefile.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 src/avr/serial.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/avr/serial.c')

diff --git a/src/avr/serial.c b/src/avr/serial.c
index 32619ecc..8628b602 100644
--- a/src/avr/serial.c
+++ b/src/avr/serial.c
@@ -30,10 +30,12 @@ serial_init(void)
 {
     if (CONFIG_SERIAL_BAUD_U2X) {
         UCSR0A = 1<<U2X0;
-        UBRR0 = DIV_ROUND_CLOSEST(F_CPU, 8UL * CONFIG_SERIAL_BAUD) - 1UL;
+        UBRR0 = DIV_ROUND_CLOSEST(
+            CONFIG_CLOCK_FREQ, 8UL * CONFIG_SERIAL_BAUD) - 1UL;
     } else {
         UCSR0A = 0;
-        UBRR0 = DIV_ROUND_CLOSEST(F_CPU, 16UL * CONFIG_SERIAL_BAUD) - 1UL;
+        UBRR0 = DIV_ROUND_CLOSEST(
+            CONFIG_CLOCK_FREQ, 16UL * CONFIG_SERIAL_BAUD) - 1UL;
     }
 
     UCSR0C = (1<<UCSZ01) | (1<<UCSZ00);
-- 
cgit v1.2.3-70-g09d2