Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAMA5D3x-EK: Change name of all board-specific configuration variables so that there are no collisions with names of similar variables for other boards

Browse Source
This commit is contained in:
Gregory Nutt
2014-03-30 07:26:38 -06:00
parent c433c684fa
commit 5215080188
19 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/sama5d3x-ek/Kconfig
+27 -27
View File
@@ -7,22 +7,22 @@ if ARCH_BOARD_SAMA5D3X_EK
choice choice
prompt "SAMA5D3x-EK DRAM Type" prompt "SAMA5D3x-EK DRAM Type"
default SAMA5_MT47H128M16RT default SAMA5D3xEK_MT47H128M16RT
depends on SAMA5_DDRCS depends on SAMA5_DDRCS
config SAMA5_MT47H128M16RT config SAMA5D3xEK_MT47H128M16RT
bool "MT47H128M16RT" bool "MT47H128M16RT"
---help--- ---help---
Micron 2Gbit x16 DDR2-1066 128Mb Micron 2Gbit x16 DDR2-1066 128Mb
config SAMA5_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 SAMA5_NOR_MAIN config SAMA5D3xEK_NOR_MAIN
bool "Build nor_main" bool "Build nor_main"
default n default n
depends on SAMA5_BOOT_ISRAM depends on SAMA5_BOOT_ISRAM
@@ -31,15 +31,15 @@ config SAMA5_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 SAMA5_NOR_START config SAMA5D3xEK_NOR_START
bool "Start NOR program" bool "Start NOR program"
default n default n
depends on SAMA5_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 behvior is enabled with this program with GDB. An alternative behvior is enabled with this
option: If SAMA5_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 SAMA5_NAND_AUTOMOUNT config SAMA5_NAND_AUTOMOUNT
@@ -51,10 +51,10 @@ config SAMA5_NAND_AUTOMOUNT
choice choice
prompt "NAND FLASH configuration" prompt "NAND FLASH configuration"
default SAMA5_NAND_NXFFS default SAMA5D3xEK_NAND_NXFFS
depends on SAMA5_NAND_AUTOMOUNT depends on SAMA5_NAND_AUTOMOUNT
config SAMA5_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---
@@ -68,7 +68,7 @@ config SAMA5_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 SAMA5_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---
@@ -81,7 +81,7 @@ config SAMA5_NAND_NXFFS
endchoice # NAND FLASH configuration endchoice # NAND FLASH configuration
config SAMA5_AT25_AUTOMOUNT config SAMA5D3xEK_AT25_AUTOMOUNT
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
@@ -90,10 +90,10 @@ config SAMA5_AT25_AUTOMOUNT
choice choice
prompt "AT25 serial FLASH configuration" prompt "AT25 serial FLASH configuration"
default SAMA5_AT25_FTL default SAMA5D3xEK_AT25_FTL
depends on SAMA5_AT25_AUTOMOUNT depends on SAMA5D3xEK_AT25_AUTOMOUNT
config SAMA5_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
@@ -101,7 +101,7 @@ config SAMA5_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 SAMA5_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---
@@ -111,7 +111,7 @@ config SAMA5_AT25_NXFFS
endchoice # AT25 serial FLASH configuration endchoice # AT25 serial FLASH configuration
config SAMA5_AT24_AUTOMOUNT config SAMA5D3xEK_AT24_AUTOMOUNT
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
@@ -131,10 +131,10 @@ config SAMA5_AT24_AUTOMOUNT
choice choice
prompt "AT24 serial EPPROM configuration" prompt "AT24 serial EPPROM configuration"
default SAMA5_AT24_FTL default SAMA5D3xEK_AT24_FTL
depends on SAMA5_AT24_AUTOMOUNT depends on SAMA5D3xEK_AT24_AUTOMOUNT
config SAMA5_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
@@ -142,7 +142,7 @@ config SAMA5_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 SAMA5_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---
@@ -152,7 +152,7 @@ config SAMA5_AT24_NXFFS
endchoice # AT24 serial EPPROM configuration endchoice # AT24 serial EPPROM configuration
config SAMA5_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
@@ -160,7 +160,7 @@ config SAMA5_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 SAMA5D3X_EK_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
@@ -176,7 +176,7 @@ if AUDIO_I2SCHAR && (SAMA5_SSC0 || SAMA5_SSC1)
if SAMA5_SSC0 && SAMA5_SSC1 if SAMA5_SSC0 && SAMA5_SSC1
config SAMA5D3X_EK_SSC_PORT config SAMA5D3xEK_SSC_PORT
int "SSC port number" int "SSC port number"
default 0 default 0
range 0 1 range 0 1
@@ -187,7 +187,7 @@ endif # SAMA5_SSC0 && SAMA5_SSC1
if SAMA5_SSC0 && !SAMA5_SSC1 if SAMA5_SSC0 && !SAMA5_SSC1
config SAMA5D3X_EK_SSC_PORT config SAMA5D3xEK_SSC_PORT
int int
default 0 default 0
@@ -195,13 +195,13 @@ endif # SAMA5_SSC0 && !SAMA5_SSC1
if !SAMA5_SSC0 && SAMA5_SSC1 if !SAMA5_SSC0 && SAMA5_SSC1
config SAMA5D3X_EK_SSC_PORT config SAMA5D3xEK_SSC_PORT
int int
default 1 default 1
endif # SAMA5_SSC0 && !SAMA5_SSC1 endif # SAMA5_SSC0 && !SAMA5_SSC1
config SAMA5D3X_EK_I2SCHAR_MINOR config SAMA5D3xEK_I2SCHAR_MINOR
int "I2S character driver minor number" int "I2S character driver minor number"
default 0 default 0
---help--- ---help---
@@ -213,7 +213,7 @@ endif # AUDIO_I2SCHAR && (SAMA5_SSC0 || SAMA5_SSC1)
if VIDEO_OV2640 if VIDEO_OV2640
config SAMA5_OV2640_DEMO config SAMA5D3xEK_OV2640_DEMO
bool "SAMA5 OV2640 camera demo" bool "SAMA5 OV2640 camera demo"
default n default n
---help--- ---help---
configs/sama5d3x-ek/README.txt
+14 -14
View File
@@ -423,7 +423,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_SAMA5_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.
@@ -777,8 +777,8 @@ AT25 Serial FLASH
CONFIG_NSH_ARCHINIT=y : NSH board-initialization CONFIG_NSH_ARCHINIT=y : NSH board-initialization
Board Selection Board Selection
CONFIG_SAMA5_AT25_AUTOMOUNT=y : Mounts AT25 for NSH CONFIG_SAMA5D3xEK_AT25_AUTOMOUNT=y : Mounts AT25 for NSH
CONFIG_SAMA5_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.
@@ -1288,7 +1288,7 @@ SDRAM Support
CONFIG_SAMA5_DDRCS=y : Tell the system that DRAM is at the DDR CS CONFIG_SAMA5_DDRCS=y : Tell the system that DRAM is at the DDR CS
CONFIG_SAMA5_DDRCS_SIZE=268435456 : 2Gb DRAM -> 256GB CONFIG_SAMA5_DDRCS_SIZE=268435456 : 2Gb DRAM -> 256GB
CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2 CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2
CONFIG_SAMA5_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
@@ -1356,7 +1356,7 @@ SDRAM Support
CONFIG_SAMA5_DDRCS=y : Tell the system that DRAM is at the DDR CS CONFIG_SAMA5_DDRCS=y : Tell the system that DRAM is at the DDR CS
CONFIG_SAMA5_DDRCS_SIZE=268435456 : 2Gb DRAM -> 256GB CONFIG_SAMA5_DDRCS_SIZE=268435456 : 2Gb DRAM -> 256GB
CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2 CONFIG_SAMA5_DDRCS_LPDDR2=y : Its DDR2
CONFIG_SAMA5_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
@@ -1499,7 +1499,7 @@ NAND Support
Board Selection Board Selection
CONFIG_SAMA5_NAND_AUTOMOUNT=y : Enable FS support on NAND CONFIG_SAMA5_NAND_AUTOMOUNT=y : Enable FS support on NAND
CONFIG_SAMA5_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.
@@ -1523,7 +1523,7 @@ NAND Support
Board Selection Board Selection
CONFIG_SAMA5_NAND_AUTOMOUNT=y : Enable FS support on NAND CONFIG_SAMA5_NAND_AUTOMOUNT=y : Enable FS support on NAND
CONFIG_SAMA5_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
@@ -1541,7 +1541,7 @@ NAND Support
--------------------- ---------------------
With the options CONFIG_SAMA5_NAND_AUTOMOUNT=y and With the options CONFIG_SAMA5_NAND_AUTOMOUNT=y and
CONFIG_SAMA5_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:
@@ -1763,8 +1763,8 @@ AT24 Serial EEPROM
: Other defaults are probably OK : Other defaults are probably OK
Board Selection Board Selection
CONFIG_SAMA5_AT24_AUTOMOUNT=y : Mounts AT24 for NSH CONFIG_SAMA5D3xEK_AT24_AUTOMOUNT=y : Mounts AT24 for NSH
CONFIG_SAMA5_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:
@@ -2233,7 +2233,7 @@ Touchscreen Testing
CONFIG_INPUT=y : (automatically selected) CONFIG_INPUT=y : (automatically selected)
Board Selection: Board Selection:
CONFIG_SAMA5_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
@@ -2375,8 +2375,8 @@ I2S Audio Support
CONFIG_EXAMPLES_I2SCHAR_DEVINIT=y CONFIG_EXAMPLES_I2SCHAR_DEVINIT=y
Board Selection Board Selection
CONFIG_SAMA5D3X_EK_I2SCHAR_MINOR=0 CONFIG_SAMA5D3xEK_I2SCHAR_MINOR=0
CONFIG_SAMA5D3X_EK_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
@@ -2810,7 +2810,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_SAMA5_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.
configs/sama5d3x-ek/demo/defconfig
+4 -4
View File
@@ -308,10 +308,10 @@ CONFIG_NSH_MMCSDSLOTNO=0
# #
# Board-Specific Options # Board-Specific Options
# #
CONFIG_SAMA5_MT47H128M16RT=y CONFIG_SAMA5D3xEK_MT47H128M16RT=y
# CONFIG_SAMA5_MT47H64M16HR is not set # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set
CONFIG_SAMA5_AT25_AUTOMOUNT=y CONFIG_SAMA5D3xEK_AT25_AUTOMOUNT=y
CONFIG_SAMA5_AT25_FTL=y CONFIG_SAMA5D3xEK_AT25_FTL=y
# #
# RTOS Features # RTOS Features
configs/sama5d3x-ek/hello/defconfig
+1 -1
View File
@@ -255,7 +255,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
# #
# Board-Specific Options # Board-Specific Options
# #
# CONFIG_SAMA5_NOR_MAIN is not set # CONFIG_SAMA5D3xEK_NOR_MAIN is not set
# #
# RTOS Features # RTOS Features
configs/sama5d3x-ek/norboot/defconfig
+2 -2
View File
@@ -268,8 +268,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
# #
# Board-Specific Options # Board-Specific Options
# #
CONFIG_SAMA5_NOR_MAIN=y CONFIG_SAMA5D3xEK_NOR_MAIN=y
# CONFIG_SAMA5_NOR_START is not set # CONFIG_SAMA5D3xEK_NOR_START is not set
# #
# RTOS Features # RTOS Features
configs/sama5d3x-ek/nx/defconfig
+2 -2
View File
@@ -313,8 +313,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
# #
# Board-Specific Options # Board-Specific Options
# #
CONFIG_SAMA5_MT47H128M16RT=y CONFIG_SAMA5D3xEK_MT47H128M16RT=y
# CONFIG_SAMA5_MT47H64M16HR is not set # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set
# #
# RTOS Features # RTOS Features
configs/sama5d3x-ek/nxwm/defconfig
+3 -3
View File
@@ -343,9 +343,9 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# Board-Specific Options # Board-Specific Options
# #
CONFIG_SAMA5_MT47H128M16RT=y CONFIG_SAMA5D3xEK_MT47H128M16RT=y
# CONFIG_SAMA5_MT47H64M16HR is not set # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set
CONFIG_SAMA5_TSD_DEVMINOR=0 CONFIG_SAMA5D3xEK_TSD_DEVMINOR=0
# #
# RTOS Features # RTOS Features
configs/sama5d3x-ek/ov2640/defconfig
+3 -3
View File
@@ -318,9 +318,9 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
# #
# Board-Specific Options # Board-Specific Options
# #
CONFIG_SAMA5_MT47H128M16RT=y CONFIG_SAMA5D3xEK_MT47H128M16RT=y
# CONFIG_SAMA5_MT47H64M16HR is not set # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set
CONFIG_SAMA5_OV2640_DEMO=y CONFIG_SAMA5D3xEK_OV2640_DEMO=y
# #
# RTOS Features # RTOS Features
configs/sama5d3x-ek/src/Makefile
+1 -1
View File
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_SAMA5_EBICS3_NAND),y)
CSRCS += sam_nandflash.c CSRCS += sam_nandflash.c
endif endif
ifeq ($(CONFIG_SAMA5_NOR_MAIN),y) ifeq ($(CONFIG_SAMA5D3xEK_NOR_MAIN),y)
CSRCS += nor_main.c CSRCS += nor_main.c
endif endif
configs/sama5d3x-ek/src/nor_main.c
+2 -2
View File
@@ -88,7 +88,7 @@ int nor_main(int argc, char *argv)
{ {
uint32_t regval; uint32_t regval;
#ifdef CONFIG_SAMA5_NOR_START #ifdef CONFIG_SAMA5D3xEK_NOR_START
printf("Configuring and booting from NOR FLASH on CS0\n"); printf("Configuring and booting from NOR FLASH on CS0\n");
#else #else
printf("Configuring NOR FLASH on CS0 and halting\n"); printf("Configuring NOR FLASH on CS0 and halting\n");
@@ -180,7 +180,7 @@ int nor_main(int argc, char *argv)
cp15_invalidate_dcache_all(); cp15_invalidate_dcache_all();
cp15_invalidate_tlbs(); cp15_invalidate_tlbs();
#ifdef CONFIG_SAMA5_NOR_START #ifdef CONFIG_SAMA5D3xEK_NOR_START
/* Then jump into NOR flash */ /* Then jump into NOR flash */
NOR_ENTRY(); NOR_ENTRY();
configs/sama5d3x-ek/src/sam_at24.c
+2 -2
View File
@@ -120,7 +120,7 @@ int sam_at24_automount(int minor)
return -ENODEV; return -ENODEV;
} }
#if defined(CONFIG_SAMA5_AT24_FTL) #if defined(CONFIG_SAMA5D3xEK_AT24_FTL)
/* And finally, use the FTL layer to wrap the MTD driver as a block driver */ /* And finally, use the FTL layer to wrap the MTD driver as a block driver */
fvdbg("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR); fvdbg("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR);
@@ -131,7 +131,7 @@ int sam_at24_automount(int minor)
return ret; return ret;
} }
#elif defined(CONFIG_SAMA5_AT24_NXFFS) #elif defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
/* Initialize to provide NXFFS on the MTD interface */ /* Initialize to provide NXFFS on the MTD interface */
fvdbg("Initialize the NXFFS file system\n"); fvdbg("Initialize the NXFFS file system\n");
configs/sama5d3x-ek/src/sam_at25.c
+2 -2
View File
@@ -100,7 +100,7 @@ int sam_at25_automount(int minor)
return -ENODEV; return -ENODEV;
} }
#if defined(CONFIG_SAMA5_AT25_FTL) #if defined(CONFIG_SAMA5D3xEK_AT25_FTL)
/* And finally, use the FTL layer to wrap the MTD driver as a block driver */ /* And finally, use the FTL layer to wrap the MTD driver as a block driver */
ret = ftl_initialize(AT25_MINOR, mtd); ret = ftl_initialize(AT25_MINOR, mtd);
@@ -110,7 +110,7 @@ int sam_at25_automount(int minor)
return ret; return ret;
} }
#elif defined(CONFIG_SAMA5_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);
configs/sama5d3x-ek/src/sam_i2schar.c
+8 -8
View File
@@ -55,16 +55,16 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
#ifndef CONFIG_SAMA5D3X_EK_SSC_PORT #ifndef CONFIG_SAMA5D3xEK_SSC_PORT
# if defined(CONFIG_SAMA5_SSC0) # if defined(CONFIG_SAMA5_SSC0)
# define CONFIG_SAMA5D3X_EK_SSC_PORT 0 # define CONFIG_SAMA5D3xEK_SSC_PORT 0
# elif defined(CONFIG_SAMA5_SSC1) # elif defined(CONFIG_SAMA5_SSC1)
# define CONFIG_SAMA5D3X_EK_SSC_PORT 1 # define CONFIG_SAMA5D3xEK_SSC_PORT 1
# endif # endif
#endif #endif
#ifndef CONFIG_SAMA5D3X_EK_I2SCHAR_MINOR #ifndef CONFIG_SAMA5D3xEK_I2SCHAR_MINOR
# define CONFIG_SAMA5D3X_EK_I2SCHAR_MINOR 0 # define CONFIG_SAMA5D3xEK_I2SCHAR_MINOR 0
#endif #endif
/************************************************************************************ /************************************************************************************
@@ -96,17 +96,17 @@ int i2schar_devinit(void)
{ {
/* Call sam_ssc_initialize() to get an instance of the SSC/I2S interface */ /* Call sam_ssc_initialize() to get an instance of the SSC/I2S interface */
i2s = sam_ssc_initialize(CONFIG_SAMA5D3X_EK_SSC_PORT); i2s = sam_ssc_initialize(CONFIG_SAMA5D3xEK_SSC_PORT);
if (!i2s) if (!i2s)
{ {
dbg("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n", dbg("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
CONFIG_SAMA5D3X_EK_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_SAMA5D3X_EK_I2SCHAR_MINOR); ret = i2schar_register(i2s, CONFIG_SAMA5D3xEK_I2SCHAR_MINOR);
if (ret < 0) if (ret < 0)
{ {
adbg("ERROR: i2schar_register failed: %d\n", ret); adbg("ERROR: i2schar_register failed: %d\n", ret);
configs/sama5d3x-ek/src/sam_nandflash.c
+2 -2
View File
@@ -190,7 +190,7 @@ int sam_nand_automount(int minor)
return -ENODEV; return -ENODEV;
} }
#if defined(CONFIG_SAMA5_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);
@@ -200,7 +200,7 @@ int sam_nand_automount(int minor)
return ret; return ret;
} }
#elif defined(CONFIG_SAMA5_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);
configs/sama5d3x-ek/src/sam_pwm.c
+6 -6
View File
@@ -87,19 +87,19 @@
* -----+---+---+----+-------------------- * -----+---+---+----+--------------------
*/ */
#ifndef CONFIG_SAMA5D3X_EK_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_SAMA5D3X_EK_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_SAMA5D3X_EK_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_SAMA5D3X_EK_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_SAMA5D3X_EK_CHANNEL 3 # define CONFIG_SAMA5D3xEK_CHANNEL 3
# endif # endif
#endif #endif
@@ -134,7 +134,7 @@ int pwm_devinit(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_SAMA5D3X_EK_CHANNEL); pwm = sam_pwminitialize(CONFIG_SAMA5D3xEK_CHANNEL);
if (!pwm) if (!pwm)
{ {
dbg("Failed to get the SAMA5 PWM lower half\n"); dbg("Failed to get the SAMA5 PWM lower half\n");
configs/sama5d3x-ek/src/sam_sdram.c
+4 -4
View File
@@ -71,14 +71,14 @@
****************************************************************************/ ****************************************************************************/
/* SDRAM differences */ /* SDRAM differences */
#if defined(CONFIG_SAMA5_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_SAMA5_MT47H64M16HR) #elif defined(CONFIG_SAMA5D3xEK_MT47H64M16HR)
/* Used for SDRAM command handshaking */ /* Used for SDRAM command handshaking */
@@ -222,7 +222,7 @@ void sam_sdram_config(void)
* Register * Register
*/ */
#if defined(CONFIG_SAMA5_MT47H128M16RT) #if defined(CONFIG_SAMA5D3xEK_MT47H128M16RT)
/* For MT47H128M16RT /* For MT47H128M16RT
* *
@@ -250,7 +250,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_SAMA5_MT47H64M16HR) #elif defined(CONFIG_SAMA5D3xEK_MT47H64M16HR)
/* For MT47H64M16HR /* For MT47H64M16HR
* *
* NC = 10 DDR column bits * NC = 10 DDR column bits
configs/sama5d3x-ek/src/sam_touchscreen.c
+4 -4
View File
@@ -58,8 +58,8 @@
# error "Touchscreen support requires CONFIG_INPUT" # error "Touchscreen support requires CONFIG_INPUT"
#endif #endif
#ifndef CONFIG_SAMA5_TSD_DEVMINOR #ifndef CONFIG_SAMA5D3xEK_TSD_DEVMINOR
# define CONFIG_SAMA5_TSD_DEVMINOR 0 # define CONFIG_SAMA5D3xEK_TSD_DEVMINOR 0
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -126,11 +126,11 @@ int arch_tcinitialize(int minor)
/* Initialize and register the SPI touchscreen device */ /* Initialize and register the SPI touchscreen device */
ret = sam_tsd_register(adc, CONFIG_SAMA5_TSD_DEVMINOR); ret = sam_tsd_register(adc, CONFIG_SAMA5D3xEK_TSD_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
idbg("ERROR: Failed to register touchscreen device /dev/input%d: %d\n", idbg("ERROR: Failed to register touchscreen device /dev/input%d: %d\n",
CONFIG_SAMA5_TSD_DEVMINOR, ret); CONFIG_SAMA5D3xEK_TSD_DEVMINOR, ret);
return -ENODEV; return -ENODEV;
} }
configs/sama5d3x-ek/src/sam_usbmsc.c
+2 -2
View File
@@ -59,8 +59,8 @@
# error AT25 Serial FLASH not supported # error AT25 Serial FLASH not supported
#endif #endif
#ifndef CONFIG_SAMA5_AT25_FTL #ifndef CONFIG_SAMA5D3xEK_AT25_FTL
# error AT25 FTL support required (CONFIG_SAMA5_AT25_FTL) # error AT25 FTL support required (CONFIG_SAMA5D3xEK_AT25_FTL)
# undef HAVE_AT25 # undef HAVE_AT25
#endif #endif
configs/sama5d3x-ek/src/sama5d3x-ek.h
+25 -25
View File
@@ -108,27 +108,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_SAMA5_NAND_FTL or * us what to do with it by setting one of CONFIG_SAMA5D3xEK_NAND_FTL or
* CONFIG_SAMA5_NAND_NXFFS. * CONFIG_SAMA5D3xEK_NAND_NXFFS.
*/ */
#ifndef CONFIG_MTD #ifndef CONFIG_MTD
# undef CONFIG_SAMA5_NAND_NXFFS # undef CONFIG_SAMA5D3xEK_NAND_NXFFS
# undef CONFIG_SAMA5_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_SAMA5_NAND_NXFFS # undef CONFIG_SAMA5D3xEK_NAND_NXFFS
#endif #endif
#if !defined(CONFIG_SAMA5_NAND_FTL) && !defined(CONFIG_SAMA5_NAND_NXFFS) #if !defined(CONFIG_SAMA5D3xEK_NAND_FTL) && !defined(CONFIG_SAMA5D3xEK_NAND_NXFFS)
# undef HAVE_NAND # undef HAVE_NAND
#endif #endif
#if defined(CONFIG_SAMA5_NAND_FTL) && defined(CONFIG_SAMA5_NAND_NXFFS) #if defined(CONFIG_SAMA5D3xEK_NAND_FTL) && defined(CONFIG_SAMA5D3xEK_NAND_NXFFS)
# warning Both CONFIG_SAMA5_NAND_FTL and CONFIG_SAMA5_NAND_NXFFS are set # warning Both CONFIG_SAMA5D3xEK_NAND_FTL and CONFIG_SAMA5D3xEK_NAND_NXFFS are set
# warning Ignoring CONFIG_SAMA5_NAND_NXFFS # warning Ignoring CONFIG_SAMA5D3xEK_NAND_NXFFS
# undef CONFIG_SAMA5_NAND_NXFFS # undef CONFIG_SAMA5D3xEK_NAND_NXFFS
#endif #endif
/* AT25 Serial FLASH */ /* AT25 Serial FLASH */
@@ -142,7 +142,7 @@
* asked to mount the AT25 part * asked to mount the AT25 part
*/ */
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5_AT25_AUTOMOUNT) #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3xEK_AT25_AUTOMOUNT)
# undef HAVE_AT25 # undef HAVE_AT25
#endif #endif
@@ -151,17 +151,17 @@
*/ */
#ifndef CONFIG_FS_NXFFS #ifndef CONFIG_FS_NXFFS
# undef CONFIG_SAMA5_AT25_NXFFS # undef CONFIG_SAMA5D3xEK_AT25_NXFFS
#endif #endif
#if !defined(CONFIG_SAMA5_AT25_FTL) && !defined(CONFIG_SAMA5_AT25_NXFFS) #if !defined(CONFIG_SAMA5D3xEK_AT25_FTL) && !defined(CONFIG_SAMA5D3xEK_AT25_NXFFS)
# undef HAVE_AT25 # undef HAVE_AT25
#endif #endif
#if defined(CONFIG_SAMA5_AT25_FTL) && defined(CONFIG_SAMA5_AT25_NXFFS) #if defined(CONFIG_SAMA5D3xEK_AT25_FTL) && defined(CONFIG_SAMA5D3xEK_AT25_NXFFS)
# warning Both CONFIG_SAMA5_AT25_FTL and CONFIG_SAMA5_AT25_NXFFS are set # warning Both CONFIG_SAMA5D3xEK_AT25_FTL and CONFIG_SAMA5D3xEK_AT25_NXFFS are set
# warning Ignoring CONFIG_SAMA5_AT25_NXFFS # warning Ignoring CONFIG_SAMA5D3xEK_AT25_NXFFS
# undef CONFIG_SAMA5_AT25_NXFFS # undef CONFIG_SAMA5D3xEK_AT25_NXFFS
#endif #endif
/* AT24 Serial EEPROM /* AT24 Serial EEPROM
@@ -192,7 +192,7 @@
* asked to mount the AT25 part * asked to mount the AT25 part
*/ */
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5_AT24_AUTOMOUNT) #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3xEK_AT24_AUTOMOUNT)
# undef HAVE_AT24 # undef HAVE_AT24
#endif #endif
@@ -201,17 +201,17 @@
*/ */
#ifndef CONFIG_FS_NXFFS #ifndef CONFIG_FS_NXFFS
# undef CONFIG_SAMA5_AT24_NXFFS # undef CONFIG_SAMA5D3xEK_AT24_NXFFS
#endif #endif
#if !defined(CONFIG_SAMA5_AT24_FTL) && !defined(CONFIG_SAMA5_AT24_NXFFS) #if !defined(CONFIG_SAMA5D3xEK_AT24_FTL) && !defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
# undef HAVE_AT24 # undef HAVE_AT24
#endif #endif
#if defined(CONFIG_SAMA5_AT24_FTL) && defined(CONFIG_SAMA5_AT24_NXFFS) #if defined(CONFIG_SAMA5D3xEK_AT24_FTL) && defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
# warning Both CONFIG_SAMA5_AT24_FTL and CONFIG_SAMA5_AT24_NXFFS are set # warning Both CONFIG_SAMA5D3xEK_AT24_FTL and CONFIG_SAMA5D3xEK_AT24_NXFFS are set
# warning Ignoring CONFIG_SAMA5_AT24_NXFFS # warning Ignoring CONFIG_SAMA5D3xEK_AT24_NXFFS
# undef CONFIG_SAMA5_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
@@ -322,7 +322,7 @@
#define OV2640_BUS 1 #define OV2640_BUS 1
#ifndef CONFIG_SAMA5_OV2640_DEMO #ifndef CONFIG_SAMA5D3xEK_OV2640_DEMO
# undef HAVE_CAMERA # undef HAVE_CAMERA
#endif #endif