Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 11:26:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix typo cloned to many files: SAM32 vs SAM34

Browse Source
This commit is contained in:
Gregory Nutt
2014-02-12 13:00:24 -06:00
parent b656602055
commit 6b4796fa5a
6 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/include/sam34/chip.h
+180 -180
View File
File diff suppressed because it is too large Load Diff
arch/arm/src/sam34/Kconfig
+1 -1
View File
@@ -575,7 +575,7 @@ endmenu # AT91SAM3/4 Peripheral Support
if ARCH_CHIP_SAM4L if ARCH_CHIP_SAM4L
menu "AT91SAM3/4 Clock Configuration" menu "AT91SAM3/4 Clock Configuration"
config SAM32_RESET_PERIPHCLKS config SAM34_RESET_PERIPHCLKS
bool "Enable all peripheral clocks on reset" bool "Enable all peripheral clocks on reset"
default n default n
---help--- ---help---
arch/arm/src/sam34/sam4l_periphclks.c
+6 -6
View File
@@ -105,7 +105,7 @@ static inline void sam_init_cpumask(void)
/* OR in the user selected peripherals */ /* OR in the user selected peripherals */
#ifdef CONFIG_SAM32_RESET_PERIPHCLKS #ifdef CONFIG_SAM34_RESET_PERIPHCLKS
#ifdef CONFIG_SAM34_OCD #ifdef CONFIG_SAM34_OCD
mask |= PM_CPUMASK_OCD; /* On-Chip Debug */ mask |= PM_CPUMASK_OCD; /* On-Chip Debug */
#endif #endif
@@ -136,7 +136,7 @@ static inline void sam_init_hsbmask(void)
/* OR in the user selected peripherals */ /* OR in the user selected peripherals */
#ifdef CONFIG_SAM32_RESET_PERIPHCLKS #ifdef CONFIG_SAM34_RESET_PERIPHCLKS
#ifdef CONFIG_SAM34_PDCA #ifdef CONFIG_SAM34_PDCA
mask |= PM_HSBMASK_PDCA; /* PDCA */ mask |= PM_HSBMASK_PDCA; /* PDCA */
#endif #endif
@@ -182,7 +182,7 @@ static inline void sam_init_pbamask(void)
/* OR in the user selected peripherals */ /* OR in the user selected peripherals */
#ifdef CONFIG_SAM32_RESET_PERIPHCLKS #ifdef CONFIG_SAM34_RESET_PERIPHCLKS
#ifdef CONFIG_SAM34_IISC #ifdef CONFIG_SAM34_IISC
mask |= PM_PBAMASK_IISC; /* IISC */ mask |= PM_PBAMASK_IISC; /* IISC */
#endif #endif
@@ -290,7 +290,7 @@ static inline void sam_init_pbbmask(void)
/* OR in the user selected peripherals */ /* OR in the user selected peripherals */
#ifdef CONFIG_SAM32_RESET_PERIPHCLKS #ifdef CONFIG_SAM34_RESET_PERIPHCLKS
#ifdef CONFIG_SAM34_HRAMC1 #ifdef CONFIG_SAM34_HRAMC1
mask |= PM_PBBMASK_HRAMC1; /* HRAMC1 */ mask |= PM_PBBMASK_HRAMC1; /* HRAMC1 */
#endif #endif
@@ -335,7 +335,7 @@ static inline void sam_init_pbcmask(void)
/* OR in the user selected peripherals */ /* OR in the user selected peripherals */
#ifdef CONFIG_SAM32_RESET_PERIPHCLKS #ifdef CONFIG_SAM34_RESET_PERIPHCLKS
#ifdef CONFIG_SAM34_CHIPID #ifdef CONFIG_SAM34_CHIPID
mask |= PM_PBCMASK_CHIPID; /* CHIPID */ mask |= PM_PBCMASK_CHIPID; /* CHIPID */
#endif #endif
@@ -368,7 +368,7 @@ static inline void sam_init_pbdmask(void)
/* OR in the user selected peripherals */ /* OR in the user selected peripherals */
#ifdef CONFIG_SAM32_RESET_PERIPHCLKS #ifdef CONFIG_SAM34_RESET_PERIPHCLKS
#ifdef CONFIG_SAM34_AST #ifdef CONFIG_SAM34_AST
mask |= PM_PBDMASK_AST; /* AST */ mask |= PM_PBDMASK_AST; /* AST */
#endif #endif
configs/sam4l-xplained/nsh/defconfig
+1 -1
View File
@@ -178,7 +178,7 @@ CONFIG_SAM34_USART0=y
# #
# AT91SAM3/4 Clock Configuration # AT91SAM3/4 Clock Configuration
# #
# CONFIG_SAM32_RESET_PERIPHCLKS is not set # CONFIG_SAM34_RESET_PERIPHCLKS is not set
# CONFIG_SAM34_OSC0 is not set # CONFIG_SAM34_OSC0 is not set
# CONFIG_SAM34_OSC32K is not set # CONFIG_SAM34_OSC32K is not set
# CONFIG_SAM34_RC80M is not set # CONFIG_SAM34_RC80M is not set
configs/sam4l-xplained/ostest/defconfig
+1 -1
View File
@@ -165,7 +165,7 @@ CONFIG_SAM34_USART0=y
# CONFIG_SAM34_AST is not set # CONFIG_SAM34_AST is not set
# CONFIG_SAM34_WDT is not set # CONFIG_SAM34_WDT is not set
# CONFIG_SAM34_EIC is not set # CONFIG_SAM34_EIC is not set
# CONFIG_SAM32_RESET_PERIPHCLKS is not set # CONFIG_SAM34_RESET_PERIPHCLKS is not set
# #
# AT91SAM3/4 USART Configuration # AT91SAM3/4 USART Configuration
drivers/audio/i2schar.c
+1 -1
View File
@@ -300,7 +300,7 @@ errout_with_reference:
} }
/**************************************************************************** /****************************************************************************
* Name: i2schar_read * Name: i2schar_write
* *
* Description: * Description:
* Standard character driver write method * Standard character driver write method