Skip to content

Commit 0a8e406

Browse files
fallriskgalak
fallrisk
authored and
galak
committed
arch: sam3x: update Kconfig options after move to SAM SoC family tree
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 <[email protected]>
1 parent 93ae0b5 commit 0a8e406

File tree

18 files changed

+81
-91
lines changed

18 files changed

+81
-91
lines changed

‎arch/arm/soc/atmel_sam/Kconfig‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7-
config SOC_ATMEL_SAM3
8-
bool
9-
depends on ARM
10-
default n
11-
127
# Select SoC Part No. and configuration options
138
source "arch/arm/soc/atmel_sam/*/Kconfig.soc"

‎arch/arm/soc/atmel_sam/Kconfig.defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ config SOC_FAMILY
1616
default atmel_sam
1717

1818
config WATCHDOG
19-
def_bool y if !SOC_ATMEL_SAM3X8E
19+
def_bool y
2020

2121
endif #SOC_FAMILY_SAM
2222

‎arch/arm/soc/atmel_sam/sam3x/Kconfig.defconfig.series‎

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
# SPDX-License-Identifier: Apache-2.0
77
#
88

9-
if SOC_SERIES_SAM3X || SOC_ATMEL_SAM3X8E
9+
if SOC_SERIES_SAM3X
1010

1111
config SOC_SERIES
1212
string
1313
default sam3x
1414

1515
config SOC_PART_NUMBER
1616
string
17-
default sam3x8e if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
17+
default sam3x8e if SOC_PART_NUMBER_SAM3X8E
1818

1919
config NUM_IRQ_PRIO_BITS
2020
int
@@ -42,66 +42,19 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
4242
# to provide one continuous 96K block.
4343
#
4444
config SRAM_SIZE
45-
default 96 if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
45+
default 96 if SOC_PART_NUMBER_SAM3X8E
4646

4747
config SRAM_BASE_ADDRESS
48-
default 0x20000000 if !SOC_PART_NUMBER_SAM3X8E && !SOC_ATMEL_SAM3X8E
49-
default 0x20070000 if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
48+
default 0x20000000 if !SOC_PART_NUMBER_SAM3X8E
49+
default 0x20070000 if SOC_PART_NUMBER_SAM3X8E
5050

5151
#
5252
# Atmel SAM3X family has flash starting @ 0x00080000.
5353
#
5454
config FLASH_SIZE
55-
default 512 if SOC_PART_NUMBER_SAM3X8E || SOC_ATMEL_SAM3X8E
55+
default 512 if SOC_PART_NUMBER_SAM3X8E
5656

5757
config FLASH_BASE_ADDRESS
5858
default 0x00080000
5959

60-
if UART_ATMEL_SAM3
61-
62-
config UART_ATMEL_SAM3_BAUD_RATE
63-
default 115200
64-
65-
config UART_ATMEL_SAM3_CLK_FREQ
66-
default 84000000
67-
68-
endif # UART_ATMEL_SAM3
69-
70-
if GPIO
71-
72-
config GPIO_ATMEL_SAM3
73-
def_bool y
74-
75-
config GPIO_ATMEL_SAM3_PORTA
76-
default y
77-
78-
config GPIO_ATMEL_SAM3_PORTB
79-
default y
80-
81-
config GPIO_ATMEL_SAM3_PORTC
82-
default y
83-
84-
config GPIO_ATMEL_SAM3_PORTD
85-
default y
86-
87-
endif # GPIO
88-
89-
if I2C
90-
91-
config I2C_ATMEL_SAM3
92-
def_bool y
93-
94-
config I2C_0
95-
default y
96-
config I2C_0_IRQ_PRI
97-
default 0
98-
99-
config I2C_1
100-
default y
101-
102-
config I2C_1_IRQ_PRI
103-
default 0
104-
105-
endif # I2C
106-
10760
endif # SOC_SERIES_SAM3X

‎arch/arm/soc/atmel_sam/sam3x/Kconfig.series‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,3 @@ config SOC_SERIES_SAM3X
1616
help
1717
Enable support for Atmel SAM3X Cortex-M3 microcontrollers.
1818
Part No.: SAM3X8E
19-
20-
config SOC_ATMEL_SAM3X8E
21-
bool "Atmel SAM3X8E Processor"
22-
select SOC_PART_NUMBER_SAM3X8E
23-
select CPU_CORTEX_M
24-
select CPU_CORTEX_M3
25-
select SOC_FAMILY_SAM
26-
select SYS_POWER_LOW_POWER_STATE_SUPPORTED
27-
select CPU_HAS_SYSTICK
28-
select SOC_ATMEL_SAM3

‎arch/arm/soc/atmel_sam/sam3x/Kconfig.soc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ choice
1515
bool "SAM3X8E"
1616
endchoice
1717

18-
if SOC_SERIES_SAM3X || SOC_ATMEL_SAM3X8E
18+
if SOC_SERIES_SAM3X
1919

2020
config SOC_ATMEL_SAM3X_EXT_SLCK
2121
bool "Atmel SAM3 to use external crystal oscillator for slow clock"
@@ -75,7 +75,7 @@ config SOC_ATMEL_SAM3X_PLLA_DIVA
7575

7676
config SOC_ATMEL_SAM3X_WAIT_MODE
7777
bool "Atmel SAM3 goes to Wait mode instead of Sleep mode"
78-
depends on SOC_ATMEL_SAM3_EXT_MAINCK
78+
depends on SOC_ATMEL_SAM3X_EXT_MAINCK
7979
default y if DEBUG
8080
help
8181
For JTAG debugging CPU clock (HCLK) should not stop. In order

‎arch/arm/soc/atmel_sam/sam3x/soc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static ALWAYS_INLINE void clock_init(void)
5050
/* Wait for oscillator to be stablized */
5151
while (!(__SUPC->sr & SUPC_SR_OSCSEL))
5252
;
53-
#endif /* CONFIG_SOC_ATMEL_SAM3_EXT_SLCK */
53+
#endif /* CONFIG_SOC_ATMEL_SAM3X_EXT_SLCK */
5454

5555
#ifdef CONFIG_SOC_ATMEL_SAM3X_EXT_MAINCK
5656
/* Start the external main oscillator */
@@ -88,7 +88,7 @@ static ALWAYS_INLINE void clock_init(void)
8888
/* Wait for main fast RC oscillator to be stablized */
8989
while (!(__PMC->sr & PMC_INT_MOSCRCS))
9090
;
91-
#endif /* CONFIG_SOC_ATMEL_SAM3_EXT_MAINCK */
91+
#endif /* CONFIG_SOC_ATMEL_SAM3X_EXT_MAINCK */
9292

9393
/* Use PLLA as master clock.
9494
* According to datasheet, PMC_MCKR must not be programmed in

‎boards/arm/arduino_due/Kconfig.board‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
# Kconfig - Arduino Due Board configuration
2+
#
3+
# Copyright (c) 2017 Justin Watson
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
16

27
config BOARD_ARDUINO_DUE
38
bool "Arduino Due Board"
4-
depends on SOC_ATMEL_SAM3X8E
9+
depends on SOC_PART_NUMBER_SAM3X8E

‎boards/arm/arduino_due/Kconfig.defconfig‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,59 @@
1+
# Kconfig - Arduino Due Board configuration
2+
#
3+
# Copyright (c) 2017 Justin Watson
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
16

27
if BOARD_ARDUINO_DUE
38

49
config BOARD
510
default arduino_due
611

12+
if UART_ATMEL_SAM3
13+
14+
config UART_ATMEL_SAM3_BAUD_RATE
15+
default 115200
16+
17+
config UART_ATMEL_SAM3_CLK_FREQ
18+
default 84000000
19+
20+
endif # UART_ATMEL_SAM3
21+
22+
if GPIO
23+
24+
config GPIO_ATMEL_SAM3
25+
def_bool y
26+
27+
config GPIO_ATMEL_SAM3_PORTA
28+
default y
29+
30+
config GPIO_ATMEL_SAM3_PORTB
31+
default y
32+
33+
config GPIO_ATMEL_SAM3_PORTC
34+
default y
35+
36+
config GPIO_ATMEL_SAM3_PORTD
37+
default y
38+
39+
endif # GPIO
40+
741
if I2C
842

943
config I2C_ATMEL_SAM3
44+
def_bool y
45+
46+
config I2C_0
47+
default y
48+
config I2C_0_IRQ_PRI
49+
default 0
50+
51+
config I2C_1
1052
default y
1153

54+
config I2C_1_IRQ_PRI
55+
default 0
56+
1257
endif # I2C
1358

1459
endif # BOARD_ARDUINO_DUE

‎boards/arm/arduino_due/arduino_due_defconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
CONFIG_ARM=y
2-
CONFIG_SOC_ATMEL_SAM3X8E=y
2+
CONFIG_SOC_FAMILY_SAM=y
3+
CONFIG_SOC_SERIES_SAM3X=y
4+
CONFIG_SOC_PART_NUMBER_SAM3X8E=y
35
CONFIG_BOARD_ARDUINO_DUE=y
46
CONFIG_CORTEX_M_SYSTICK=y
57
CONFIG_CONSOLE=y
68
CONFIG_UART_CONSOLE=y
79
CONFIG_SERIAL=y
810
CONFIG_UART_ATMEL_SAM3=y
9-
CONFIG_SOC_ATMEL_SAM3_EXT_MAINCK=y
11+
CONFIG_SOC_ATMEL_SAM3X_EXT_MAINCK=y
1012
CONFIG_PINMUX=y
13+
CONFIG_WATCHDOG=n

‎drivers/gpio/Kconfig.atmel_sam3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
menuconfig GPIO_ATMEL_SAM3
1010
bool "Atmel SAM3 PIO Controllers"
11-
depends on GPIO && SOC_ATMEL_SAM3
11+
depends on GPIO && SOC_SERIES_SAM3X
1212
default n
1313
help
1414
Enable config options to support the PIO controllers

0 commit comments

Comments
 (0)