summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Wang <[email protected]>2025-05-20 10:53:44 +0800
committerRbb666 <[email protected]>2025-05-21 09:42:50 +0800
commit3f1653b688fa31bfefb59840cc1d6d666a836741 (patch)
tree9bd2bde0b2dcea8cffc9c4a7902c9d28342078d0
parentd1628a1cf364cde92d99814feb5038318281e197 (diff)
bsp: k230: support sdio
Support sdio work for 01Studio board. 01Studio connect TF socket with sdio0, which is different from standard canmv v1.0/v1.1 board (which uses sdio1). Updated configuration menu, - SDIO devices are now a choice of two. - Root file system types are also a choice of multiple. Currently only cromfs and elmFAT are supported. - Modified the default mount partition of the root file system to sd0p1 Deleted the configuration BSP_SD_SDIO_DEV, and now directly set mmcsd_change according to the selection of the SDIO device. Eliminated the warning of the drv_sdhci.c and egularized the code format. The logic of this file has not been essentially modified. Sync and update the .config/rtconfig.h to the latest. Signed-off-by: Chen Wang <[email protected]>
-rw-r--r--bsp/k230/.config11
-rw-r--r--bsp/k230/Kconfig19
-rw-r--r--bsp/k230/applications/mnt.c45
-rw-r--r--bsp/k230/board/Kconfig42
-rw-r--r--bsp/k230/drivers/interdrv/sdio/drv_sdhci.c193
-rw-r--r--bsp/k230/rtconfig.h6
6 files changed, 210 insertions, 106 deletions
diff --git a/bsp/k230/.config b/bsp/k230/.config
index 0eeb0a7b9b..67267cd508 100644
--- a/bsp/k230/.config
+++ b/bsp/k230/.config
@@ -562,6 +562,7 @@ CONFIG_RT_USING_LDSO=y
# CONFIG_ELF_LOAD_RANDOMIZE is not set
CONFIG_LWP_USING_TERMINAL=y
CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
+CONFIG_RT_USING_VDSO=y
#
# Using USB legacy version
@@ -1490,9 +1491,15 @@ CONFIG_PKG_ZLIB_VER="latest"
# Drivers Configuration
#
CONFIG_BSP_USING_HARDLOCK=y
-# CONFIG_BSP_USING_SDIO is not set
+CONFIG_BSP_USING_SDIO=y
+CONFIG_BSP_USING_SDIO0=y
+# CONFIG_BSP_SDIO0_EMMC is not set
+# CONFIG_BSP_SDIO0_1V8 is not set
+# CONFIG_BSP_USING_SDIO1 is not set
+CONFIG_BSP_SD_MNT_DEVNAME="sd0p1"
# end of Drivers Configuration
CONFIG_BOARD_fpgac908=y
CONFIG___STACKSIZE__=65536
-CONFIG_BSP_ROOTFS_TYPE_CROMFS=y
+CONFIG_BSP_ROOTFS_TYPE_ELMFAT=y
+# CONFIG_BSP_ROOTFS_TYPE_CROMFS is not set
diff --git a/bsp/k230/Kconfig b/bsp/k230/Kconfig
index 510dc7c1b3..937ed23cef 100644
--- a/bsp/k230/Kconfig
+++ b/bsp/k230/Kconfig
@@ -25,8 +25,17 @@ config __STACKSIZE__
int "stack size for interrupt"
default 4096
-config BSP_ROOTFS_TYPE_CROMFS
- bool "Use CROMFS as ROOTFS"
- select RT_USING_DFS_CROMFS
- select PKG_USING_ZLIB
- default y
+choice BSP_ROOTFS_TYPE
+ prompt "Root File-System type"
+ default BSP_ROOTFS_TYPE_ELMFAT
+
+ config BSP_ROOTFS_TYPE_ELMFAT
+ bool "Use Elm-chan FAT File-System"
+ select RT_USING_DFS_ELMFAT
+
+ config BSP_ROOTFS_TYPE_CROMFS
+ bool "Use Compressed ROM File-System (ReadOnly)"
+ select RT_USING_DFS_CROMFS
+ select PKG_USING_ZLIB
+ select PKG_USING_ZLIB_LATEST_VERSION
+endchoice
diff --git a/bsp/k230/applications/mnt.c b/bsp/k230/applications/mnt.c
index 931dac0933..3e86c2db03 100644
--- a/bsp/k230/applications/mnt.c
+++ b/bsp/k230/applications/mnt.c
@@ -3,6 +3,7 @@
#ifdef RT_USING_DFS
#include <dfs_fs.h>
+#ifdef BSP_ROOTFS_TYPE_CROMFS
rt_weak uint8_t *cromfs_get_partition_data(uint32_t *len)
{
return RT_NULL;
@@ -21,9 +22,32 @@ static int mnt_cromfs(void)
return ret;
}
+#endif
int mnt_init(void)
{
+#if defined(BSP_USING_SDIO) && defined(BSP_ROOTFS_TYPE_ELMFAT)
+ int timeout = 50; // Timeout after 50 iterations (5 seconds if each iteration waits 100ms)
+ while (mmcsd_wait_cd_changed(100) != MMCSD_HOST_PLUGED)
+ {
+ if (--timeout <= 0)
+ {
+ rt_kprintf("Timeout waiting for MMCSD host to be plugged!\n");
+ return -1; // Return an error code to indicate failure
+ }
+ rt_thread_mdelay(100); // Yield to the scheduler
+ }
+
+ if (dfs_mount(BSP_SD_MNT_DEVNAME, "/", "elm", 0, 0) != 0)
+ {
+ rt_kprintf("%s mounted on / failed!\n", BSP_SD_MNT_DEVNAME);
+ }
+ else {
+ rt_kprintf("%s mounted on / success!\n", BSP_SD_MNT_DEVNAME);
+ }
+#endif
+
+#ifdef BSP_ROOTFS_TYPE_CROMFS
rt_err_t ret;
ret = mnt_cromfs();
@@ -32,27 +56,26 @@ int mnt_init(void)
rt_kprintf("CromFS mount failed!\n");
return ret;
}
+ else
+ {
+ rt_kprintf("CromFS mount success!\n");
+ }
+#endif
mkdir("/dev/shm", 0x777);
if (dfs_mount(RT_NULL, "/dev/shm", "tmp", 0, 0) != 0)
{
- rt_kprintf("Dir /dev/shm mount failed!\n");
+ rt_kprintf("tmpfs mounted on /dev/shm failed!\n");
}
-
-#ifdef BSP_SD_SDIO_DEV
- while (mmcsd_wait_cd_changed(100) != MMCSD_HOST_PLUGED)
- ;
-
- if (dfs_mount(BSP_SD_MNT_DEVNAME, "/mnt", "elm", 0, 0) != 0)
- {
- rt_kprintf("Dir /mnt mount failed!\n");
+ else {
+ rt_kprintf("tmpfs mounted on /dev/shm success!\n");
}
-#endif
rt_kprintf("file system initialization done!\n");
return 0;
}
INIT_ENV_EXPORT(mnt_init);
-#endif
+
+#endif /* RT_USING_DFS */
diff --git a/bsp/k230/board/Kconfig b/bsp/k230/board/Kconfig
index d63ec192f7..f25908a2fd 100644
--- a/bsp/k230/board/Kconfig
+++ b/bsp/k230/board/Kconfig
@@ -7,36 +7,38 @@ menu "Drivers Configuration"
menuconfig BSP_USING_SDIO
bool "Enable SDIO"
select RT_USING_SDIO
- default n
+ default y
if BSP_USING_SDIO
- config BSP_USING_SDIO0
- bool "Enable SDIO0"
- default n
- if BSP_USING_SDIO0
- config BSP_SDIO0_EMMC
- bool "Enable eMMC"
- default y
+ choice BSP_SDIO_DEV
+ prompt "Select SDIO device"
+ default BSP_USING_SDIO0
+ help
+ Select the SDIO device to be used.
- config BSP_SDIO0_1V8
- bool "Enable 1.8V"
+ config BSP_USING_SDIO0
+ bool "Enable SDIO0"
default y
- endif
- config BSP_USING_SDIO1
- bool "Enable SDIO1"
- default y
+ if BSP_USING_SDIO0
+ config BSP_SDIO0_EMMC
+ bool "Enable eMMC"
+ default n
- config BSP_SD_SDIO_DEV
- int "SDIO device SdCard on"
- range 0 1
- default 1
+ config BSP_SDIO0_1V8
+ bool "Enable 1.8V"
+ default n
+ endif
+
+ config BSP_USING_SDIO1
+ bool "Enable SDIO1"
+ default n
+ endchoice
config BSP_SD_MNT_DEVNAME
string "The name of the SD-BlkDev to be mounted"
- default "sd13"
+ default "sd0p1"
endif
-
endmenu
diff --git a/bsp/k230/drivers/interdrv/sdio/drv_sdhci.c b/bsp/k230/drivers/interdrv/sdio/drv_sdhci.c
index cef781ddc5..e506763ef5 100644
--- a/bsp/k230/drivers/interdrv/sdio/drv_sdhci.c
+++ b/bsp/k230/drivers/interdrv/sdio/drv_sdhci.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2025 RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,6 +20,7 @@
#include <string.h>
#include <ioremap.h>
#include <cache.h>
+#include <mm_aspace.h>
#ifdef RT_USING_SDIO
@@ -194,9 +195,11 @@ static void dwcmshc_phy_3_3v_init(struct sdhci_host* host)
static void dwcmshc_phy_delay_config(struct sdhci_host* host)
{
sdhci_writeb(host, 1, DWC_MSHC_COMMDL_CNFG);
- if (host->tx_delay_line > 256) {
+ if (host->tx_delay_line > 256)
+ {
LOG_E("host%d: tx_delay_line err\n", host->index);
- } else if (host->tx_delay_line > 128) {
+ } else if (host->tx_delay_line > 128)
+ {
sdhci_writeb(host, 0x1, DWC_MSHC_SDCLKDL_CNFG);
sdhci_writeb(host, host->tx_delay_line - 128, DWC_MSHC_SDCLKDL_DC);
} else {
@@ -219,7 +222,8 @@ static int dwcmshc_phy_init(struct sdhci_host* host)
/* Disable the clock */
sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
- if (host->io_fixed_1v8) {
+ if (host->io_fixed_1v8)
+ {
uint32_t data = sdhci_readw(host, SDHCI_HOST_CONTROL2);
data |= SDHCI_CTRL_VDD_180;
sdhci_writew(host, data, SDHCI_HOST_CONTROL2);
@@ -231,11 +235,13 @@ static int dwcmshc_phy_init(struct sdhci_host* host)
dwcmshc_phy_delay_config(host);
/* Wait max 150 ms */
- while (1) {
+ while (1)
+ {
reg = sdhci_readl(host, DWC_MSHC_PHY_CNFG);
if (reg & PHY_PWRGOOD)
break;
- if (!timeout) {
+ if (!timeout)
+ {
return -1;
}
timeout--;
@@ -260,8 +266,10 @@ static void sdhci_reset(struct sdhci_host* host, uint8_t mask)
/* Wait max 100 ms */
timeout = 100;
sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET);
- while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) {
- if (timeout == 0) {
+ while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask)
+ {
+ if (timeout == 0)
+ {
LOG_E("%s: Reset 0x%x never completed.\n",
__func__, (int)mask);
return;
@@ -269,8 +277,10 @@ static void sdhci_reset(struct sdhci_host* host, uint8_t mask)
timeout--;
delay_1k(1);
}
- if (mask == SDHCI_RESET_ALL) {
- if (host->index == 0) {
+ if (mask == SDHCI_RESET_ALL)
+ {
+ if (host->index == 0)
+ {
uint16_t emmc_ctl = sdhci_readw(host, EMMC_CTRL_R);
if (host->is_emmc_card)
emmc_ctl |= (1 << CARD_IS_EMMC);
@@ -306,12 +316,14 @@ static void sdhic_error_recovery(struct sdhci_host* sdhci_host)
/* get host present status */
status = sdhci_get_present_status_flag(sdhci_host);
/* check command inhibit status flag */
- if ((status & SDHCI_CMD_INHIBIT) != 0U) {
+ if ((status & SDHCI_CMD_INHIBIT) != 0U)
+ {
/* reset command line */
sdhci_reset(sdhci_host, SDHCI_RESET_CMD);
}
/* check data inhibit status flag */
- if ((status & SDHCI_DATA_INHIBIT) != 0U) {
+ if ((status & SDHCI_DATA_INHIBIT) != 0U)
+ {
/* reset data line */
sdhci_reset(sdhci_host, SDHCI_RESET_DATA);
}
@@ -319,9 +331,11 @@ static void sdhic_error_recovery(struct sdhci_host* sdhci_host)
static rt_err_t sdhci_receive_command_response(struct sdhci_host* sdhci_host, struct sdhci_command* command)
{
- if (command->responseType == card_response_type_r2) {
+ if (command->responseType == card_response_type_r2)
+ {
/* CRC is stripped so we need to do some shifting. */
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 4; i++)
+ {
command->response[3 - i] = sdhci_readl(sdhci_host, SDHCI_RESPONSE + (3 - i) * 4) << 8;
if (i != 3)
command->response[3 - i] |= sdhci_readb(sdhci_host, SDHCI_RESPONSE + (3 - i) * 4 - 1);
@@ -330,9 +344,10 @@ static rt_err_t sdhci_receive_command_response(struct sdhci_host* sdhci_host, st
command->response[0] = sdhci_readl(sdhci_host, SDHCI_RESPONSE);
}
/* check response error flag */
- if ((command->responseErrorFlags != 0U) && ((command->responseType == card_response_type_r1) || (command->responseType == card_response_type_r1b) || (command->responseType == card_response_type_r6) || (command->responseType == card_response_type_r5))) {
+ if ((command->responseErrorFlags != 0U) && ((command->responseType == card_response_type_r1) || (command->responseType == card_response_type_r1b) || (command->responseType == card_response_type_r6) || (command->responseType == card_response_type_r5)))
+ {
if (((command->responseErrorFlags) & (command->response[0U])) != 0U)
- return -1; // kStatus_USDHC_SendCommandFailed;
+ return -1; /* kStatus_USDHC_SendCommandFailed; */
}
return 0;
@@ -347,7 +362,8 @@ static void sdhci_send_command(struct sdhci_host* sdhci_host, struct sdhci_comma
cmd_r = SDHCI_MAKE_CMD(command->index, command->flags);
- if (sdhci_data != RT_NULL) {
+ if (sdhci_data != RT_NULL)
+ {
#ifdef SDHCI_SDMA_ENABLE
rt_ubase_t start_addr, dma_addr;
if (sdhci_data->rxData)
@@ -356,7 +372,7 @@ static void sdhci_send_command(struct sdhci_host* sdhci_host, struct sdhci_comma
start_addr = (rt_ubase_t)((uint8_t*)sdhci_data->txData);
rt_hw_cpu_dcache_clean((void*)start_addr, sdhci_data->blockSize * sdhci_data->blockCount);
command->flags2 |= sdhci_enable_dma_flag;
- dma_addr = rt_kmem_v2p((void*)start_addr);
+ dma_addr = (rt_ubase_t)rt_kmem_v2p((void*)start_addr);
sdhci_writel(sdhci_host, dma_addr, SDHCI_DMA_ADDRESS);
#endif
sdhci_writew(sdhci_host, SDHCI_MAKE_BLKSZ(7, sdhci_data->blockSize), SDHCI_BLOCK_SIZE);
@@ -378,7 +394,8 @@ static rt_err_t sdhci_wait_command_done(struct sdhci_host* sdhci_host, struct sd
/* Wait command complete or USDHC encounters error. */
rt_event_recv(&sdhci_host->event, SDHCI_INT_ERROR | SDHCI_INT_RESPONSE,
RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, RT_WAITING_FOREVER, &event);
- if (event & SDHCI_INT_ERROR) {
+ if (event & SDHCI_INT_ERROR)
+ {
LOG_D("%s: Error detected in status(0x%X)!\n", __func__, sdhci_host->error_code);
return -1;
}
@@ -391,23 +408,28 @@ static rt_err_t sdhci_transfer_data_blocking(struct sdhci_host* sdhci_host, stru
rt_err_t err;
rt_uint32_t event;
- while (1) {
+ while (1)
+ {
err = rt_event_recv(&sdhci_host->event, SDHCI_INT_ERROR | SDHCI_INT_DATA_END | SDHCI_INT_DMA_END,
RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, 1000, &event);
- if (err == -RT_ETIMEOUT) {
+ if (err == -RT_ETIMEOUT)
+ {
rt_kprintf("%s: Transfer data timeout\n", __func__);
return -1;
}
- if (event & SDHCI_INT_ERROR) {
+ if (event & SDHCI_INT_ERROR)
+ {
LOG_D("%s: Error detected in status(0x%X)!\n", __func__, sdhci_host->error_code);
emmc_reg_display(sdhci_host);
return -1;
}
- if (event & SDHCI_INT_DMA_END) {
+ if (event & SDHCI_INT_DMA_END)
+ {
sdhci_writel(sdhci_host, SDHCI_INT_DMA_END, SDHCI_INT_STATUS);
sdhci_writel(sdhci_host, sdhci_readl(sdhci_host, SDHCI_DMA_ADDRESS), SDHCI_DMA_ADDRESS);
}
- if (event & SDHCI_INT_DATA_END) {
+ if (event & SDHCI_INT_DATA_END)
+ {
if (data && data->rxData)
rt_hw_cpu_dcache_invalidate((void*)data->rxData, data->blockSize * data->blockCount);
return 0;
@@ -421,19 +443,24 @@ static rt_err_t sdhci_transfer_data_blocking(struct sdhci_host* sdhci_host, stru
rdy = SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DATA_AVAIL;
mask = SDHCI_DATA_AVAILABLE | SDHCI_SPACE_AVAILABLE;
- while (1) {
+ while (1)
+ {
stat = sdhci_get_int_status_flag(sdhci_host);
- if (stat & SDHCI_INT_ERROR) {
+ if (stat & SDHCI_INT_ERROR)
+ {
LOG_D("%s: Error detected in status(0x%X)!\n", __func__, stat);
emmc_reg_display(sdhci_host);
return -1;
}
- if (stat & rdy) {
- if (!(sdhci_readl(sdhci_host, SDHCI_PRESENT_STATE) & mask)) {
+ if (stat & rdy)
+ {
+ if (!(sdhci_readl(sdhci_host, SDHCI_PRESENT_STATE) & mask))
+ {
continue;
}
sdhci_clear_int_status_flag(sdhci_host, rdy);
- if (data->rxData) {
+ if (data->rxData)
+ {
for (int i = 0; i < data->blockSize / 4; i++)
data->rxData[i + block * data->blockSize] = sdhci_readl(sdhci_host, SDHCI_BUFFER);
} else {
@@ -444,7 +471,8 @@ static rt_err_t sdhci_transfer_data_blocking(struct sdhci_host* sdhci_host, stru
if (block >= data->blockCount)
return 0;
}
- if (timeout == 0) {
+ if (timeout == 0)
+ {
rt_kprintf("%s: Transfer data timeout\n", __func__);
return -1;
}
@@ -458,7 +486,8 @@ static rt_err_t sdhci_set_transfer_config(struct sdhci_host* sdhci_host, struct
{
RT_ASSERT(sdhci_command);
/* Define the flag corresponding to each response type. */
- switch (sdhci_command->responseType) {
+ switch (sdhci_command->responseType)
+ {
case card_response_type_none:
break;
case card_response_type_r1: /* Response 1 */
@@ -487,32 +516,41 @@ static rt_err_t sdhci_set_transfer_config(struct sdhci_host* sdhci_host, struct
break;
}
- if (sdhci_command->type == card_command_type_abort) {
+ if (sdhci_command->type == card_command_type_abort)
+ {
sdhci_command->flags |= sdhci_enable_command_type_abort;
- } else if (sdhci_command->type == card_command_type_resume) {
+ } else if (sdhci_command->type == card_command_type_resume)
+ {
sdhci_command->flags |= sdhci_enable_command_type_resume;
- } else if (sdhci_command->type == card_command_type_suspend) {
+ } else if (sdhci_command->type == card_command_type_suspend)
+ {
sdhci_command->flags |= sdhci_enable_command_type_suspend;
- } else if (sdhci_command->type == card_command_type_normal) {
+ } else if (sdhci_command->type == card_command_type_normal)
+ {
sdhci_command->flags |= sdhci_enable_command_type_normal;
}
- if (sdhci_data) {
+ if (sdhci_data)
+ {
sdhci_command->flags |= sdhci_enable_cmd_data_present_flag;
sdhci_command->flags2 |= sdhci_enable_block_count_flag;
- if (sdhci_data->rxData) {
+ if (sdhci_data->rxData)
+ {
sdhci_command->flags2 |= sdhci_data_read_flag;
}
- if (sdhci_data->blockCount > 1U) {
+ if (sdhci_data->blockCount > 1U)
+ {
sdhci_command->flags2 |= (sdhci_multiple_block_flag);
/* auto command 12 */
- if (sdhci_data->enableAutoCommand12) {
+ if (sdhci_data->enableAutoCommand12)
+ {
/* Enable Auto command 12. */
sdhci_command->flags2 |= sdhci_enable_auto_command12_flag;
}
/* auto command 23 */
- if (sdhci_data->enableAutoCommand23) {
+ if (sdhci_data->enableAutoCommand23)
+ {
sdhci_command->flags2 |= sdhci_enable_auto_command23_flag;
}
}
@@ -529,14 +567,17 @@ static rt_err_t sdhci_transfer_blocking(struct sdhci_host* sdhci_host)
int ret = RT_EOK;
/* Wait until command/data bus out of busy status. */
- while (sdhci_get_present_status_flag(sdhci_host) & sdhci_command_inhibit_flag) {
+ while (sdhci_get_present_status_flag(sdhci_host) & sdhci_command_inhibit_flag)
+ {
}
- while (sdhci_data && (sdhci_get_present_status_flag(sdhci_host) & sdhci_data_inhibit_flag)) {
+ while (sdhci_data && (sdhci_get_present_status_flag(sdhci_host) & sdhci_data_inhibit_flag))
+ {
}
sdhci_writel(sdhci_host, SDHCI_INT_ALL_MASK, SDHCI_INT_STATUS);
ret = sdhci_set_transfer_config(sdhci_host, sdhci_command, sdhci_data);
- if (ret != 0) {
+ if (ret != 0)
+ {
return ret;
}
sdhci_writel(sdhci_host, sdhci_readl(sdhci_host, SDHCI_SIGNAL_ENABLE) |
@@ -546,7 +587,8 @@ static rt_err_t sdhci_transfer_blocking(struct sdhci_host* sdhci_host)
/* wait command done */
ret = sdhci_wait_command_done(sdhci_host, sdhci_command, ((sdhci_data == RT_NULL) ? false : sdhci_data->executeTuning));
/* transfer data */
- if ((sdhci_data != RT_NULL) && (ret == 0)) {
+ if ((sdhci_data != RT_NULL) && (ret == 0))
+ {
ret = sdhci_transfer_data_blocking(sdhci_host, sdhci_data, enDMA);
}
sdhci_writel(sdhci_host, sdhci_readl(sdhci_host, SDHCI_SIGNAL_ENABLE) &
@@ -575,7 +617,8 @@ static void sdhci_irq(int vector, void* param)
struct sdhci_host* host = param;
uint32_t status = sdhci_get_int_status_flag(host);
- if (status & (SDHCI_INT_ERROR | SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | SDHCI_INT_RESPONSE)) {
+ if (status & (SDHCI_INT_ERROR | SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | SDHCI_INT_RESPONSE))
+ {
host->error_code = (status >> 16) & 0xffff;
rt_event_send(&host->event, status & (SDHCI_INT_ERROR | SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | SDHCI_INT_RESPONSE));
}
@@ -614,7 +657,8 @@ static void kd_mmc_request(struct rt_mmcsd_host* host, struct rt_mmcsd_req* req)
else
sdhci_command.type = card_command_type_normal;
- switch (cmd->flags & RESP_MASK) {
+ switch (cmd->flags & RESP_MASK)
+ {
case RESP_NONE:
sdhci_command.responseType = card_response_type_none;
break;
@@ -651,7 +695,8 @@ static void kd_mmc_request(struct rt_mmcsd_host* host, struct rt_mmcsd_req* req)
sdhci_command.responseErrorFlags = 0;
mmcsd->sdhci_command = &sdhci_command;
- if (data) {
+ if (data)
+ {
if (req->stop != RT_NULL)
sdhci_data.enableAutoCommand12 = true;
else
@@ -662,7 +707,8 @@ static void kd_mmc_request(struct rt_mmcsd_host* host, struct rt_mmcsd_req* req)
sdhci_data.blockSize = data->blksize;
sdhci_data.blockCount = data->blks;
- if (data->flags == DATA_DIR_WRITE) {
+ if (data->flags == DATA_DIR_WRITE)
+ {
sdhci_data.txData = data->buf;
sdhci_data.rxData = RT_NULL;
} else {
@@ -674,11 +720,13 @@ static void kd_mmc_request(struct rt_mmcsd_host* host, struct rt_mmcsd_req* req)
uint32_t pad = 0;
if (sz & (CACHE_LINESIZE - 1))
pad = (sz + (CACHE_LINESIZE - 1)) & ~(CACHE_LINESIZE - 1);
- if (sdhci_data.rxData && (((uint64_t)(sdhci_data.rxData) & (CACHE_LINESIZE - 1)) || pad)) {
+ if (sdhci_data.rxData && (((uint64_t)(sdhci_data.rxData) & (CACHE_LINESIZE - 1)) || pad))
+ {
sdhci_data.rxData = rt_malloc_align(pad ? pad : sz, CACHE_LINESIZE);
- } else if (((uint64_t)(sdhci_data.txData) & (CACHE_LINESIZE - 1)) || pad) {
+ } else if (((uint64_t)(sdhci_data.txData) & (CACHE_LINESIZE - 1)) || pad)
+ {
sdhci_data.txData = rt_malloc_align(pad ? pad : sz, CACHE_LINESIZE);
- rt_memcpy(sdhci_data.txData, data->buf, sz);
+ rt_memcpy((void *)sdhci_data.txData, data->buf, sz);
}
#endif
mmcsd->sdhci_data = &sdhci_data;
@@ -687,19 +735,23 @@ static void kd_mmc_request(struct rt_mmcsd_host* host, struct rt_mmcsd_req* req)
}
error = sdhci_transfer_blocking(mmcsd);
#ifdef SDHCI_SDMA_ENABLE
- if (data && sdhci_data.rxData && sdhci_data.rxData != data->buf) {
+ if (data && sdhci_data.rxData && sdhci_data.rxData != data->buf)
+ {
rt_memcpy(data->buf, sdhci_data.rxData, sdhci_data.blockSize * sdhci_data.blockCount);
rt_free_align(sdhci_data.rxData);
- } else if (data && sdhci_data.txData && sdhci_data.txData != data->buf) {
- rt_free_align(sdhci_data.txData);
+ } else if (data && sdhci_data.txData && sdhci_data.txData != data->buf)
+ {
+ rt_free_align((void *)sdhci_data.txData);
}
#endif
- if (error == -1) {
+ if (error == -1)
+ {
LOG_D(" ***USDHC_TransferBlocking error: %d*** --> \n", error);
cmd->err = -RT_ERROR;
}
- if ((cmd->flags & RESP_MASK) == RESP_R2) {
+ if ((cmd->flags & RESP_MASK) == RESP_R2)
+ {
cmd->resp[3] = sdhci_command.response[0];
cmd->resp[2] = sdhci_command.response[1];
cmd->resp[1] = sdhci_command.response[2];
@@ -724,10 +776,12 @@ static void kd_mmc_clock_freq_change(struct sdhci_host* host, uint32_t clock)
if (clock == 0)
return;
- if (host->max_clk <= clock) {
+ if (host->max_clk <= clock)
+ {
div = 1;
} else {
- for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) {
+ for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2)
+ {
if ((host->max_clk / div) <= clock)
break;
}
@@ -803,12 +857,15 @@ void kd_sdhci0_reset(int value)
sdhci_writeb(host, emmc_ctl, EMMC_CTRL_R);
}
-void kd_sdhci_change(int id)
+void kd_sdhci_change(void)
{
- if (id == 0)
+#ifdef BSP_USING_SDIO0
mmcsd_change(sdhci_host0->host);
- else if (id == 1)
+#endif
+
+#ifdef BSP_USING_SDIO1
mmcsd_change(sdhci_host1->host);
+#endif
}
rt_int32_t kd_sdhci_init(void)
@@ -850,7 +907,8 @@ rt_int32_t kd_sdhci_init(void)
rt_hw_interrupt_umask(IRQN_SD0);
struct rt_mmcsd_host* mmcsd_host0 = mmcsd_alloc_host();
- if (!mmcsd_host0) {
+ if (!mmcsd_host0)
+ {
rt_free(sdhci_host0);
return -1;
}
@@ -900,7 +958,8 @@ rt_int32_t kd_sdhci_init(void)
rt_hw_interrupt_umask(IRQN_SD1);
struct rt_mmcsd_host* mmcsd_host1 = mmcsd_alloc_host();
- if (!mmcsd_host1) {
+ if (!mmcsd_host1)
+ {
rt_free(sdhci_host1);
return -2;
}
@@ -917,9 +976,9 @@ rt_int32_t kd_sdhci_init(void)
mmcsd_host1->private_data = sdhci_host1;
sdhci_host1->host = mmcsd_host1;
#endif
-#ifdef BSP_SD_SDIO_DEV
- kd_sdhci_change(BSP_SD_SDIO_DEV);
-#endif
+
+ kd_sdhci_change();
+
rt_iounmap(hi_sys_virt_addr);
return 0;
}
@@ -927,4 +986,4 @@ INIT_DEVICE_EXPORT(kd_sdhci_init);
#endif /*defined(BSP_USING_SDIO0) || defined(BSP_USING_SDIO1)*/
-#endif /*defined(RT_USING_SDIO)*/
+#endif /*defined(RT_USING_SDIO)*/ \ No newline at end of file
diff --git a/bsp/k230/rtconfig.h b/bsp/k230/rtconfig.h
index 378b69b28f..29862596a1 100644
--- a/bsp/k230/rtconfig.h
+++ b/bsp/k230/rtconfig.h
@@ -368,6 +368,7 @@
#define RT_USING_LDSO
#define LWP_USING_TERMINAL
#define LWP_PTY_MAX_PARIS_LIMIT 64
+#define RT_USING_VDSO
/* Using USB legacy version */
@@ -560,9 +561,12 @@
/* Drivers Configuration */
#define BSP_USING_HARDLOCK
+#define BSP_USING_SDIO
+#define BSP_USING_SDIO0
+#define BSP_SD_MNT_DEVNAME "sd0p1"
/* end of Drivers Configuration */
#define BOARD_fpgac908
#define __STACKSIZE__ 65536
-#define BSP_ROOTFS_TYPE_CROMFS
+#define BSP_ROOTFS_TYPE_ELMFAT
#endif