sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

boards: sama5: fix Mixed case identifier errors

Browse Source 
Fix the Mixed case identifier errors found on sama5 family

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
This commit is contained in:
Alin Jerpelea 2021-03-19 08:50:11 +01:00 committed by Xiang Xiao
parent 3ce3b1e1c5
commit 66d312985c
24 changed files with 158 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/arm/sama5/sama5d3-xplained/README.txt
View File

@ -3123,8 +3123,8 @@ Configurations
re-configured: re-configured:
Board Selection -> CPU Frequency Board Selection -> CPU Frequency
CONFIG_SAMA5D3xEK_396MHZ=n # Disable 396MHz operation CONFIG_SAMA5D3XEK_396MHZ=n # Disable 396MHz operation
CONFIG_SAMA5D3xEK_528MHZ=y # Enable 528MHz operation CONFIG_SAMA5D3XEK_528MHZ=y # Enable 528MHz operation
If you switch to 528MHz, you should also check the loop calibration If you switch to 528MHz, you should also check the loop calibration
value in your .config file. Of course, it would be best to re-calibrate value in your .config file. Of course, it would be best to re-calibrate

82
boards/arm/sama5/sama5d3x-ek/Kconfig
View File

@ -7,37 +7,37 @@ if ARCH_BOARD_SAMA5D3X_EK
choice choice
prompt "CPU Frequency" prompt "CPU Frequency"
default SAMA5D3xEK_396MHZ default SAMA5D3XEK_396MHZ
config SAMA5D3xEK_384MHZ config SAMA5D3XEK_384MHZ
bool "384 MHz" bool "384 MHz"
config SAMA5D3xEK_396MHZ config SAMA5D3XEK_396MHZ
bool "396 MHz" bool "396 MHz"
config SAMA5D3xEK_528MHZ config SAMA5D3XEK_528MHZ
bool "528 MHz" bool "528 MHz"
endchoice # CPU Frequency endchoice # CPU Frequency
choice choice
prompt "SAMA5D3x-EK DRAM Type" prompt "SAMA5D3x-EK DRAM Type"
default SAMA5D3xEK_MT47H128M16RT default SAMA5D3XEK_MT47H128M16RT
depends on SAMA5_DDRCS depends on SAMA5_DDRCS
config SAMA5D3xEK_MT47H128M16RT config SAMA5D3XEK_MT47H128M16RT
bool "MT47H128M16RT" bool "MT47H128M16RT"
---help--- ---help---
Micron 2Gbit x16 DDR2-1066 128Mb Micron 2Gbit x16 DDR2-1066 128Mb
config SAMA5D3xEK_MT47H64M16HR config SAMA5D3XEK_MT47H64M16HR
bool "MT47H64M16HR" bool "MT47H64M16HR"
---help--- ---help---
Micron 1Gbit x16 DDR2-800 64Mb Micron 1Gbit x16 DDR2-800 64Mb
endchoice # SAMA5D3x-EK DRAM Type endchoice # SAMA5D3x-EK DRAM Type
config SAMA5D3xEK_NOREDLED config SAMA5D3XEK_NOREDLED
bool "Red LED not available" bool "Red LED not available"
default n default n
---help--- ---help---
@ -48,7 +48,7 @@ config SAMA5D3xEK_NOREDLED
available to control the red LED, this configuration variable should available to control the red LED, this configuration variable should
be set so that the LED logic will only used the blue LED. be set so that the LED logic will only used the blue LED.
config SAMA5D3xEK_NOR_MAIN config SAMA5D3XEK_NOR_MAIN
bool "Build nor_main" bool "Build nor_main"
default n default n
depends on SAMA5_BOOT_ISRAM && BUILD_FLAT depends on SAMA5_BOOT_ISRAM && BUILD_FLAT
@ -57,15 +57,15 @@ config SAMA5D3xEK_NOR_MAIN
NOR flash then either (1) jump to the program in NOR flash or (2) NOR flash then either (1) jump to the program in NOR flash or (2)
wait for you to break in with GDB to debug the NOR program. wait for you to break in with GDB to debug the NOR program.
config SAMA5D3xEK_NOR_START config SAMA5D3XEK_NOR_START
bool "Start NOR program" bool "Start NOR program"
default n default n
depends on SAMA5D3xEK_NOR_MAIN depends on SAMA5D3XEK_NOR_MAIN
---help--- ---help---
The default behavior of the NOR boot program is to initialize the The default behavior of the NOR boot program is to initialize the
NOR FLASH at CS0, then patiently wait for you to break into the NOR FLASH at CS0, then patiently wait for you to break into the
program with GDB. An alternative behavior is enabled with this program with GDB. An alternative behavior is enabled with this
option: If SAMA5D3xEK_NOR_START is defined, then it will not wait but option: If SAMA5D3XEK_NOR_START is defined, then it will not wait but
will, instead, immediately start the program in NOR FLASH. will, instead, immediately start the program in NOR FLASH.
config SAMA5D3XEK_NAND_BLOCKMOUNT config SAMA5D3XEK_NAND_BLOCKMOUNT
@ -77,10 +77,10 @@ config SAMA5D3XEK_NAND_BLOCKMOUNT
choice choice
prompt "NAND FLASH configuration" prompt "NAND FLASH configuration"
default SAMA5D3xEK_NAND_NXFFS default SAMA5D3XEK_NAND_NXFFS
depends on SAMA5D3XEK_NAND_BLOCKMOUNT depends on SAMA5D3XEK_NAND_BLOCKMOUNT
config SAMA5D3xEK_NAND_FTL config SAMA5D3XEK_NAND_FTL
bool "Create NAND FLASH block driver" bool "Create NAND FLASH block driver"
depends on MTD && MTD_NAND depends on MTD && MTD_NAND
---help--- ---help---
@ -94,7 +94,7 @@ config SAMA5D3xEK_NAND_FTL
wear-leveling other than NXFFS and NXFFS does not use a block driver wear-leveling other than NXFFS and NXFFS does not use a block driver
but, rather, operates directly upon the NAND MTD device. but, rather, operates directly upon the NAND MTD device.
config SAMA5D3xEK_NAND_NXFFS config SAMA5D3XEK_NAND_NXFFS
bool "Create NAND FLASH NXFFS file system" bool "Create NAND FLASH NXFFS file system"
depends on MTD && MTD_NAND && FS_NXFFS && NXFFS_NAND depends on MTD && MTD_NAND && FS_NXFFS && NXFFS_NAND
---help--- ---help---
@ -107,7 +107,7 @@ config SAMA5D3xEK_NAND_NXFFS
endchoice # NAND FLASH configuration endchoice # NAND FLASH configuration
config SAMA5D3xEK_AT25_BLOCKMOUNT config SAMA5D3XEK_AT25_BLOCKMOUNT
bool "AT25 serial FLASH auto-mount" bool "AT25 serial FLASH auto-mount"
default n default n
depends on NSH_ARCHINIT && SAMA5_SPI0 && MTD_AT25 depends on NSH_ARCHINIT && SAMA5_SPI0 && MTD_AT25
@ -116,10 +116,10 @@ config SAMA5D3xEK_AT25_BLOCKMOUNT
choice choice
prompt "AT25 serial FLASH configuration" prompt "AT25 serial FLASH configuration"
default SAMA5D3xEK_AT25_FTL default SAMA5D3XEK_AT25_FTL
depends on SAMA5D3xEK_AT25_BLOCKMOUNT depends on SAMA5D3XEK_AT25_BLOCKMOUNT
config SAMA5D3xEK_AT25_FTL config SAMA5D3XEK_AT25_FTL
bool "Create AT25 Serial FLASH block driver" bool "Create AT25 Serial FLASH block driver"
---help--- ---help---
Create the MTD driver for the AT25 and "wrap" the AT25 as a standard Create the MTD driver for the AT25 and "wrap" the AT25 as a standard
@ -127,7 +127,7 @@ config SAMA5D3xEK_AT25_FTL
any other file system. Any file system may be used, but there will any other file system. Any file system may be used, but there will
be no wear-leveling. be no wear-leveling.
config SAMA5D3xEK_AT25_NXFFS config SAMA5D3XEK_AT25_NXFFS
bool "Create AT25 serial FLASH NXFFS file system" bool "Create AT25 serial FLASH NXFFS file system"
depends on FS_NXFFS depends on FS_NXFFS
---help--- ---help---
@ -137,7 +137,7 @@ config SAMA5D3xEK_AT25_NXFFS
endchoice # AT25 serial FLASH configuration endchoice # AT25 serial FLASH configuration
config SAMA5D3xEK_AT24_BLOCKMOUNT config SAMA5D3XEK_AT24_BLOCKMOUNT
bool "AT24 Serial EEPROM auto-mount" bool "AT24 Serial EEPROM auto-mount"
default n default n
depends on NSH_ARCHINIT && SAMA5_TWI0 && MTD_AT24XX depends on NSH_ARCHINIT && SAMA5_TWI0 && MTD_AT24XX
@ -157,10 +157,10 @@ config SAMA5D3xEK_AT24_BLOCKMOUNT
choice choice
prompt "AT24 serial EPPROM configuration" prompt "AT24 serial EPPROM configuration"
default SAMA5D3xEK_AT24_FTL default SAMA5D3XEK_AT24_FTL
depends on SAMA5D3xEK_AT24_BLOCKMOUNT depends on SAMA5D3XEK_AT24_BLOCKMOUNT
config SAMA5D3xEK_AT24_FTL config SAMA5D3XEK_AT24_FTL
bool "Create AT24 block driver" bool "Create AT24 block driver"
---help--- ---help---
Create the MTD driver for the AT24 and "wrap" the AT24 as a standard Create the MTD driver for the AT24 and "wrap" the AT24 as a standard
@ -168,7 +168,7 @@ config SAMA5D3xEK_AT24_FTL
any other file system. Any file system may be used, but there will any other file system. Any file system may be used, but there will
be no wear-leveling. be no wear-leveling.
config SAMA5D3xEK_AT24_NXFFS config SAMA5D3XEK_AT24_NXFFS
bool "Create AT24 NXFFS file system" bool "Create AT24 NXFFS file system"
depends on FS_NXFFS depends on FS_NXFFS
---help--- ---help---
@ -178,18 +178,18 @@ config SAMA5D3xEK_AT24_NXFFS
endchoice # AT24 serial EPPROM configuration endchoice # AT24 serial EPPROM configuration
config SAMA5D3xEK_USBHOST_STACKSIZE config SAMA5D3XEK_USBHOST_STACKSIZE
int "USB host waiter stack size" int "USB host waiter stack size"
default 1536 if USBHOST_HUB default 1536 if USBHOST_HUB
default 1024 if !USBHOST_HUB default 1024 if !USBHOST_HUB
depends on USBHOST depends on USBHOST
config SAMA5D3xEK_USBHOST_PRIO config SAMA5D3XEK_USBHOST_PRIO
int "USB host waiter task priority" int "USB host waiter task priority"
default 100 default 100
depends on USBHOST depends on USBHOST
config SAMA5D3xEK_TSD_DEVMINOR config SAMA5D3XEK_TSD_DEVMINOR
int "Touchscreen device minor" int "Touchscreen device minor"
default 0 default 0
depends on SAMA5_TSD depends on SAMA5_TSD
@ -197,7 +197,7 @@ config SAMA5D3xEK_TSD_DEVMINOR
This touchscreen will be register as /dev/inputN where the value of This touchscreen will be register as /dev/inputN where the value of
N is provided by this configuration setting. N is provided by this configuration setting.
config SAMA5D3xEK_CHANNEL config SAMA5D3XEK_CHANNEL
int "PWM channel number" int "PWM channel number"
default 0 if SAMA5_PWM_CHAN0 default 0 if SAMA5_PWM_CHAN0
default 1 if SAMA5_PWM_CHAN1 default 1 if SAMA5_PWM_CHAN1
@ -213,7 +213,7 @@ if AUDIO_I2SCHAR && (SAMA5_SSC0 || SAMA5_SSC1)
if SAMA5_SSC0 && SAMA5_SSC1 if SAMA5_SSC0 && SAMA5_SSC1
config SAMA5D3xEK_SSC_PORT config SAMA5D3XEK_SSC_PORT
int "SSC port number" int "SSC port number"
default 0 default 0
range 0 1 range 0 1
@ -224,7 +224,7 @@ endif # SAMA5_SSC0 && SAMA5_SSC1
if SAMA5_SSC0 && !SAMA5_SSC1 if SAMA5_SSC0 && !SAMA5_SSC1
config SAMA5D3xEK_SSC_PORT config SAMA5D3XEK_SSC_PORT
int int
default 0 default 0
@ -232,13 +232,13 @@ endif # SAMA5_SSC0 && !SAMA5_SSC1
if !SAMA5_SSC0 && SAMA5_SSC1 if !SAMA5_SSC0 && SAMA5_SSC1
config SAMA5D3xEK_SSC_PORT config SAMA5D3XEK_SSC_PORT
int int
default 1 default 1
endif # SAMA5_SSC0 && !SAMA5_SSC1 endif # SAMA5_SSC0 && !SAMA5_SSC1
config SAMA5D3xEK_I2SCHAR_MINOR config SAMA5D3XEK_I2SCHAR_MINOR
int "I2S character driver minor number" int "I2S character driver minor number"
default 0 default 0
---help--- ---help---
@ -250,23 +250,23 @@ endif # AUDIO_I2SCHAR && (SAMA5_SSC0 || SAMA5_SSC1)
if VIDEO_OV2640 if VIDEO_OV2640
config SAMA5D3xEK_OV2640_DEMO config SAMA5D3XEK_OV2640_DEMO
bool "SAMA5 OV2640 camera demo" bool "SAMA5 OV2640 camera demo"
default n default n
select SAMA5D3xEK_NOREDLED select SAMA5D3XEK_NOREDLED
---help--- ---help---
Enable the SAMA5 OV2640 camera demo Enable the SAMA5 OV2640 camera demo
endif # VIDEO_OV2640 endif # VIDEO_OV2640
config SAMA5D3xEK_SLOWCLOCK config SAMA5D3XEK_SLOWCLOCK
bool bool
default y if SCHED_TICKLESS default y if SCHED_TICKLESS
default n if !SCHED_TICKLESS default n if !SCHED_TICKLESS
if AUDIO_WM8904 if AUDIO_WM8904
config SAMA5D3xEK_WM8904_I2CFREQUENCY config SAMA5D3XEK_WM8904_I2CFREQUENCY
int "WM8904 I2C Frequency" int "WM8904 I2C Frequency"
default 400000 default 400000
range 1 400000 range 1 400000
@ -278,13 +278,13 @@ config SAMA5D3xEK_WM8904_I2CFREQUENCY
choice choice
prompt "WM8904 MCLK source" prompt "WM8904 MCLK source"
default SAMA5D3xEK_WM8904_SRCMAIN default SAMA5D3XEK_WM8904_SRCMAIN
config SAMA5D3xEK_WM8904_SRCMAIN config SAMA5D3XEK_WM8904_SRCMAIN
bool "Main Clock (12MHz)" bool "Main Clock (12MHz)"
select SAMA5D3xEK_SLOWCLOCK select SAMA5D3XEK_SLOWCLOCK
config SAMA5D3xEK_WM8904_SRCSCK config SAMA5D3XEK_WM8904_SRCSCK
bool "Slow XTAL (32.768KHz)" bool "Slow XTAL (32.768KHz)"
endchoice # WM8904 MCLK source endchoice # WM8904 MCLK source

38
boards/arm/sama5/sama5d3x-ek/README.txt
View File

@ -388,7 +388,7 @@ Creating and Using NORBOOT
The norboot program can also be configured to jump directly into The norboot program can also be configured to jump directly into
NOR FLASH without requiring the final halt and go by setting NOR FLASH without requiring the final halt and go by setting
CONFIG_SAMA5D3xEK_NOR_START=y in the NuttX configuration. However, CONFIG_SAMA5D3XEK_NOR_START=y in the NuttX configuration. However,
since I have been debugging the early boot sequence, the above since I have been debugging the early boot sequence, the above
sequence has been most convenient for me since it allows me to sequence has been most convenient for me since it allows me to
step into the program in NOR. step into the program in NOR.
@ -817,7 +817,7 @@ Buttons and LEDs
LED_PANIC The system has crashed OFF Blinking LED_PANIC The system has crashed OFF Blinking
LED_IDLE MCU is is sleep mode -- Not used -- LED_IDLE MCU is is sleep mode -- Not used --
If CONFIG_SAMA5D3xEK_NOREDLED=y, then the red LED is not used by the If CONFIG_SAMA5D3XEK_NOREDLED=y, then the red LED is not used by the
system and the controls are as follows: system and the controls are as follows:
SYMBOL Meaning LED state SYMBOL Meaning LED state
@ -1182,8 +1182,8 @@ AT25 Serial FLASH
CONFIG_NSH_ARCHINIT=y : NSH board-initialization CONFIG_NSH_ARCHINIT=y : NSH board-initialization
Board Selection Board Selection
CONFIG_SAMA5D3xEK_AT25_BLOCKMOUNT=y : Mounts AT25 for NSH CONFIG_SAMA5D3XEK_AT25_BLOCKMOUNT=y : Mounts AT25 for NSH
CONFIG_SAMA5D3xEK_AT25_FTL=y : Create block driver for FAT CONFIG_SAMA5D3XEK_AT25_FTL=y : Create block driver for FAT
NOTE that you must close JP1 on the Embest/Ronetix board in order to NOTE that you must close JP1 on the Embest/Ronetix board in order to
enable the AT25 FLASH chip select. enable the AT25 FLASH chip select.
@ -1755,7 +1755,7 @@ SDRAM Support
CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2 CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2
Board Selection Board Selection
CONFIG_SAMA5D3xEK_MT47H128M16RT=y : This is the type of DDR2 CONFIG_SAMA5D3XEK_MT47H128M16RT=y : This is the type of DDR2
System Type->Heap Configuration System Type->Heap Configuration
CONFIG_SAMA5_DDRCS_HEAP=y : Add the SDRAM to the heap CONFIG_SAMA5_DDRCS_HEAP=y : Add the SDRAM to the heap
@ -1825,7 +1825,7 @@ SDRAM Support
CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2 CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2
Board Selection Board Selection
CONFIG_SAMA5D3xEK_MT47H128M16RT=y : This is the type of DDR2 CONFIG_SAMA5D3XEK_MT47H128M16RT=y : This is the type of DDR2
System Type->Heap Configuration System Type->Heap Configuration
CONFIG_SAMA5_ISRAM_HEAP=n : These do not apply in this case CONFIG_SAMA5_ISRAM_HEAP=n : These do not apply in this case
@ -1968,7 +1968,7 @@ NAND Support
Board Selection Board Selection
CONFIG_SAMA5D3XEK_NAND_BLOCKMOUNT=y : Enable FS support on NAND CONFIG_SAMA5D3XEK_NAND_BLOCKMOUNT=y : Enable FS support on NAND
CONFIG_SAMA5D3xEK_NAND_NXFFS=y : Use the NXFFS file system CONFIG_SAMA5D3XEK_NAND_NXFFS=y : Use the NXFFS file system
Other file systems are not recommended because only NXFFS can handle Other file systems are not recommended because only NXFFS can handle
bad blocks and only NXFFS performs wear-levelling. bad blocks and only NXFFS performs wear-levelling.
@ -1992,7 +1992,7 @@ NAND Support
Board Selection Board Selection
CONFIG_SAMA5D3XEK_NAND_BLOCKMOUNT=y : Enable FS support on NAND CONFIG_SAMA5D3XEK_NAND_BLOCKMOUNT=y : Enable FS support on NAND
CONFIG_SAMA5D3xEK_NAND_FTL=y : Use an flash translation layer CONFIG_SAMA5D3XEK_NAND_FTL=y : Use an flash translation layer
NOTE: FTL will require some significant buffering because of NOTE: FTL will require some significant buffering because of
the large size of the NAND flash blocks. You will also need the large size of the NAND flash blocks. You will also need
@ -2010,7 +2010,7 @@ NAND Support
--------------------- ---------------------
With the options CONFIG_SAMA5D3XEK_NAND_BLOCKMOUNT=y and With the options CONFIG_SAMA5D3XEK_NAND_BLOCKMOUNT=y and
CONFIG_SAMA5D3xEK_NAND_NXFFS=y, the NAND FLASH will be mounted in the NSH CONFIG_SAMA5D3XEK_NAND_NXFFS=y, the NAND FLASH will be mounted in the NSH
start-up logic before the NSH prompt appears. There is no feedback as start-up logic before the NSH prompt appears. There is no feedback as
to whether or not the mount was successful. You can, however, see the to whether or not the mount was successful. You can, however, see the
mounted file systems using the nsh 'mount' command: mounted file systems using the nsh 'mount' command:
@ -2235,8 +2235,8 @@ AT24 Serial EEPROM
: Other defaults are probably OK : Other defaults are probably OK
Board Selection Board Selection
CONFIG_SAMA5D3xEK_AT24_BLOCKMOUNT=y : Mounts AT24 for NSH CONFIG_SAMA5D3XEK_AT24_BLOCKMOUNT=y : Mounts AT24 for NSH
CONFIG_SAMA5D3xEK_AT24_NXFFS=y : Mount the AT24 using NXFFS CONFIG_SAMA5D3XEK_AT24_NXFFS=y : Mount the AT24 using NXFFS
You can then format the AT24 EEPROM for a FAT file system and mount the You can then format the AT24 EEPROM for a FAT file system and mount the
file system at /mnt/at24 using these NSH commands: file system at /mnt/at24 using these NSH commands:
@ -2725,7 +2725,7 @@ Touchscreen Testing
CONFIG_INPUT=y : (automatically selected) CONFIG_INPUT=y : (automatically selected)
Board Selection: Board Selection:
CONFIG_SAMA5D3xEK_TSD_DEVMINOR=0 : Register as /dev/input0 CONFIG_SAMA5D3XEK_TSD_DEVMINOR=0 : Register as /dev/input0
Library Support: Library Support:
CONFIG_SCHED_WORKQUEUE=y : Work queue support required CONFIG_SCHED_WORKQUEUE=y : Work queue support required
@ -2966,8 +2966,8 @@ I2S Audio Support
CONFIG_AUDIO_WM8904=y : Build WM8904 driver character driver CONFIG_AUDIO_WM8904=y : Build WM8904 driver character driver
Board Selection Board Selection
CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY=400000 CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY=400000
CONFIG_SAMA5D3xEK_WM8904_SRCMAIN=y : WM8904 MCLK is the SAMA5D Main Clock CONFIG_SAMA5D3XEK_WM8904_SRCMAIN=y : WM8904 MCLK is the SAMA5D Main Clock
Library Routines Library Routines
CONFIG_SCHED_WORKQUEUE=y : MW8904 driver needs work queue support CONFIG_SCHED_WORKQUEUE=y : MW8904 driver needs work queue support
@ -3063,8 +3063,8 @@ I2S Audio Support
CONFIG_EXAMPLES_I2SCHAR_DEVINIT=y CONFIG_EXAMPLES_I2SCHAR_DEVINIT=y
Board Selection Board Selection
CONFIG_SAMA5D3xEK_I2SCHAR_MINOR=0 CONFIG_SAMA5D3XEK_I2SCHAR_MINOR=0
CONFIG_SAMA5D3xEK_SSC_PORT=0 : 0 or SSC0, 1 for SSC1 CONFIG_SAMA5D3XEK_SSC_PORT=0 : 0 or SSC0, 1 for SSC1
Library Routines Library Routines
CONFIG_SCHED_WORKQUEUE=y : Driver needs work queue support CONFIG_SCHED_WORKQUEUE=y : Driver needs work queue support
@ -3304,8 +3304,8 @@ Configurations
re-configured: re-configured:
Board Selection -> CPU Frequency Board Selection -> CPU Frequency
CONFIG_SAMA5D3xEK_396MHZ=n # Disable 396MHz operation CONFIG_SAMA5D3XEK_396MHZ=n # Disable 396MHz operation
CONFIG_SAMA5D3xEK_528MHZ=y # Enable 528MHz operation CONFIG_SAMA5D3XEK_528MHZ=y # Enable 528MHz operation
If you switch to 528MHz, you should also check the loop calibration If you switch to 528MHz, you should also check the loop calibration
value in your .config file. Of course, it would be best to re-calibrate value in your .config file. Of course, it would be best to re-calibrate
@ -3504,7 +3504,7 @@ Configurations
2. The default norboot program initializes the NOR memory, 2. The default norboot program initializes the NOR memory,
displays a message and halts. The norboot program can also be displays a message and halts. The norboot program can also be
configured to jump directly into NOR FLASH without requiring the configured to jump directly into NOR FLASH without requiring the
final halt and go by setting CONFIG_SAMA5D3xEK_NOR_START=y in the final halt and go by setting CONFIG_SAMA5D3XEK_NOR_START=y in the
NuttX configuration. NuttX configuration.
3. Be aware that the default norboot also disables the watchdog. 3. Be aware that the default norboot also disables the watchdog.

2
boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
View File

@ -49,7 +49,7 @@ CONFIG_RAM_START=0x00304000
CONFIG_RAM_VSTART=0x00304000 CONFIG_RAM_VSTART=0x00304000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SAMA5D3xEK_AT25_BLOCKMOUNT=y CONFIG_SAMA5D3XEK_AT25_BLOCKMOUNT=y
CONFIG_SAMA5_BOOT_CS0FLASH=y CONFIG_SAMA5_BOOT_CS0FLASH=y
CONFIG_SAMA5_DDRCS=y CONFIG_SAMA5_DDRCS=y
CONFIG_SAMA5_DDRCS_HEAP_SIZE=268435456 CONFIG_SAMA5_DDRCS_HEAP_SIZE=268435456

2
boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
View File

@ -29,7 +29,7 @@ CONFIG_RAM_START=0x00300000
CONFIG_RAM_VSTART=0x00300000 CONFIG_RAM_VSTART=0x00300000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SAMA5D3xEK_NOR_MAIN=y CONFIG_SAMA5D3XEK_NOR_MAIN=y
CONFIG_SAMA5_EBICS0=y CONFIG_SAMA5_EBICS0=y
CONFIG_SAMA5_EBICS0_SIZE=134217728 CONFIG_SAMA5_EBICS0_SIZE=134217728
CONFIG_SAMA5_HSMC=y CONFIG_SAMA5_HSMC=y

2
boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
View File

@ -56,7 +56,7 @@ CONFIG_RAM_START=0x00304000
CONFIG_RAM_VSTART=0x00304000 CONFIG_RAM_VSTART=0x00304000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SAMA5D3xEK_528MHZ=y CONFIG_SAMA5D3XEK_528MHZ=y
CONFIG_SAMA5_BOOT_CS0FLASH=y CONFIG_SAMA5_BOOT_CS0FLASH=y
CONFIG_SAMA5_DDRCS=y CONFIG_SAMA5_DDRCS=y
CONFIG_SAMA5_DDRCS_HEAP_SIZE=268435456 CONFIG_SAMA5_DDRCS_HEAP_SIZE=268435456

2
boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
View File

@ -33,7 +33,7 @@ CONFIG_RAM_START=0x00304000
CONFIG_RAM_VSTART=0x00304000 CONFIG_RAM_VSTART=0x00304000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SAMA5D3xEK_OV2640_DEMO=y CONFIG_SAMA5D3XEK_OV2640_DEMO=y
CONFIG_SAMA5_BOOT_CS0FLASH=y CONFIG_SAMA5_BOOT_CS0FLASH=y
CONFIG_SAMA5_DDRCS=y CONFIG_SAMA5_DDRCS=y
CONFIG_SAMA5_DDRCS_HEAP_SIZE=268435456 CONFIG_SAMA5_DDRCS_HEAP_SIZE=268435456

12
boards/arm/sama5/sama5d3x-ek/include/board.h
View File

@ -53,7 +53,7 @@
# include <arch/board/board_sdram.h> # include <arch/board/board_sdram.h>
#elif defined(CONFIG_SAMA5D3xEK_384MHZ) #elif defined(CONFIG_SAMA5D3XEK_384MHZ)
/* OHCI Only. /* OHCI Only.
* This is an alternative slower configuration that will produce a 48MHz * This is an alternative slower configuration that will produce a 48MHz
* USB clock with the required accuracy using only PLLA. * USB clock with the required accuracy using only PLLA.
@ -66,7 +66,7 @@
# include <arch/board/board_384mhz.h> # include <arch/board/board_384mhz.h>
#elif defined(CONFIG_SAMA5D3xEK_528MHZ) #elif defined(CONFIG_SAMA5D3XEK_528MHZ)
/* This is the configuration results in a CPU clock of 528MHz. /* This is the configuration results in a CPU clock of 528MHz.
* *
* In this configuration, UPLL is the source of the UHPHS clock (if enabled). * In this configuration, UPLL is the source of the UHPHS clock (if enabled).
@ -74,7 +74,7 @@
# include <arch/board/board_528mhz.h> # include <arch/board/board_528mhz.h>
#else /* #elif defined(CONFIG_SAMA5D3xEK_396MHZ) */ #else /* #elif defined(CONFIG_SAMA5D3XEK_396MHZ) */
/* This is the configuration provided in the Atmel example code. /* This is the configuration provided in the Atmel example code.
* This setup results in a CPU clock of 396MHz. * This setup results in a CPU clock of 396MHz.
* *
@ -129,7 +129,7 @@
/* LED index values for use with board_userled() */ /* LED index values for use with board_userled() */
#define BOARD_BLUE 0 #define BOARD_BLUE 0
#ifdef CONFIG_SAMA5D3xEK_NOREDLED #ifdef CONFIG_SAMA5D3XEK_NOREDLED
# define BOARD_NLEDS 1 # define BOARD_NLEDS 1
#else #else
# define BOARD_RED 1 # define BOARD_RED 1
@ -139,7 +139,7 @@
/* LED bits for use with board_userled_all() */ /* LED bits for use with board_userled_all() */
#define BOARD_BLUE_BIT (1 << BOARD_BLUE) #define BOARD_BLUE_BIT (1 << BOARD_BLUE)
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
# define BOARD_RED_BIT (1 << BOARD_RED) # define BOARD_RED_BIT (1 << BOARD_RED)
#endif #endif
@ -163,7 +163,7 @@
#define LED_PANIC 3 /* The system has crashed OFF Blinking */ #define LED_PANIC 3 /* The system has crashed OFF Blinking */
#undef LED_IDLE /* MCU is is sleep mode Not used */ #undef LED_IDLE /* MCU is is sleep mode Not used */
/* If CONFIG_SAMA5D3xEK_NOREDLED=y, then the red LED is not used by the /* If CONFIG_SAMA5D3XEK_NOREDLED=y, then the red LED is not used by the
* system. The only difference from the above is that it is the blue, not * system. The only difference from the above is that it is the blue, not
* the red LED that blinks in the event of an PANIC. * the red LED that blinks in the event of an PANIC.
* *

2
boards/arm/sama5/sama5d3x-ek/src/Makefile
View File

@ -42,7 +42,7 @@ ifeq ($(CONFIG_SAMA5_EBICS3_NAND),y)
CSRCS += sam_nandflash.c CSRCS += sam_nandflash.c
endif endif
ifeq ($(CONFIG_SAMA5D3xEK_NOR_MAIN),y) ifeq ($(CONFIG_SAMA5D3XEK_NOR_MAIN),y)
CSRCS += nor_main.c CSRCS += nor_main.c
endif endif

2
boards/arm/sama5/sama5d3x-ek/src/nor_main.c
View File

@ -50,7 +50,7 @@
#define NOR_WAIT 1 #define NOR_WAIT 1
#define NOR_NO_WAIT 0 #define NOR_NO_WAIT 0
#ifdef CONFIG_SAMA5D3xEK_NOR_START #ifdef CONFIG_SAMA5D3XEK_NOR_START
# define NOR_BOOT_MODE NOR_NO_WAIT # define NOR_BOOT_MODE NOR_NO_WAIT
#else #else
# define NOR_BOOT_MODE NOR_WAIT # define NOR_BOOT_MODE NOR_WAIT

4
boards/arm/sama5/sama5d3x-ek/src/sam_at24.c
View File

@ -105,7 +105,7 @@ int sam_at24_automount(int minor)
return -ENODEV; return -ENODEV;
} }
#if defined(CONFIG_SAMA5D3xEK_AT24_FTL) #if defined(CONFIG_SAMA5D3XEK_AT24_FTL)
/* And use the FTL layer to wrap the MTD driver as a block driver */ /* And use the FTL layer to wrap the MTD driver as a block driver */
finfo("Initialize the FTL layer to create /dev/mtdblock%d\n", finfo("Initialize the FTL layer to create /dev/mtdblock%d\n",
@ -117,7 +117,7 @@ int sam_at24_automount(int minor)
return ret; return ret;
} }
#elif defined(CONFIG_SAMA5D3xEK_AT24_NXFFS) #elif defined(CONFIG_SAMA5D3XEK_AT24_NXFFS)
/* Initialize to provide NXFFS on the MTD interface */ /* Initialize to provide NXFFS on the MTD interface */
finfo("Initialize the NXFFS file system\n"); finfo("Initialize the NXFFS file system\n");

4
boards/arm/sama5/sama5d3x-ek/src/sam_at25.c
View File

@ -85,7 +85,7 @@ int sam_at25_automount(int minor)
return -ENODEV; return -ENODEV;
} }
#if defined(CONFIG_SAMA5D3xEK_AT25_FTL) #if defined(CONFIG_SAMA5D3XEK_AT25_FTL)
/* And finally, use the FTL layer to wrap the MTD driver as a block /* And finally, use the FTL layer to wrap the MTD driver as a block
* driver * driver
*/ */
@ -97,7 +97,7 @@ int sam_at25_automount(int minor)
return ret; return ret;
} }
#elif defined(CONFIG_SAMA5D3xEK_AT25_NXFFS) #elif defined(CONFIG_SAMA5D3XEK_AT25_NXFFS)
/* Initialize to provide NXFFS on the MTD interface */ /* Initialize to provide NXFFS on the MTD interface */
ret = nxffs_initialize(mtd); ret = nxffs_initialize(mtd);

10
boards/arm/sama5/sama5d3x-ek/src/sam_autoleds.c
View File

@ -86,7 +86,7 @@ void board_autoled_initialize(void)
/* Configure LED PIOs for output */ /* Configure LED PIOs for output */
sam_configpio(PIO_BLUE); sam_configpio(PIO_BLUE);
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
sam_configpio(PIO_RED); sam_configpio(PIO_RED);
#endif #endif
} }
@ -98,7 +98,7 @@ void board_autoled_initialize(void)
void board_autoled_on(int led) void board_autoled_on(int led)
{ {
bool blueoff = true; /* Low illuminates */ bool blueoff = true; /* Low illuminates */
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
bool redon = false; /* High illuminates */ bool redon = false; /* High illuminates */
#endif #endif
@ -116,7 +116,7 @@ void board_autoled_on(int led)
return; return;
case 3: /* LED_PANIC */ case 3: /* LED_PANIC */
#ifdef CONFIG_SAMA5D3xEK_NOREDLED #ifdef CONFIG_SAMA5D3XEK_NOREDLED
blueoff = false; blueoff = false;
#else #else
redon = true; redon = true;
@ -125,7 +125,7 @@ void board_autoled_on(int led)
} }
sam_piowrite(PIO_BLUE, blueoff); sam_piowrite(PIO_BLUE, blueoff);
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
sam_piowrite(PIO_RED, redon); sam_piowrite(PIO_RED, redon);
#endif #endif
} }
@ -139,7 +139,7 @@ void board_autoled_off(int led)
if (led != 2) if (led != 2)
{ {
sam_piowrite(PIO_BLUE, true); /* Low illuminates */ sam_piowrite(PIO_BLUE, true); /* Low illuminates */
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
sam_piowrite(PIO_RED, false); /* High illuminates */ sam_piowrite(PIO_RED, false); /* High illuminates */
#endif #endif
} }

2
boards/arm/sama5/sama5d3x-ek/src/sam_boot.c
View File

@ -56,7 +56,7 @@
void sam_boardinitialize(void) void sam_boardinitialize(void)
{ {
#ifdef CONFIG_SAMA5D3xEK_SLOWCLOCK #ifdef CONFIG_SAMA5D3XEK_SLOWCLOCK
/* Enable the external slow clock */ /* Enable the external slow clock */
sam_sckc_enable(true); sam_sckc_enable(true);

16
boards/arm/sama5/sama5d3x-ek/src/sam_i2schar.c
View File

@ -40,16 +40,16 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SAMA5D3xEK_SSC_PORT #ifndef CONFIG_SAMA5D3XEK_SSC_PORT
# if defined(CONFIG_SAMA5_SSC0) # if defined(CONFIG_SAMA5_SSC0)
# define CONFIG_SAMA5D3xEK_SSC_PORT 0 # define CONFIG_SAMA5D3XEK_SSC_PORT 0
# elif defined(CONFIG_SAMA5_SSC1) # elif defined(CONFIG_SAMA5_SSC1)
# define CONFIG_SAMA5D3xEK_SSC_PORT 1 # define CONFIG_SAMA5D3XEK_SSC_PORT 1
# endif # endif
#endif #endif
#ifndef CONFIG_SAMA5D3xEK_I2SCHAR_MINOR #ifndef CONFIG_SAMA5D3XEK_I2SCHAR_MINOR
# define CONFIG_SAMA5D3xEK_I2SCHAR_MINOR 0 # define CONFIG_SAMA5D3XEK_I2SCHAR_MINOR 0
#endif #endif
/**************************************************************************** /****************************************************************************
@ -83,17 +83,17 @@ int i2schar_devinit(void)
* SSC/I2S interface * SSC/I2S interface
*/ */
i2s = sam_ssc_initialize(CONFIG_SAMA5D3xEK_SSC_PORT); i2s = sam_ssc_initialize(CONFIG_SAMA5D3XEK_SSC_PORT);
if (!i2s) if (!i2s)
{ {
_err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n", _err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
CONFIG_SAMA5D3xEK_SSC_PORT); CONFIG_SAMA5D3XEK_SSC_PORT);
return -ENODEV; return -ENODEV;
} }
/* Register the I2S character driver at "/dev/i2schar0" */ /* Register the I2S character driver at "/dev/i2schar0" */
ret = i2schar_register(i2s, CONFIG_SAMA5D3xEK_I2SCHAR_MINOR); ret = i2schar_register(i2s, CONFIG_SAMA5D3XEK_I2SCHAR_MINOR);
if (ret < 0) if (ret < 0)
{ {
aerr("ERROR: i2schar_register failed: %d\n", ret); aerr("ERROR: i2schar_register failed: %d\n", ret);

4
boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c
View File

@ -192,7 +192,7 @@ int sam_nand_automount(int minor)
return -ENODEV; return -ENODEV;
} }
#if defined(CONFIG_SAMA5D3xEK_NAND_FTL) #if defined(CONFIG_SAMA5D3XEK_NAND_FTL)
/* Use the FTL layer to wrap the MTD driver as a block driver */ /* Use the FTL layer to wrap the MTD driver as a block driver */
ret = ftl_initialize(NAND_MINOR, mtd); ret = ftl_initialize(NAND_MINOR, mtd);
@ -202,7 +202,7 @@ int sam_nand_automount(int minor)
return ret; return ret;
} }
#elif defined(CONFIG_SAMA5D3xEK_NAND_NXFFS) #elif defined(CONFIG_SAMA5D3XEK_NAND_NXFFS)
/* Initialize to provide NXFFS on the MTD interface */ /* Initialize to provide NXFFS on the MTD interface */
ret = nxffs_initialize(mtd); ret = nxffs_initialize(mtd);

12
boards/arm/sama5/sama5d3x-ek/src/sam_pwm.c
View File

@ -78,19 +78,19 @@
* -----+---+---+----+-------------------- * -----+---+---+----+--------------------
*/ */
#ifndef CONFIG_SAMA5D3xEK_CHANNEL #ifndef CONFIG_SAMA5D3XEK_CHANNEL
# if defined(CONFIG_SAMA5_PWM_CHAN0) # if defined(CONFIG_SAMA5_PWM_CHAN0)
# warning Assuming PWM channel 0 # warning Assuming PWM channel 0
# define CONFIG_SAMA5D3xEK_CHANNEL 0 # define CONFIG_SAMA5D3XEK_CHANNEL 0
# elif defined(CONFIG_SAMA5_PWM_CHAN1) # elif defined(CONFIG_SAMA5_PWM_CHAN1)
# warning Assuming PWM channel 1 # warning Assuming PWM channel 1
# define CONFIG_SAMA5D3xEK_CHANNEL 1 # define CONFIG_SAMA5D3XEK_CHANNEL 1
# elif defined(CONFIG_SAMA5_PWM_CHAN2) # elif defined(CONFIG_SAMA5_PWM_CHAN2)
# warning Assuming PWM channel 2 # warning Assuming PWM channel 2
# define CONFIG_SAMA5D3xEK_CHANNEL 2 # define CONFIG_SAMA5D3XEK_CHANNEL 2
# elif defined(CONFIG_SAMA5_PWM_CHAN3) # elif defined(CONFIG_SAMA5_PWM_CHAN3)
# warning Assuming PWM channel 3 # warning Assuming PWM channel 3
# define CONFIG_SAMA5D3xEK_CHANNEL 3 # define CONFIG_SAMA5D3XEK_CHANNEL 3
# endif # endif
#endif #endif
@ -120,7 +120,7 @@ int sam_pwm_setup(void)
{ {
/* Call sam_pwminitialize() to get an instance of the PWM interface */ /* Call sam_pwminitialize() to get an instance of the PWM interface */
pwm = sam_pwminitialize(CONFIG_SAMA5D3xEK_CHANNEL); pwm = sam_pwminitialize(CONFIG_SAMA5D3XEK_CHANNEL);
if (!pwm) if (!pwm)
{ {
_err("ERROR: Failed to get the SAMA5 PWM lower half\n"); _err("ERROR: Failed to get the SAMA5 PWM lower half\n");

14
boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c
View File

@ -72,14 +72,14 @@
/* SDRAM differences */ /* SDRAM differences */
#if defined(CONFIG_SAMA5D3xEK_MT47H128M16RT) #if defined(CONFIG_SAMA5D3XEK_MT47H128M16RT)
/* Used for SDRAM command handshaking */ /* Used for SDRAM command handshaking */
# define DDR2_BA0 (1 << 26) # define DDR2_BA0 (1 << 26)
# define DDR2_BA1 (1 << 27) # define DDR2_BA1 (1 << 27)
#elif defined(CONFIG_SAMA5D3xEK_MT47H64M16HR) #elif defined(CONFIG_SAMA5D3XEK_MT47H64M16HR)
/* Used for SDRAM command handshaking */ /* Used for SDRAM command handshaking */
@ -111,13 +111,13 @@
#define LOOP_GUARD 100 #define LOOP_GUARD 100
# define CYCLES_TO_COUNT(cycles) (((cycles) / 6) + LOOP_GUARD) # define CYCLES_TO_COUNT(cycles) (((cycles) / 6) + LOOP_GUARD)
#if defined(CONFIG_SAMA5D3xEK_384MHZ) #if defined(CONFIG_SAMA5D3XEK_384MHZ)
# define NSEC_TO_COUNT(nsec) ((((nsec) * 1000) / 15625) + LOOP_GUARD) # define NSEC_TO_COUNT(nsec) ((((nsec) * 1000) / 15625) + LOOP_GUARD)
# define USEC_TO_COUNT(usec) ((((usec) * 1000000) / 15625) + LOOP_GUARD) # define USEC_TO_COUNT(usec) ((((usec) * 1000000) / 15625) + LOOP_GUARD)
#elif defined(CONFIG_SAMA5D3xEK_528MHZ) #elif defined(CONFIG_SAMA5D3XEK_528MHZ)
# define NSEC_TO_COUNT(nsec) ((((nsec) * 1000) / 11364) + LOOP_GUARD) # define NSEC_TO_COUNT(nsec) ((((nsec) * 1000) / 11364) + LOOP_GUARD)
# define USEC_TO_COUNT(usec) ((((usec) * 1000000) / 11364) + LOOP_GUARD) # define USEC_TO_COUNT(usec) ((((usec) * 1000000) / 11364) + LOOP_GUARD)
#else /* #elif defined(CONFIG_SAMA5D3xEK_396MHZ) */ #else /* #elif defined(CONFIG_SAMA5D3XEK_396MHZ) */
# define NSEC_TO_COUNT(nsec) ((((nsec) * 1000) / 15152) + LOOP_GUARD) # define NSEC_TO_COUNT(nsec) ((((nsec) * 1000) / 15152) + LOOP_GUARD)
# define USEC_TO_COUNT(usec) ((((usec) * 1000000) / 15152) + LOOP_GUARD) # define USEC_TO_COUNT(usec) ((((usec) * 1000000) / 15152) + LOOP_GUARD)
#endif #endif
@ -252,7 +252,7 @@ void sam_sdram_config(void)
* Register * Register
*/ */
#if defined(CONFIG_SAMA5D3xEK_MT47H128M16RT) #if defined(CONFIG_SAMA5D3XEK_MT47H128M16RT)
/* For MT47H128M16RT /* For MT47H128M16RT
* *
@ -280,7 +280,7 @@ void sam_sdram_config(void)
MPDDRC_CR_NDQS | /* Not DQS */ MPDDRC_CR_NDQS | /* Not DQS */
MPDDRC_CR_UNAL; /* upport Unaligned Access */ MPDDRC_CR_UNAL; /* upport Unaligned Access */
#elif defined(CONFIG_SAMA5D3xEK_MT47H64M16HR) #elif defined(CONFIG_SAMA5D3XEK_MT47H64M16HR)
/* For MT47H64M16HR /* For MT47H64M16HR
* *
* NC = 10 DDR column bits * NC = 10 DDR column bits

8
boards/arm/sama5/sama5d3x-ek/src/sam_touchscreen.c
View File

@ -46,8 +46,8 @@
# error "Touchscreen support requires CONFIG_INPUT" # error "Touchscreen support requires CONFIG_INPUT"
#endif #endif
#ifndef CONFIG_SAMA5D3xEK_TSD_DEVMINOR #ifndef CONFIG_SAMA5D3XEK_TSD_DEVMINOR
# define CONFIG_SAMA5D3xEK_TSD_DEVMINOR 0 # define CONFIG_SAMA5D3XEK_TSD_DEVMINOR 0
#endif #endif
/**************************************************************************** /****************************************************************************
@ -90,11 +90,11 @@ int sam_tsc_setup(int minor)
/* Initialize and register the SPI touchscreen device */ /* Initialize and register the SPI touchscreen device */
ret = sam_tsd_register(adc, CONFIG_SAMA5D3xEK_TSD_DEVMINOR); ret = sam_tsd_register(adc, CONFIG_SAMA5D3XEK_TSD_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
ierr("ERROR: Failed to register touchscreen device /dev/input%d: %d\n", ierr("ERROR: Failed to register touchscreen device /dev/input%d: %d\n",
CONFIG_SAMA5D3xEK_TSD_DEVMINOR, ret); CONFIG_SAMA5D3XEK_TSD_DEVMINOR, ret);
return -ENODEV; return -ENODEV;
} }

16
boards/arm/sama5/sama5d3x-ek/src/sam_usb.c
View File

@ -50,12 +50,12 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SAMA5D3xEK_USBHOST_PRIO #ifndef CONFIG_SAMA5D3XEK_USBHOST_PRIO
# define CONFIG_SAMA5D3xEK_USBHOST_PRIO 50 # define CONFIG_SAMA5D3XEK_USBHOST_PRIO 50
#endif #endif
#ifndef CONFIG_SAMA5D3xEK_USBHOST_STACKSIZE #ifndef CONFIG_SAMA5D3XEK_USBHOST_STACKSIZE
# define CONFIG_SAMA5D3xEK_USBHOST_STACKSIZE 1024 # define CONFIG_SAMA5D3XEK_USBHOST_STACKSIZE 1024
#endif #endif
#ifdef HAVE_USBDEV #ifdef HAVE_USBDEV
@ -346,8 +346,8 @@ int sam_usbhost_initialize(void)
/* Start a thread to handle device connection. */ /* Start a thread to handle device connection. */
pid = kthread_create("OHCI Monitor", pid = kthread_create("OHCI Monitor",
CONFIG_SAMA5D3xEK_USBHOST_PRIO, CONFIG_SAMA5D3XEK_USBHOST_PRIO,
CONFIG_SAMA5D3xEK_USBHOST_STACKSIZE, CONFIG_SAMA5D3XEK_USBHOST_STACKSIZE,
(main_t)ohci_waiter, (FAR char * const *)NULL); (main_t)ohci_waiter, (FAR char * const *)NULL);
if (pid < 0) if (pid < 0)
{ {
@ -368,8 +368,8 @@ int sam_usbhost_initialize(void)
/* Start a thread to handle device connection. */ /* Start a thread to handle device connection. */
pid = kthread_create("EHCI Monitor", CONFIG_SAMA5D3xEK_USBHOST_PRIO, pid = kthread_create("EHCI Monitor", CONFIG_SAMA5D3XEK_USBHOST_PRIO,
CONFIG_SAMA5D3xEK_USBHOST_STACKSIZE, CONFIG_SAMA5D3XEK_USBHOST_STACKSIZE,
(main_t)ehci_waiter, (FAR char * const *)NULL); (main_t)ehci_waiter, (FAR char * const *)NULL);
if (pid < 0) if (pid < 0)
{ {

4
boards/arm/sama5/sama5d3x-ek/src/sam_usbmsc.c
View File

@ -44,8 +44,8 @@
# error AT25 Serial FLASH not supported # error AT25 Serial FLASH not supported
#endif #endif
#ifndef CONFIG_SAMA5D3xEK_AT25_FTL #ifndef CONFIG_SAMA5D3XEK_AT25_FTL
# error AT25 FTL support required (CONFIG_SAMA5D3xEK_AT25_FTL) # error AT25 FTL support required (CONFIG_SAMA5D3XEK_AT25_FTL)
# undef HAVE_AT25 # undef HAVE_AT25
#endif #endif

6
boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c
View File

@ -62,7 +62,7 @@ uint32_t board_userled_initialize(void)
/* Configure LED PIOs for output */ /* Configure LED PIOs for output */
sam_configpio(PIO_BLUE); sam_configpio(PIO_BLUE);
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
sam_configpio(PIO_RED); sam_configpio(PIO_RED);
#endif #endif
return BOARD_NLEDS; return BOARD_NLEDS;
@ -83,7 +83,7 @@ void board_userled(int led, bool ledon)
ledcfg = PIO_BLUE; ledcfg = PIO_BLUE;
ledon = !ledon; ledon = !ledon;
} }
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
else if (led == BOARD_RED) else if (led == BOARD_RED)
{ {
/* High illuminates */ /* High illuminates */
@ -112,7 +112,7 @@ void board_userled_all(uint32_t ledset)
ledon = ((ledset & BOARD_BLUE_BIT) == 0); ledon = ((ledset & BOARD_BLUE_BIT) == 0);
sam_piowrite(PIO_BLUE, ledon); sam_piowrite(PIO_BLUE, ledon);
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
/* High illuminates */ /* High illuminates */
ledon = ((ledset & BOARD_RED_BIT) != 0); ledon = ((ledset & BOARD_RED_BIT) != 0);

6
boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c
View File

@ -104,8 +104,8 @@ static struct sama5d3ek_mwinfo_s g_wm8904info =
.lower = .lower =
{ {
.address = WM8904_I2C_ADDRESS, .address = WM8904_I2C_ADDRESS,
.frequency = CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY, .frequency = CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY,
#ifdef CONFIG_SAMA5D3xEK_WM8904_SRCSCK #ifdef CONFIG_SAMA5D3XEK_WM8904_SRCSCK
.mclk = BOARD_SLOWCLK_FREQUENCY, .mclk = BOARD_SLOWCLK_FREQUENCY,
#else #else
.mclk = BOARD_MAINCK_FREQUENCY, .mclk = BOARD_MAINCK_FREQUENCY,
@ -281,7 +281,7 @@ int sam_wm8904_initialize(int minor)
* that is connected to the WM8904 MCLK. * that is connected to the WM8904 MCLK.
*/ */
#ifdef CONFIG_SAMA5D3xEK_WM8904_SRCSCK #ifdef CONFIG_SAMA5D3XEK_WM8904_SRCSCK
/* Drive the DAC with the slow clock (32.768 KHz). /* Drive the DAC with the slow clock (32.768 KHz).
* The slow clock was enabled in sam_boot.c if needed. * The slow clock was enabled in sam_boot.c if needed.
*/ */

62
boards/arm/sama5/sama5d3x-ek/src/sama5d3x-ek.h
View File

@ -97,27 +97,27 @@
#endif #endif
/* If we are going to mount the NAND, then they user must also have told /* If we are going to mount the NAND, then they user must also have told
* us what to do with it by setting one of CONFIG_SAMA5D3xEK_NAND_FTL or * us what to do with it by setting one of CONFIG_SAMA5D3XEK_NAND_FTL or
* CONFIG_SAMA5D3xEK_NAND_NXFFS. * CONFIG_SAMA5D3XEK_NAND_NXFFS.
*/ */
#ifndef CONFIG_MTD #ifndef CONFIG_MTD
# undef CONFIG_SAMA5D3xEK_NAND_NXFFS # undef CONFIG_SAMA5D3XEK_NAND_NXFFS
# undef CONFIG_SAMA5D3xEK_NAND_FTL # undef CONFIG_SAMA5D3XEK_NAND_FTL
#endif #endif
#if !defined(CONFIG_FS_NXFFS) || !defined(CONFIG_NXFFS_NAND) #if !defined(CONFIG_FS_NXFFS) || !defined(CONFIG_NXFFS_NAND)
# undef CONFIG_SAMA5D3xEK_NAND_NXFFS # undef CONFIG_SAMA5D3XEK_NAND_NXFFS
#endif #endif
#if !defined(CONFIG_SAMA5D3xEK_NAND_FTL) && !defined(CONFIG_SAMA5D3xEK_NAND_NXFFS) #if !defined(CONFIG_SAMA5D3XEK_NAND_FTL) && !defined(CONFIG_SAMA5D3XEK_NAND_NXFFS)
# undef HAVE_NAND # undef HAVE_NAND
#endif #endif
#if defined(CONFIG_SAMA5D3xEK_NAND_FTL) && defined(CONFIG_SAMA5D3xEK_NAND_NXFFS) #if defined(CONFIG_SAMA5D3XEK_NAND_FTL) && defined(CONFIG_SAMA5D3XEK_NAND_NXFFS)
# warning Both CONFIG_SAMA5D3xEK_NAND_FTL and CONFIG_SAMA5D3xEK_NAND_NXFFS are set # warning Both CONFIG_SAMA5D3XEK_NAND_FTL and CONFIG_SAMA5D3XEK_NAND_NXFFS are set
# warning Ignoring CONFIG_SAMA5D3xEK_NAND_NXFFS # warning Ignoring CONFIG_SAMA5D3XEK_NAND_NXFFS
# undef CONFIG_SAMA5D3xEK_NAND_NXFFS # undef CONFIG_SAMA5D3XEK_NAND_NXFFS
#endif #endif
/* AT25 Serial FLASH */ /* AT25 Serial FLASH */
@ -132,7 +132,7 @@
* asked to mount the AT25 part * asked to mount the AT25 part
*/ */
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3xEK_AT25_BLOCKMOUNT) #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3XEK_AT25_BLOCKMOUNT)
# undef HAVE_AT25 # undef HAVE_AT25
#endif #endif
@ -141,17 +141,17 @@
*/ */
#ifndef CONFIG_FS_NXFFS #ifndef CONFIG_FS_NXFFS
# undef CONFIG_SAMA5D3xEK_AT25_NXFFS # undef CONFIG_SAMA5D3XEK_AT25_NXFFS
#endif #endif
#if !defined(CONFIG_SAMA5D3xEK_AT25_FTL) && !defined(CONFIG_SAMA5D3xEK_AT25_NXFFS) #if !defined(CONFIG_SAMA5D3XEK_AT25_FTL) && !defined(CONFIG_SAMA5D3XEK_AT25_NXFFS)
# undef HAVE_AT25 # undef HAVE_AT25
#endif #endif
#if defined(CONFIG_SAMA5D3xEK_AT25_FTL) && defined(CONFIG_SAMA5D3xEK_AT25_NXFFS) #if defined(CONFIG_SAMA5D3XEK_AT25_FTL) && defined(CONFIG_SAMA5D3XEK_AT25_NXFFS)
# warning Both CONFIG_SAMA5D3xEK_AT25_FTL and CONFIG_SAMA5D3xEK_AT25_NXFFS are set # warning Both CONFIG_SAMA5D3XEK_AT25_FTL and CONFIG_SAMA5D3XEK_AT25_NXFFS are set
# warning Ignoring CONFIG_SAMA5D3xEK_AT25_NXFFS # warning Ignoring CONFIG_SAMA5D3XEK_AT25_NXFFS
# undef CONFIG_SAMA5D3xEK_AT25_NXFFS # undef CONFIG_SAMA5D3XEK_AT25_NXFFS
#endif #endif
/* AT24 Serial EEPROM /* AT24 Serial EEPROM
@ -182,7 +182,7 @@
* asked to mount the AT25 part * asked to mount the AT25 part
*/ */
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3xEK_AT24_BLOCKMOUNT) #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3XEK_AT24_BLOCKMOUNT)
# undef HAVE_AT24 # undef HAVE_AT24
#endif #endif
@ -191,17 +191,17 @@
*/ */
#ifndef CONFIG_FS_NXFFS #ifndef CONFIG_FS_NXFFS
# undef CONFIG_SAMA5D3xEK_AT24_NXFFS # undef CONFIG_SAMA5D3XEK_AT24_NXFFS
#endif #endif
#if !defined(CONFIG_SAMA5D3xEK_AT24_FTL) && !defined(CONFIG_SAMA5D3xEK_AT24_NXFFS) #if !defined(CONFIG_SAMA5D3XEK_AT24_FTL) && !defined(CONFIG_SAMA5D3XEK_AT24_NXFFS)
# undef HAVE_AT24 # undef HAVE_AT24
#endif #endif
#if defined(CONFIG_SAMA5D3xEK_AT24_FTL) && defined(CONFIG_SAMA5D3xEK_AT24_NXFFS) #if defined(CONFIG_SAMA5D3XEK_AT24_FTL) && defined(CONFIG_SAMA5D3XEK_AT24_NXFFS)
# warning Both CONFIG_SAMA5D3xEK_AT24_FTL and CONFIG_SAMA5D3xEK_AT24_NXFFS are set # warning Both CONFIG_SAMA5D3XEK_AT24_FTL and CONFIG_SAMA5D3XEK_AT24_NXFFS are set
# warning Ignoring CONFIG_SAMA5D3xEK_AT24_NXFFS # warning Ignoring CONFIG_SAMA5D3XEK_AT24_NXFFS
# undef CONFIG_SAMA5D3xEK_AT24_NXFFS # undef CONFIG_SAMA5D3XEK_AT24_NXFFS
#endif #endif
/* Assign minor device numbers. For example, if we also use MINOR number 0 /* Assign minor device numbers. For example, if we also use MINOR number 0
@ -338,15 +338,15 @@
# undef HAVE_WM8904 # undef HAVE_WM8904
# endif # endif
# ifndef CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY # ifndef CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY
# warning Defaulting to maximum WM8904 I2C frequency # warning Defaulting to maximum WM8904 I2C frequency
# define CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY 400000 # define CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY 400000
# endif # endif
# if CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY > 400000 # if CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY > 400000
# warning WM8904 I2C frequency cannot exceed 400KHz # warning WM8904 I2C frequency cannot exceed 400KHz
# undef CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY # undef CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY
# define CONFIG_SAMA5D3xEK_WM8904_I2CFREQUENCY 400000 # define CONFIG_SAMA5D3XEK_WM8904_I2CFREQUENCY 400000
# endif # endif
#endif #endif
@ -354,7 +354,7 @@
#define OV2640_BUS 1 #define OV2640_BUS 1
#ifndef CONFIG_SAMA5D3xEK_OV2640_DEMO #ifndef CONFIG_SAMA5D3XEK_OV2640_DEMO
# undef HAVE_CAMERA # undef HAVE_CAMERA
#endif #endif
@ -401,7 +401,7 @@
#define PIO_BLUE (PIO_OUTPUT | PIO_CFG_PULLUP | PIO_OUTPUT_SET | \ #define PIO_BLUE (PIO_OUTPUT | PIO_CFG_PULLUP | PIO_OUTPUT_SET | \
PIO_PORT_PIOE | PIO_PIN25) PIO_PORT_PIOE | PIO_PIN25)
#ifndef CONFIG_SAMA5D3xEK_NOREDLED #ifndef CONFIG_SAMA5D3XEK_NOREDLED
# define PIO_RED (PIO_OUTPUT | PIO_CFG_PULLUP | PIO_OUTPUT_CLEAR | \ # define PIO_RED (PIO_OUTPUT | PIO_CFG_PULLUP | PIO_OUTPUT_CLEAR | \
PIO_PORT_PIOE | PIO_PIN24) PIO_PORT_PIOE | PIO_PIN24)
#endif #endif