From 7e3d7e071f3819894e6a56272a95df0cd9324548 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Sun, 28 May 2017 09:59:51 -0400
Subject: [PATCH] avr: Reorder Kconfig entries so that atmega2560 at 16mhz is
 default

Reorder the MCU list so that newer chips are at the top of the list.
This causes the very popular atmega2560 to be the default chip
selected.

Reorder the frequency list so that higher frequencies are at the top
of the list.  Restrict the 20Mhz frequency to only chips that support
that speed.  This causes the popular 16Mhz frequency to be the default
speed on AVR.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 src/avr/Kconfig | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/avr/Kconfig b/src/avr/Kconfig
index f678d6390..46dc08bb4 100644
--- a/src/avr/Kconfig
+++ b/src/avr/Kconfig
@@ -16,16 +16,16 @@ config BOARD_DIRECTORY
 
 choice
     prompt "Processor model"
-    config MACH_atmega168
-        bool "atmega168"
-    config MACH_atmega644p
-        bool "atmega644p"
-    config MACH_at90usb1286
-        bool "at90usb1286"
-    config MACH_atmega1280
-        bool "atmega1280"
     config MACH_atmega2560
         bool "atmega2560"
+    config MACH_atmega1280
+        bool "atmega1280"
+    config MACH_at90usb1286
+        bool "at90usb1286"
+    config MACH_atmega644p
+        bool "atmega644p"
+    config MACH_atmega168
+        bool "atmega168"
 endchoice
 
 config MCU
@@ -38,12 +38,13 @@ config MCU
 
 choice
     prompt "Processor speed"
-    config AVR_FREQ_8000000
-        bool "8Mhz"
-    config AVR_FREQ_16000000
-        bool "16Mhz"
     config AVR_FREQ_20000000
         bool "20Mhz"
+        depends on MACH_atmega168 || MACH_atmega644p
+    config AVR_FREQ_16000000
+        bool "16Mhz"
+    config AVR_FREQ_8000000
+        bool "8Mhz"
 endchoice
 
 config CLOCK_FREQ