From 66dbce8cf63c374577a70cb09d602a9c00f2c3e6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 14 Nov 2014 09:54:00 -0600 Subject: [PATCH] Cosmetic updates; updates to README --- arch/arm/src/efm32/efm32_usb.h | 1 - arch/arm/src/efm32/efm32_usbdev.c | 8 ++++---- configs/sama5d4-ek/README.txt | 10 +++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/src/efm32/efm32_usb.h b/arch/arm/src/efm32/efm32_usb.h index b12c83b73a..5abe1544da 100644 --- a/arch/arm/src/efm32/efm32_usb.h +++ b/arch/arm/src/efm32/efm32_usb.h @@ -146,4 +146,3 @@ void efm32_usbsuspend(FAR struct usbdev_s *dev, bool resume); #endif /* __ASSEMBLY__ */ #endif /* CONFIG_EFM32_OTGFS */ #endif /* __ARCH_ARM_SRC_EFM32_EFM32_OTGFS_H */ - diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index 10cb057c11..afe5e4780c 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/arch/arm/src/efm32/efm32_usbdev.c @@ -5241,14 +5241,14 @@ static void efm32_hwinitialize(FAR struct efm32_usbdev_s *priv) /* Device configuration register */ - regval = efm32_getreg(EFM32_USB_DCFG); + regval = efm32_getreg(EFM32_USB_DCFG); regval &= ~_USB_DCFG_PERFRINT_MASK; regval |= USB_DCFG_PERFRINT_80PCNT; efm32_putreg(regval, EFM32_USB_DCFG); /* Set full speed PHY */ - regval = efm32_getreg(EFM32_USB_DCFG); + regval = efm32_getreg(EFM32_USB_DCFG); regval &= ~_USB_DCFG_DEVSPD_MASK; regval |= USB_DCFG_DEVSPD_FS; efm32_putreg(regval, EFM32_USB_DCFG); @@ -5354,8 +5354,8 @@ static void efm32_hwinitialize(FAR struct efm32_usbdev_s *priv) /* Enable the interrupts in the INTMSK */ - regval = (USB_GINTMSK_RXFLVLMSK | USB_GINTMSK_USBSUSPMSK | USB_GINTMSK_ENUMDONEMSK | - USB_GINTMSK_IEPINTMSK | USB_GINTMSK_OEPINTMSK | USB_GINTMSK_USBRSTMSK); + regval = (USB_GINTMSK_RXFLVLMSK | USB_GINTMSK_USBSUSPMSK | USB_GINTMSK_ENUMDONEMSK | + USB_GINTMSK_IEPINTMSK | USB_GINTMSK_OEPINTMSK | USB_GINTMSK_USBRSTMSK); #ifdef CONFIG_USBDEV_ISOCHRONOUS regval |= (USB_GINTMSK_INCOMPISOINMSK | USB_GINTMSK_INCOMPLPMSK); diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index 7cc2a7c471..3d34a9ded4 100644 --- a/configs/sama5d4-ek/README.txt +++ b/configs/sama5d4-ek/README.txt @@ -3770,7 +3770,11 @@ Configurations CONFIG_GRAN=n : Disable the granule allocator CONFIG_MM_PGALLOC=n : Disable the page allocator - 4. A system call interface is enabled and the ELF test programs interface with the base RTOS code system calls. This eliminates the need for symbol tables to link with the base RTOS (symbol tables are still used, however, to interface with the common C library instaniation). Relevant configuration settings: + 4. A system call interface is enabled and the ELF test programs interface + with the base RTOS code system calls. This eliminates the need for symbol + tables to link with the base RTOS (symbol tables are still used, however, + to interface with the common C library instaniation). Relevant + configuration settings: RTOS Features -> System call support CONFIG_LIB_SYSCALL=y : Enable system call support @@ -3796,7 +3800,6 @@ Configurations knsh: An NSH configuration used to test the SAMA5D kenel build configuration. - More to come... this is still a work in progress as of this writing. NOTES: @@ -3853,7 +3856,8 @@ Configurations build out-of-the-box. You have to take special steps in the build process as described below. - Assuming that you will want to reconfigure to use the ROMFS (rather than debugging HSCMI), you will need to disable all of these settings: + Assuming that you will want to reconfigure to use the ROMFS (rather + than debugging HSCMI), you will need to disable all of these settings: System Type->ATSAMA5 Peripheral Support CONFIG_SAMA5_HSMCI0=n : Disable HSMCI0 support