michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: sam3x: update Kconfig options after move to SAM SoC family tree

Browse source 
The files for the Arduino Due needed to be updated to use the new
configuration when the SoC moved from the atmel_sam3 directory to
the atmel_sam/sam3x directory.

Jira: ZEP-2067

Signed-off-by: Justin Watson <jwatson5@gmail.com>
This commit is contained in:
Justin Watson 2017-05-01 14:57:26 -07:00 • committed by Anas Nashif
commit 558281b096
18 changed files with 78 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/soc/atmel_sam/Kconfig
View file

@ -4,10 +4,5 @@
# SPDX-License-Identifier: Apache-2.0
#
config SOC_ATMEL_SAM3
bool
depends on ARM
default n
# Select SoC Part No. and configuration options
source "arch/arm/soc/atmel_sam/*/Kconfig.soc"

2
arch/arm/soc/atmel_sam/Kconfig.defconfig
View file

@ -16,7 +16,7 @@ config SOC_FAMILY
default atmel_sam
config WATCHDOG
def_bool y if !SOC_ATMEL_SAM3X8E
def_bool y
endif #SOC_FAMILY_SAM

59
arch/arm/soc/atmel_sam/sam3x/Kconfig.defconfig.series
View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
if SOC_SERIES_SAM3X || SOC_ATMEL_SAM3X8E
if SOC_SERIES_SAM3X
config SOC_SERIES
string
@ -14,7 +14,7 @@ config SOC_SERIES
config SOC_PART_NUMBER
string
default sam3x8e if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
default sam3x8e if SOC_PART_NUMBER_SAM3X8E
config NUM_IRQ_PRIO_BITS
int
@ -42,66 +42,19 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
# to provide one continuous 96K block.
#
config SRAM_SIZE
default 96 if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
default 96 if SOC_PART_NUMBER_SAM3X8E
config SRAM_BASE_ADDRESS
default 0x20000000 if !SOC_PART_NUMBER_SAM3X8E && !SOC_ATMEL_SAM3X8E
default 0x20070000 if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
default 0x20000000 if !SOC_PART_NUMBER_SAM3X8E
default 0x20070000 if SOC_PART_NUMBER_SAM3X8E
#
# Atmel SAM3X family has flash starting @ 0x00080000.
#
config FLASH_SIZE
default 512 if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
default 512 if SOC_PART_NUMBER_SAM3X8E
config FLASH_BASE_ADDRESS
default 0x00080000
if UART_ATMEL_SAM3
config UART_ATMEL_SAM3_BAUD_RATE
default 115200
config UART_ATMEL_SAM3_CLK_FREQ
default 84000000
endif # UART_ATMEL_SAM3
if GPIO
config GPIO_ATMEL_SAM3
def_bool y
config GPIO_ATMEL_SAM3_PORTA
default y
config GPIO_ATMEL_SAM3_PORTB
default y
config GPIO_ATMEL_SAM3_PORTC
default y
config GPIO_ATMEL_SAM3_PORTD
default y
endif # GPIO
if I2C
config I2C_ATMEL_SAM3
def_bool y
config I2C_0
default y
config I2C_0_IRQ_PRI
default 0
config I2C_1
default y
config I2C_1_IRQ_PRI
default 0
endif # I2C
endif # SOC_SERIES_SAM3X

10
arch/arm/soc/atmel_sam/sam3x/Kconfig.series
View file

@ -16,13 +16,3 @@ config SOC_SERIES_SAM3X
help
Enable support for Atmel SAM3X Cortex-M3 microcontrollers.
Part No.: SAM3X8E
config SOC_ATMEL_SAM3X8E
bool "Atmel SAM3X8E Processor"
select SOC_PART_NUMBER_SAM3X8E
select CPU_CORTEX_M
select CPU_CORTEX_M3
select SOC_FAMILY_SAM
select SYS_POWER_LOW_POWER_STATE_SUPPORTED
select CPU_HAS_SYSTICK
select SOC_ATMEL_SAM3

4
arch/arm/soc/atmel_sam/sam3x/Kconfig.soc
View file

@ -15,7 +15,7 @@ choice
bool "SAM3X8E"
endchoice
if SOC_SERIES_SAM3X || SOC_ATMEL_SAM3X8E
if SOC_SERIES_SAM3X
config SOC_ATMEL_SAM3X_EXT_SLCK
bool "Atmel SAM3 to use external crystal oscillator for slow clock"
@ -75,7 +75,7 @@ config SOC_ATMEL_SAM3X_PLLA_DIVA
config SOC_ATMEL_SAM3X_WAIT_MODE
bool "Atmel SAM3 goes to Wait mode instead of Sleep mode"
depends on SOC_ATMEL_SAM3_EXT_MAINCK
depends on SOC_ATMEL_SAM3X_EXT_MAINCK
default y if DEBUG
help
For JTAG debugging CPU clock (HCLK) should not stop. In order

4
arch/arm/soc/atmel_sam/sam3x/soc.c
View file

@ -50,7 +50,7 @@ static ALWAYS_INLINE void clock_init(void)
/* Wait for oscillator to be stablized */
while (!(__SUPC->sr & SUPC_SR_OSCSEL))
;
#endif /* CONFIG_SOC_ATMEL_SAM3_EXT_SLCK */
#endif /* CONFIG_SOC_ATMEL_SAM3X_EXT_SLCK */
#ifdef CONFIG_SOC_ATMEL_SAM3X_EXT_MAINCK
/* Start the external main oscillator */
@ -88,7 +88,7 @@ static ALWAYS_INLINE void clock_init(void)
/* Wait for main fast RC oscillator to be stablized */
while (!(__PMC->sr & PMC_INT_MOSCRCS))
;
#endif /* CONFIG_SOC_ATMEL_SAM3_EXT_MAINCK */
#endif /* CONFIG_SOC_ATMEL_SAM3X_EXT_MAINCK */
/* Use PLLA as master clock.
* According to datasheet, PMC_MCKR must not be programmed in