Skip to content

Commit 19ef611

Browse files
ZhaoxiangJinkartben
authored andcommitted
boards: nxp: Cleanup XIP, XMCD and DCD files
Cleanup XIP, XMCD and DCD files to convert camel case to snake case. Signed-off-by: Zhaoxiang Jin <[email protected]>
1 parent 39f6b5e commit 19ef611

File tree

61 files changed

+2021
-2478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2021
-2478
lines changed

boards/madmachine/mm_feather/flexspi_nor_config.c

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,20 @@
99
#include <flexspi_nor_config.h>
1010

1111
#ifdef CONFIG_NXP_IMXRT_BOOT_HEADER
12-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
1312
__attribute__((section(".boot_hdr.conf")))
14-
#elif defined(__ICCARM__)
15-
#pragma location = ".boot_hdr.conf"
16-
#endif
1713

18-
const struct flexspi_nor_config_t Qspiflash_config = {
19-
.memConfig = {
14+
const struct flexspi_nor_config_t qspi_flash_config = {
15+
.mem_config = {
2016
.tag = FLEXSPI_CFG_BLK_TAG,
2117
.version = FLEXSPI_CFG_BLK_VERSION,
22-
.readSampleClkSrc =
23-
kFlexSPIReadSampleClk_LoopbackFromDqsPad,
24-
.csHoldTime = 3u,
25-
.csSetupTime = 3u,
26-
.sflashPadType = kSerialFlash_4Pads,
27-
.serialClkFreq = kFlexSpiSerialClk_100MHz,
28-
.sflashA1Size = 8u * 1024u * 1024u,
29-
.lookupTable = {
18+
.read_sample_clk_src =
19+
flexspi_read_sample_clk_loopback_from_dqs_pad,
20+
.cs_hold_time = 3u,
21+
.cs_setup_time = 3u,
22+
.sflash_pad_type = serial_flash_4_pads,
23+
.serial_clk_freq = flexspi_serial_clk_100mhz,
24+
.sflash_a1_size = 8u * 1024u * 1024u,
25+
.lookup_table = {
3026
FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD,
3127
0xEB, RADDR_SDR,
3228
FLEXSPI_4PAD, 0x18),
@@ -35,9 +31,9 @@ const struct flexspi_nor_config_t Qspiflash_config = {
3531
FLEXSPI_4PAD, 0x04),
3632
},
3733
},
38-
.pageSize = 256u,
39-
.sectorSize = 4u * 1024u,
40-
.blockSize = 256u * 1024u,
41-
.isUniformBlockSize = false,
34+
.page_size = 256u,
35+
.sector_size = 4u * 1024u,
36+
.block_size = 256u * 1024u,
37+
.is_uniform_block_size = false,
4238
};
4339
#endif /* CONFIG_NXP_IMXRT_BOOT_HEADER */

boards/madmachine/mm_swiftio/flexspi_nor_config.c

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,20 @@
99
#include <flexspi_nor_config.h>
1010

1111
#ifdef CONFIG_NXP_IMXRT_BOOT_HEADER
12-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
1312
__attribute__((section(".boot_hdr.conf")))
14-
#elif defined(__ICCARM__)
15-
#pragma location = ".boot_hdr.conf"
16-
#endif
1713

18-
const struct flexspi_nor_config_t Qspiflash_config = {
19-
.memConfig = {
14+
const struct flexspi_nor_config_t qspi_flash_config = {
15+
.mem_config = {
2016
.tag = FLEXSPI_CFG_BLK_TAG,
2117
.version = FLEXSPI_CFG_BLK_VERSION,
22-
.readSampleClkSrc =
23-
kFlexSPIReadSampleClk_LoopbackFromDqsPad,
24-
.csHoldTime = 3u,
25-
.csSetupTime = 3u,
26-
.sflashPadType = kSerialFlash_4Pads,
27-
.serialClkFreq = kFlexSpiSerialClk_100MHz,
28-
.sflashA1Size = 8u * 1024u * 1024u,
29-
.lookupTable = {
18+
.read_sample_clk_src =
19+
flexspi_read_sample_clk_loopback_from_dqs_pad,
20+
.cs_hold_time = 3u,
21+
.cs_setup_time = 3u,
22+
.sflash_pad_type = serial_flash_4_pads,
23+
.serial_clk_freq = flexspi_serial_clk_100mhz,
24+
.sflash_a1_size = 8u * 1024u * 1024u,
25+
.lookup_table = {
3026
FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD,
3127
0xEB, RADDR_SDR,
3228
FLEXSPI_4PAD, 0x18),
@@ -35,9 +31,9 @@ const struct flexspi_nor_config_t Qspiflash_config = {
3531
FLEXSPI_4PAD, 0x04),
3632
},
3733
},
38-
.pageSize = 256u,
39-
.sectorSize = 4u * 1024u,
40-
.blockSize = 256u * 1024u,
41-
.isUniformBlockSize = false,
34+
.page_size = 256u,
35+
.sector_size = 4u * 1024u,
36+
.block_size = 256u * 1024u,
37+
.is_uniform_block_size = false,
4238
};
4339
#endif /* CONFIG_NXP_IMXRT_BOOT_HEADER */

boards/nxp/frdm_mcxn947/xip/mcxn_flexspi_nor_config.c

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,7 @@
77

88
#include "mcxn_flexspi_nor_config.h"
99

10-
/* Component ID definition, used by tools. */
11-
#ifndef FSL_COMPONENT_ID
12-
#define FSL_COMPONENT_ID "platform.drivers.xip_board"
13-
#endif
14-
15-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
1610
__attribute__((section(".flexspi_fcb"), used))
17-
#elif defined(__ICCARM__)
18-
#pragma location = ".flexspi_fcb"
19-
#endif
2011

2112
#ifndef FLEXSPI_USE_CUSTOM_FCB
2213
#define FLEXSPI_USE_CUSTOM_FCB (0)
@@ -79,22 +70,22 @@ const uint8_t CUSTOM_FCB[] = {
7970
const flexspi_nor_image_config image_config = {
8071
.image_version = 0xFFFE0001u,
8172
.fcb_config = {
82-
.memConfig = {
73+
.mem_config = {
8374
.tag = FLEXSPI_CFG_BLK_TAG,
8475
.version = FLEXSPI_CFG_BLK_VERSION,
85-
.readSampleClkSrc =
86-
kFlexSPIReadSampleClk_LoopbackFromDqsPad,
87-
.csHoldTime = 3u,
88-
.csSetupTime = 3u,
76+
.read_sample_clk_src =
77+
flexspi_read_sample_clk_loopback_from_dqs_pad,
78+
.cs_hold_time = 3u,
79+
.cs_setup_time = 3u,
8980
/* Enable DDR mode, Wordaddassable, Safe */
9081
/* configuration, Differential clock */
91-
.controllerMiscOption =
92-
(1u << kFlexSpiMiscOffset_SafeConfigFreqEnable),
93-
.deviceType = kFlexSpiDeviceType_SerialNOR,
94-
.sflashPadType = kSerialFlash_4Pads,
95-
.serialClkFreq = kFlexSpiSerialClk_75MHz,
96-
.sflashA1Size = 8u * 1024u * 1024u,
97-
.lookupTable = {
82+
.controller_misc_option =
83+
(1u << flexspi_misc_offset_safe_config_freq_enable),
84+
.device_type = flexspi_device_type_serial_nor,
85+
.sflash_pad_type = serial_flash_4_pads,
86+
.serial_clk_freq = flexspi_serial_clk_75mhz,
87+
.sflash_a1_size = 8u * 1024u * 1024u,
88+
.lookup_table = {
9889
/* Read LUTs */
9990
[0] = FLEXSPI_LUT_SEQ(CMD_SDR,
10091
FLEXSPI_1PAD, 0xEB,
@@ -139,11 +130,11 @@ const flexspi_nor_image_config image_config = {
139130
FLEXSPI_1PAD, 0x0),
140131
},
141132
},
142-
.pageSize = 256u,
143-
.sectorSize = 4u * 1024u,
144-
.ipcmdSerialClkFreq = 1u,
145-
.blockSize = 64u * 1024u,
146-
.isUniformBlockSize = false,
133+
.page_size = 256u,
134+
.sector_size = 4u * 1024u,
135+
.ipcmd_serial_clk_freq = 1u,
136+
.block_size = 64u * 1024u,
137+
.is_uniform_block_size = false,
147138
}
148139
};
149140

0 commit comments

Comments
 (0)