From 5515d5dd4242b2e5821b03c1cffa026325ca5b51 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 26 May 2015 13:25:39 -0600 Subject: [PATCH] SAM4L: Fix some issues from loast commit. Now running off DFLL with source clock = XOSCK32K --- configs/saml21-xplained/Kconfig | 2 ++ configs/saml21-xplained/nsh/defconfig | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/saml21-xplained/Kconfig b/configs/saml21-xplained/Kconfig index ec2f54ced4..1f6fb9a612 100644 --- a/configs/saml21-xplained/Kconfig +++ b/configs/saml21-xplained/Kconfig @@ -36,6 +36,7 @@ config SAML21_XPLAINED_DFLL choice prompt "DFLL Clock Source" default SAML21_XPLAINED_DFLL_OSC16MSRC + depends on SAML21_XPLAINED_DFLL config SAML21_XPLAINED_DFLL_OSC16MSRC bool "OSC16M" @@ -49,6 +50,7 @@ endchoice # DFLL Clock Source choice prompt "DFLL Operating Mode" default SAML21_XPLAINED_DFLL_OPENLOOP + depends on SAML21_XPLAINED_DFLL config SAML21_XPLAINED_DFLL_OPENLOOP bool "DFLL Open Loop Mode" diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig index 9786b618ad..80925b920d 100644 --- a/configs/saml21-xplained/nsh/defconfig +++ b/configs/saml21-xplained/nsh/defconfig @@ -210,7 +210,7 @@ CONFIG_ARCH_STACKDUMP=y # # Board Settings # -CONFIG_BOARD_LOOPSPERMSEC=3410 +CONFIG_BOARD_LOOPSPERMSEC=4356 # CONFIG_ARCH_CALIBRATION is not set # @@ -265,10 +265,10 @@ CONFIG_SAML21_XPLAINED_OSC16M_4MHZ=y # CONFIG_SAML21_XPLAINED_OSC16M_8MHZ is not set # CONFIG_SAML21_XPLAINED_OSC16M_12MHZ is not set # CONFIG_SAML21_XPLAINED_OSC16M_16MHZ is not set -# CONFIG_SAM21_XPLAINED_XOSC32K is not set -# CONFIG_SAML21_XPLAINED_DFLL is not set -CONFIG_SAML21_XPLAINED_DFLL_OSC16MSRC=y -# CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC is not set +CONFIG_SAM21_XPLAINED_XOSC32K=y +CONFIG_SAML21_XPLAINED_DFLL=y +# CONFIG_SAML21_XPLAINED_DFLL_OSC16MSRC is not set +CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC=y # CONFIG_SAML21_XPLAINED_DFLL_OPENLOOP is not set CONFIG_SAML21_XPLAINED_DFLL_CLOSEDLOOP=y