v1.0.2: fitimage for demo88 mmc

2025-12-13 18:08:54 +00:00 · 2023-12-12 14:23:53 +08:00
parent 3b4064f334
commit da098fba4d
9 changed files with 281 additions and 130 deletions
--- a/application/baremetal/bootloader/cmd/SConscript
+++ b/application/baremetal/bootloader/cmd/SConscript
@@ -19,8 +19,10 @@ if GetDepend('AIC_BOOTLOADER_CMD_NOR_BOOT') and not GetDepend('LPKG_USING_FDTLIB
 	src     += Glob('nor_boot_no_fitimage.c')
 if GetDepend('AIC_BOOTLOADER_CMD_NAND_BOOT'):
 	src     += Glob('nand_boot.c')
-if GetDepend('AIC_BOOTLOADER_CMD_MMC_BOOT'):
+if GetDepend('AIC_BOOTLOADER_CMD_MMC_BOOT') and GetDepend('LPKG_USING_FDTLIB'):
 	src     += Glob('mmc_boot.c')
+if GetDepend('AIC_BOOTLOADER_CMD_MMC_BOOT') and not GetDepend('LPKG_USING_FDTLIB'):
+	src     += Glob('mmc_boot_no_fitimage.c')
 if GetDepend('AIC_BOOTLOADER_CMD_PSRAM_TEST'):
 	src     += Glob('psram_test.c')
 if GetDepend('AIC_BOOTLOADER_CMD_XIP_BOOT'):
--- a/application/baremetal/bootloader/cmd/mmc_boot.c
+++ b/application/baremetal/bootloader/cmd/mmc_boot.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <boot.h>
 #include <hexdump.h>
+#include "fitimage.h"

 #define APPLICATION_PART "os"
 #define MMC_BOOT_CONTROL_ID 0
@@ -24,12 +25,10 @@
 static int do_mmc_boot(int argc, char *argv[])
 {
    int ret = 0, mmc_id = MMC_BOOT_CONTROL_ID;
-    struct image_header *head = NULL;
    struct aic_sdmc *host = NULL;
    struct aic_partition *part = NULL, *parts = NULL;
-    void *la;
-    u64 blkstart, blkcnt;
-    u32 start_us;
+    struct spl_load_info info;
+    ulong entry_point;

    ret = mmc_init(mmc_id);
    if (ret) {
@@ -62,39 +61,20 @@ static int do_mmc_boot(int argc, char *argv[])
        goto out;
    }

-    head = malloc(MMC_BLOCK_SIZE);
-    blkstart = part->start / MMC_BLOCK_SIZE;
-    ret = mmc_bread(host, blkstart, 1, (void *)head);
-    if (ret < 0) {
-        printf("Read image header failed.\n");
+    info.dev = (void *)host;
+    info.priv = (void *)part;
+    info.dev_type = DEVICE_MMC;
+    info.bl_len = MMC_BLOCK_SIZE;
+
+    ret = spl_load_simple_fit(&info, &entry_point);
+    if (ret < 0)
        goto out;
-    }

-    ret = image_verify_magic((void *)head, AIC_IMAGE_MAGIC);
-    if (ret) {
-        printf("Application header is unknown.\n");
-        goto out;
-    }
-
-    la = (void *)(unsigned long)head->load_address;
-
-    start_us =  aic_get_time_us();
-    blkcnt = ROUNDUP(head->image_len, MMC_BLOCK_SIZE) / MMC_BLOCK_SIZE;
-    ret = mmc_bread(host, blkstart, blkcnt, la);
-    show_speed("mmc read speed", head->image_len, aic_get_time_us() - start_us);
-
-    if (ret < 0) {
-        printf("Read image failed.\n");
-        goto out;
-    }
-
-    boot_app(la);
+    boot_app((void *)entry_point);

 out:
    if (parts)
        mmc_free_partition(parts);
-    if (head)
-        free(head);
    return ret;
 }

--- a/application/baremetal/bootloader/cmd/mmc_boot_no_fitimage.c
+++ b/application/baremetal/bootloader/cmd/mmc_boot_no_fitimage.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2023, Artinchip Technology Co., Ltd
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Wu Dehuang <dehuang.wu@artinchip.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <console.h>
+#include <aic_common.h>
+#include <aic_errno.h>
+#include <mmc.h>
+#include <image.h>
+#include <boot.h>
+#include <hexdump.h>
+
+#define APPLICATION_PART "os"
+#define MMC_BOOT_CONTROL_ID 0
+
+static int do_mmc_boot(int argc, char *argv[])
+{
+    int ret = 0, mmc_id = MMC_BOOT_CONTROL_ID;
+    struct image_header *head = NULL;
+    struct aic_sdmc *host = NULL;
+    struct aic_partition *part = NULL, *parts = NULL;
+    void *la;
+    u64 blkstart, blkcnt;
+    u32 start_us;
+
+    ret = mmc_init(mmc_id);
+    if (ret) {
+        printf("sdmc %d init failed.\n", mmc_id);
+        return ret;
+    }
+
+    host = find_mmc_dev_by_index(mmc_id);
+    if (!host) {
+        pr_err("find mmc dev failed.\n");
+        return -1;
+    }
+
+    parts = mmc_create_gpt_part();
+    if (!parts) {
+        pr_err("sdmc %d create gpt part failed.\n", mmc_id);
+        goto out;
+    }
+
+    part = parts;
+    while (part) {
+        if (!strcmp(part->name, APPLICATION_PART))
+            break;
+
+        part = part->next;
+    }
+
+    if (!part) {
+        printf("Failed to get application partition.\n");
+        goto out;
+    }
+
+    head = malloc(MMC_BLOCK_SIZE);
+    blkstart = part->start / MMC_BLOCK_SIZE;
+    ret = mmc_bread(host, blkstart, 1, (void *)head);
+    if (ret < 0) {
+        printf("Read image header failed.\n");
+        goto out;
+    }
+
+    ret = image_verify_magic((void *)head, AIC_IMAGE_MAGIC);
+    if (ret) {
+        printf("Application header is unknown.\n");
+        goto out;
+    }
+
+    la = (void *)(unsigned long)head->load_address;
+
+    start_us =  aic_get_time_us();
+    blkcnt = ROUNDUP(head->image_len, MMC_BLOCK_SIZE) / MMC_BLOCK_SIZE;
+    ret = mmc_bread(host, blkstart, blkcnt, la);
+    show_speed("mmc read speed", head->image_len, aic_get_time_us() - start_us);
+
+    if (ret < 0) {
+        printf("Read image failed.\n");
+        goto out;
+    }
+
+    boot_app(la);
+
+out:
+    if (parts)
+        mmc_free_partition(parts);
+    if (head)
+        free(head);
+    return ret;
+}
+
+CONSOLE_CMD(mmc_boot, do_mmc_boot, "Boot from eMMC/SD.");
--- a/application/baremetal/bootloader/include/fitimage.h
+++ b/application/baremetal/bootloader/include/fitimage.h
@@ -17,6 +17,13 @@ struct spl_fit_info {
    int conf_node;      /* FDT offset to selected configuration node */
 };

+typedef enum
+{
+    DEVICE_MMC,
+    DEVICE_SPINAND,
+    DEVICE_SPINOR,
+} boot_dev_type;
+
 /**
 * Information required to load data from a device
 *
@@ -27,6 +34,7 @@ struct spl_fit_info {
 struct spl_load_info {
    void *dev;
    void *priv;
+    boot_dev_type dev_type;
    int bl_len;
 };

--- a/application/baremetal/bootloader/lib/fitimage/fitimage.c
+++ b/application/baremetal/bootloader/lib/fitimage/fitimage.c
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <mtd.h>
+#include <mmc.h>
 #include <aic_core.h>
 #include <libfdt.h>
 #include <hexdump.h>
@@ -105,10 +106,8 @@ int spl_fit_get_image_name(const struct spl_fit_info *ctx,
        }
    }

-    if (!found) {
-        printf("no string for index %d\n", index);
+    if (!found)
        return -1;
-    }

    *outname = str;
    return 0;
@@ -238,15 +237,42 @@ int fit_image_get_entry(const void *fit, int noffset, ulong *entry)
    return fit_image_get_address(fit, noffset, FIT_ENTRY_PROP, entry);
 }

+static int spl_read(struct spl_load_info *info, ulong offset, void *buf, int size)
+{
+    int rdlen = 0;
+
+    if (info->dev_type == DEVICE_SPINAND || info->dev_type == DEVICE_SPINOR) {
+#if defined(AIC_MTD_BARE_DRV)
+        struct mtd_dev *mtd = (struct mtd_dev *)info->dev;
+
+        rdlen = mtd_read(mtd, offset, buf, size);
+#endif
+    } else if (info->dev_type == DEVICE_MMC) {
+#if defined(AIC_SDMC_DRV)
+        int blkcnt, blkstart, blkoffset, byte_offset;
+        struct aic_sdmc *host = (struct aic_sdmc *)info->dev;
+        struct aic_partition *part = (struct aic_partition *)info->priv;
+
+        blkstart = part->start / info->bl_len;
+        blkoffset = offset / info->bl_len;
+        byte_offset = offset % info->bl_len;
+        blkcnt = ALIGN_UP(size, info->bl_len)  / info->bl_len;
+        blkcnt = mmc_bread(host, blkstart + blkoffset, blkcnt, (u8 *)(buf - byte_offset));
+        rdlen = info->bl_len * blkcnt;
+        rdlen = min(rdlen, size);
+#endif
+    }
+
+    return rdlen;
+}
+
 int spl_load_fit_image(struct spl_load_info *info, struct spl_fit_info *ctx, int node, ulong *entry_point)
 {
    ulong load_addr = 0;
    unsigned int length;
    int ret, offset = 0;
-    int start_offset, overhead, read_length;
    const void *fit = ctx->fit;
    bool external_data = false;
-    struct mtd_dev *mtd = (struct mtd_dev *)info->dev;
    u64 start_us;

    if (fit_image_get_load(fit, node, &load_addr))
@@ -270,17 +296,19 @@ int spl_load_fit_image(struct spl_load_info *info, struct spl_fit_info *ctx, int
        if (fit_image_get_data_size(fit, node, &length))
            return -1;

-        start_offset = ALIGN_DOWN(offset, info->bl_len);
-        overhead = offset - start_offset;
-        read_length = ALIGN_UP(offset + length, info->bl_len) - start_offset;
-
        start_us =  aic_get_time_us();
-        ret = mtd_read(mtd, start_offset, (u8 *)(load_addr - overhead), read_length);
-        show_speed("mtd read", read_length, aic_get_time_us() - start_us);
+        ret = spl_read(info, offset, (u8 *)load_addr, length);
+        show_speed("spl read", length, aic_get_time_us() - start_us);
+
+#ifdef CRC32_MTD_READ
+        unsigned int crc32_val = crc32(0, NULL, 0);
+        crc32_val = crc32(crc32_val, (u8 *)load_addr, length);
+        printf("mtd read crc32 = 0x%x KB/s\n", crc32_val);
+#endif

        if (ret < 0)
        {
-            printf("mtd read external_data error\n");
+            printf("spl read external_data error\n");
            return -1;
        }
    }
@@ -304,37 +332,51 @@ int spl_load_fit_image(struct spl_load_info *info, struct spl_fit_info *ctx, int

 int spl_load_simple_fit(struct spl_load_info *info, ulong *entry_point)
 {
-    struct fdt_header header;
+    struct fdt_header *header;
    struct spl_fit_info ctx;
    void *buf = NULL;
-    int size, ret = 0;
+    int size, buf_size, ret = 0;
    int index = 0, node = -1;
-    struct mtd_dev *mtd = (struct mtd_dev *)info->dev;

-    ret = mtd_read(mtd, 0, (void *)&header, sizeof(header));
+    header = aicos_malloc(MEM_DEFAULT,
+                          ALIGN_UP(sizeof(struct fdt_header), info->bl_len));
+    if (!header)
+    {
+        printf("No space to malloc for header\n");
+        return -1;
+    }
+
+    /* read itb tree header, to parse itb tree totalsize */
+    ret = spl_read(info, 0, (void *)header, sizeof(struct fdt_header));
    if (ret < 0)
    {
-        printf("mtd read header error\n");
-        return -1;
+        printf("spl read header error\n");
+        goto __exit_header;
    }

-    if (fdt_magic(&header) != FDT_MAGIC)
+    if (fdt_magic(header) != FDT_MAGIC)
    {
        printf("Not found FIT\n");
-        return -1;
+        goto __exit_header;
    }

-    size = FIT_ALIGN(fdt_totalsize(&header), 4);
+    size = FIT_ALIGN(fdt_totalsize(header), 4);
    ctx.ext_data_offset = size;

+    if (info->dev_type == DEVICE_MMC) {
+        buf_size = ROUNDUP(size, info->bl_len);
+        size = buf_size;
+    }
+
    buf = aicos_malloc(MEM_DEFAULT, size);
    if (!buf)
    {
        printf("No space to malloc for itb\n");
-        return -1;
+        goto __exit_header;
    }

-    ret = mtd_read(mtd, 0, buf, size);
+    /* read itb tree */
+    ret = spl_read(info, 0, buf, size);
    if (ret < 0)
    {
        printf("mtd read itb error\n");
@@ -381,5 +423,7 @@ int spl_load_simple_fit(struct spl_load_info *info, ulong *entry_point)

 __exit:
    aicos_free(MEM_DEFAULT, buf);
+__exit_header:
+    aicos_free(MEM_DEFAULT, header);
    return ret;
 }
--- a/target/configs/d21x_demo88-mmc_baremetal_bootloader_defconfig
+++ b/target/configs/d21x_demo88-mmc_baremetal_bootloader_defconfig
@@ -87,10 +87,6 @@ CONFIG_AIC_SDMC_DRV_VER="10"
 # Board options
 #

-#
-# Peripheral Devices:
-#
-
 #
 # Interface Related:
 #
@@ -126,6 +122,9 @@ CONFIG_AIC_DEV_UART0_RX_MODE=0
 # CONFIG_AIC_USING_PWM1 is not set
 # CONFIG_AIC_USING_PWM2 is not set
 # CONFIG_AIC_USING_PWM3 is not set
+# CONFIG_AIC_USING_HRTIMER0 is not set
+# CONFIG_AIC_USING_HRTIMER1 is not set
+# CONFIG_AIC_USING_HRTIMER2 is not set
 # CONFIG_AIC_USING_CAN0 is not set
 # CONFIG_AIC_USING_CAN1 is not set
 # CONFIG_AIC_USING_CIR is not set
@@ -155,6 +154,7 @@ CONFIG_AIC_SDMC0_SMP_PHASE=0
 #
 # SDMC1 Parameter
 #
+# CONFIG_AIC_SD_USING_HOTPLUG is not set
 # CONFIG_AIC_SDMC1_IS_SDIO is not set
 CONFIG_AIC_SDMC1_DRV_PHASE=3
 CONFIG_AIC_SDMC1_SMP_PHASE=0
@@ -179,11 +179,6 @@ CONFIG_AIC_SDMC1_SMP_PHASE=0
 #
 # CONFIG_AIC_USING_DE is not set
 # CONFIG_AIC_USING_GE is not set
-
-#
-# Graphics Engine Parameter
-#
-CONFIG_AIC_GE_DITHER=y
 # CONFIG_AIC_USING_VE is not set
 # CONFIG_AIC_USING_DVP is not set

@@ -218,6 +213,19 @@ CONFIG_AIC_DRAM_CMA_SIZE=0x0
 #
 # Clocks Options
 #
+CONFIG_AIC_CLK_PLL_INT0_FREQ=600000000
+CONFIG_AIC_CLK_PLL_INT1_FREQ=1200000000
+CONFIG_AIC_CLK_PLL_FRA1_FREQ=491520000
+CONFIG_AIC_CLK_PLL_FRA2_FREQ=840000000
+# CONFIG_AIC_CLK_PLL_FRA2_SSC_DIS is not set
+CONFIG_AIC_CLK_CPU_FREQ=600000000
+CONFIG_AIC_CLK_AXI0_FREQ=240000000
+CONFIG_AIC_CLK_AHB0_FREQ=240000000
+CONFIG_AIC_CLK_APB0_FREQ=100000000
+# CONFIG_AIC_USING_CLK_OUT0 is not set
+# CONFIG_AIC_USING_CLK_OUT1 is not set
+# CONFIG_AIC_USING_CLK_OUT2 is not set
+# CONFIG_AIC_USING_CLK_OUT3 is not set
 # CONFIG_AIC_USING_PM is not set

 #
@@ -228,6 +236,18 @@ CONFIG_AIC_DRAM_CMA_SIZE=0x0
 # CONFIG_AIC_USING_CE is not set
 # CONFIG_AIC_USING_MTOP is not set

+#
+# Baremetal options
+#
+CONFIG_KERNEL_BAREMETAL=y
+CONFIG_DRIVER_HAL_EN=y
+CONFIG_DRIVER_BARE_DRV_EN=y
+CONFIG_AIC_NORMALSTACK_SIZE=8092
+CONFIG_ARCH_RISCV=y
+CONFIG_ARCH_RISCV_FPU=y
+CONFIG_ARCH_RISCV_FPU_D=y
+CONFIG_ARCH_RISCV64=y
+
 #
 # Bootloader options
 #
@@ -245,6 +265,7 @@ CONFIG_AIC_BOOTLOADER_MMC_SUPPORT=y
 # CONFIG_AIC_BOOTLOADER_SPINOR_SUPPORT is not set
 # CONFIG_AIC_BOOTLOADER_SPINAND_SUPPORT is not set
 # CONFIG_AIC_BOOTLOADER_PSRAM_EN is not set
+# CONFIG_AIC_BOOTLOADER_AXICFG_SUPPORT is not set
 CONFIG_AIC_BOOT_USB_DRV=y
 # CONFIG_AIC_BOOT_USBH_DRV is not set
 # CONFIG_AIC_BOOTLOADER_UDISK_SUPPORT is not set
@@ -257,7 +278,6 @@ CONFIG_AIC_BOOTLOADER_FATFS_SUPPORT=y
 #
 # Upgrading
 #
-CONFIG_AIC_BOOTLOADER_UPGBOOT_PIN="PA.0"
 CONFIG_AICUPG_UART_ENABLE=y
 CONFIG_AICUPG_USB_ENABLE=y
 # CONFIG_AICUPG_USB_DMA_ENABLE is not set
@@ -277,26 +297,9 @@ CONFIG_AIC_BOOTLOADER_CMD_MEM=y
 # Debug
 #
 # CONFIG_AICUPG_DEBUG is not set
+# CONFIG_AICUPG_UART_DEBUG is not set
 # CONFIG_AIC_SHOW_BOOT_TIME is not set

-#
-# Baremetal options
-#
-CONFIG_KERNEL_BAREMETAL=y
-CONFIG_DRIVER_HAL_EN=y
-CONFIG_DRIVER_BARE_DRV_EN=y
-CONFIG_AIC_NORMALSTACK_SIZE=8092
-CONFIG_ARCH_RISCV=y
-CONFIG_ARCH_RISCV_FPU=y
-CONFIG_ARCH_RISCV_FPU_D=y
-CONFIG_ARCH_RISCV64=y
-# CONFIG_AIC_BAREMETAL_LOG_NONE is not set
-# CONFIG_AIC_BAREMETAL_LOG_ERR is not set
-CONFIG_AIC_BAREMETAL_LOG_WARN=y
-# CONFIG_AIC_BAREMETAL_LOG_INFO is not set
-# CONFIG_AIC_BAREMETAL_LOG_DEBUG is not set
-CONFIG_AIC_BAREMETAL_LOG_LEVEL=4
-
 #
 # Local packages options
 #
@@ -309,6 +312,8 @@ CONFIG_AIC_BAREMETAL_LOG_LEVEL=4
 # CONFIG_LPKG_USING_CHERRYUSB is not set
 # CONFIG_LPKG_USING_LVGL is not set
 # CONFIG_LPKG_USING_LV_MUSIC_DEMO is not set
+# CONFIG_LPKG_USING_AWTK is not set
+# CONFIG_AIC_TOUCH_PANEL_GT911 is not set
 # CONFIG_LPKG_USING_LWIP is not set
 # CONFIG_LPKG_USING_DFS_UFFS is not set
 # CONFIG_LPKG_USING_LITTLEFS is not set
@@ -325,13 +330,22 @@ CONFIG_AIC_BAREMETAL_LOG_LEVEL=4
 # CONFIG_LPKG_USING_I2C_TOOLS is not set
 # CONFIG_LPKG_USING_BEEP is not set
 # CONFIG_LPKG_USING_MEMLEAK_CHECK is not set
+# CONFIG_LPKG_USING_WEBCLIENT is not set
+# CONFIG_LPKG_USING_OTA_DOWNLOADER is not set
+# CONFIG_LPKG_USING_RPMSG_LITE is not set
+# CONFIG_LPKG_RPMSG_LITE_CUSTOM_CONFIG is not set
+# CONFIG_LPKG_USING_FREETYPE is not set
 # CONFIG_LPKG_USING_DFS is not set
 # CONFIG_LPKG_USING_MAD is not set
+CONFIG_LPKG_USING_FDTLIB=y

 #
 # ArtInChip packages options
 #
 # CONFIG_LPKG_MPP is not set
+CONFIG_LPKG_USING_ENV=y
+# CONFIG_AIC_ENV_INTERFACE is not set
+# CONFIG_LPKG_USING_PINMUX_CHECHK is not set

 #
 # Drivers options
@@ -356,7 +370,22 @@ CONFIG_AIC_UMM_HEAP_BARE_DRV=y
 # Peripheral
 #
 CONFIG_LPKG_USING_SPINAND=y
+# CONFIG_SPI_NAND_DOSILICON is not set
+# CONFIG_SPI_NAND_ETRON is not set
+# CONFIG_SPI_NAND_MICRON is not set
+# CONFIG_SPI_NAND_MACRONIX is not set
+CONFIG_SPI_NAND_WINBOND=y
+# CONFIG_SPI_NAND_GIGADEVICE is not set
+# CONFIG_SPI_NAND_TOSHIBA is not set
+# CONFIG_SPI_NAND_FORESEE is not set
+# CONFIG_SPI_NAND_XTX is not set
+# CONFIG_SPI_NAND_ZETTA is not set
+# CONFIG_SPI_NAND_ZBIT is not set
+# CONFIG_SPI_NAND_ESMT is not set
+# CONFIG_SPI_NAND_UMTEK is not set
+# CONFIG_SPI_NAND_QUANXING is not set
 # CONFIG_LPKG_USING_SFUD is not set
+# CONFIG_AIC_NFTL_SUPPORT is not set
 CONFIG_AIC_WIRELESS_LAN=y
 CONFIG_WLAN_REALTEK=y
 # CONFIG_RTL8733_WLAN_DRV is not set
@@ -370,7 +399,6 @@ CONFIG_WLAN_REALTEK=y
 #
 # Gt911 touch panel options
 #
-# CONFIG_AIC_TOUCH_PANEL_GT911 is not set

 #
 # External Audio Codec Support
@@ -380,6 +408,12 @@ CONFIG_WLAN_REALTEK=y
 #
 # Drivers debug
 #
+# CONFIG_AIC_LOG_LEVEL_NONE is not set
+# CONFIG_AIC_LOG_LEVEL_ERR is not set
+CONFIG_AIC_LOG_LEVEL_WARN=y
+# CONFIG_AIC_LOG_LEVEL_INFO is not set
+# CONFIG_AIC_LOG_LEVEL_DEBUG is not set
+CONFIG_AIC_LOG_LEVEL=4
 # CONFIG_AIC_CMU_DRV_DEBUG is not set
 # CONFIG_AIC_GPIO_DRV_DEBUG is not set
 # CONFIG_AIC_DMA_DRV_DEBUG is not set
@@ -396,4 +430,5 @@ CONFIG_WLAN_REALTEK=y
 # CONFIG_AIC_RTC_DRV_TEST is not set
 CONFIG_AIC_SDMC_DRV_TEST=y
 # CONFIG_AIC_FILE_CRC32_TEST is not set
+# CONFIG_AIC_MTD_LOAD_FILE_TEST is not set
 # CONFIG_AIC_WDT_DRV_TEST is not set
--- a/target/configs/d21x_demo88-mmc_rt-thread_helloworld_defconfig
+++ b/target/configs/d21x_demo88-mmc_rt-thread_helloworld_defconfig
@@ -65,10 +65,7 @@ CONFIG_AIC_UART_DRV=y
 CONFIG_AIC_UART_DRV_V10=y
 CONFIG_AIC_UART_DRV_VER="10"
 CONFIG_AIC_UART_DEV_NUM=8
-CONFIG_AIC_I2C_DRV=y
-CONFIG_AIC_I2C_DRV_V10=y
-CONFIG_AIC_I2C_DRV_VER="10"
-CONFIG_AIC_I2C_CH_NUM=4
+# CONFIG_AIC_I2C_DRV is not set
 CONFIG_AIC_QSPI_DRV=y
 CONFIG_AIC_QSPI_DRV_V10=y
 CONFIG_AIC_QSPI_DRV_VER="10"
@@ -103,7 +100,9 @@ CONFIG_AIC_VE_DRV_VER="10"
 CONFIG_AIC_ADCIM_DRV=y
 CONFIG_AIC_ADCIM_DRV_V10=y
 CONFIG_AIC_ADCIM_DRV_VER="10"
-# CONFIG_AIC_RTP_DRV is not set
+CONFIG_AIC_RTP_DRV=y
+CONFIG_AIC_RTP_DRV_V10=y
+CONFIG_AIC_RTP_DRV_VER="10"
 CONFIG_AIC_TSEN_DRV=y
 CONFIG_AIC_TSEN_DRV_V10=y
 CONFIG_AIC_TSEN_DRV_VER="10"
@@ -176,13 +175,7 @@ CONFIG_AIC_DEV_UART1_MODE=0
 # CONFIG_AIC_USING_I2C0 is not set
 # CONFIG_AIC_USING_I2C1 is not set
 # CONFIG_AIC_USING_I2C2 is not set
-CONFIG_AIC_USING_I2C3=y
-
-#
-# I2c3 Parameter
-#
-CONFIG_AIC_DEV_I2C3_MASTER=y
-# CONFIG_AIC_DEV_I2C3_SLAVE is not set
+# CONFIG_AIC_USING_I2C3 is not set
 # CONFIG_AIC_USING_PWM0 is not set
 # CONFIG_AIC_USING_PWM1 is not set
 # CONFIG_AIC_USING_PWM2 is not set
@@ -236,7 +229,17 @@ CONFIG_AIC_SDMC1_SMP_PHASE=0
 #
 # Analog Related:
 #
-# CONFIG_AIC_USING_RTP is not set
+CONFIG_AIC_USING_RTP=y
+
+#
+# RTP parameter
+#
+CONFIG_AIC_RTP_PERIOD_MS=15
+CONFIG_AIC_RTP_MAX_PRESSURE=800
+CONFIG_AIC_RTP_X_PLATE=235
+CONFIG_AIC_RTP_Y_PLATE=0
+CONFIG_AIC_RTP_PDEB=0xffffffff
+CONFIG_AIC_RTP_DELAY=0x4f00004f
 CONFIG_AIC_USING_TSEN=y
 # CONFIG_AIC_USING_GPAI0 is not set
 # CONFIG_AIC_USING_GPAI1 is not set
@@ -343,20 +346,7 @@ CONFIG_AIC_USING_VE=y
 # Camera Support
 #
 # CONFIG_AIC_USING_CAMERA is not set
-CONFIG_AIC_USING_AUDIO=y
-
-#
-# Audio Parameter
-#
-CONFIG_AIC_AUDIO_PLAYBACK=y
-CONFIG_AIC_AUDIO_PA_ENABLE_GPIO="PA.7"
-CONFIG_AIC_AUDIO_EN_PIN_HIGH=y
-# CONFIG_AIC_AUDIO_EN_PIN_LOW is not set
-# CONFIG_AIC_AUDIO_SPK_0 is not set
-CONFIG_AIC_AUDIO_SPK_1=y
-# CONFIG_AIC_AUDIO_SPK_0_1 is not set
-CONFIG_AIC_AUDIO_DMIC=y
-# CONFIG_AIC_AUDIO_AMIC is not set
+# CONFIG_AIC_USING_AUDIO is not set

 #
 # System Related:
@@ -518,6 +508,7 @@ CONFIG_RT_USING_FINSH=y
 CONFIG_FINSH_USING_MSH=y
 CONFIG_FINSH_THREAD_NAME="tshell"
 CONFIG_FINSH_PROMPT_NAME="aic"
+# CONFIG_FINSH_POLL_MODE is not set
 CONFIG_FINSH_THREAD_PRIORITY=20
 CONFIG_FINSH_THREAD_STACK_SIZE=4096
 CONFIG_FINSH_USING_HISTORY=y
@@ -625,7 +616,7 @@ CONFIG_RT_AUDIO_RECORD_PIPE_SIZE=2048
 CONFIG_RT_USING_SENSOR=y
 CONFIG_RT_USING_SENSOR_CMD=y
 CONFIG_RT_USING_TOUCH=y
-CONFIG_RT_TOUCH_PIN_IRQ=y
+# CONFIG_RT_TOUCH_PIN_IRQ is not set
 CONFIG_RT_USING_HWCRYPTO=y
 CONFIG_RT_HWCRYPTO_DEFAULT_NAME="hwcryto"
 CONFIG_RT_HWCRYPTO_IV_MAX_SIZE=16
@@ -1326,7 +1317,7 @@ CONFIG_LPKG_LVGL_DISP_REFR_PERIOD=5
 # CONFIG_LPKG_LVGL_USING_DEMOS is not set
 # CONFIG_LPKG_USING_LV_MUSIC_DEMO is not set
 # CONFIG_LPKG_USING_AWTK is not set
-CONFIG_AIC_TOUCH_PANEL_GT911=y
+# CONFIG_AIC_TOUCH_PANEL_GT911 is not set
 # CONFIG_LPKG_USING_LWIP is not set
 CONFIG_LPKG_USING_DFS_UFFS=y
 CONFIG_LPKG_UFFS_PATH="/packages/third-party/uffs"
@@ -1354,8 +1345,6 @@ CONFIG_LPKG_UFFS_VER="latest"
 # CONFIG_LPKG_USING_MEMLEAK_CHECK is not set
 # CONFIG_LPKG_USING_WEBCLIENT is not set
 # CONFIG_LPKG_USING_OTA_DOWNLOADER is not set
-# CONFIG_LPKG_USING_RPMSG_LITE is not set
-# CONFIG_LPKG_RPMSG_LITE_CUSTOM_CONFIG is not set
 # CONFIG_LPKG_USING_FREETYPE is not set
 # CONFIG_LPKG_USING_DFS is not set
 CONFIG_LPKG_USING_MAD=y
@@ -1407,6 +1396,7 @@ CONFIG_SPI_NAND_WINBOND=y
 # CONFIG_SPI_NAND_UMTEK is not set
 # CONFIG_SPI_NAND_QUANXING is not set
 # CONFIG_LPKG_USING_SFUD is not set
+# CONFIG_AIC_NFTL_SUPPORT is not set
 # CONFIG_AIC_WIRELESS_LAN is not set

 #
@@ -1416,9 +1406,6 @@ CONFIG_SPI_NAND_WINBOND=y
 #
 # Gt911 touch panel options
 #
-CONFIG_AIC_TOUCH_PANEL_GT911_I2C_CHA="i2c3"
-CONFIG_AIC_TOUCH_PANEL_GT911_RST_PIN="PA.8"
-CONFIG_AIC_TOUCH_PANEL_GT911_INT_PIN="PA.9"

 #
 # External Audio Codec Support
@@ -1432,7 +1419,6 @@ CONFIG_AIC_TOUCH_PANEL_GT911_INT_PIN="PA.9"
 # CONFIG_AIC_GPIO_DRV_DEBUG is not set
 # CONFIG_AIC_DMA_DRV_DEBUG is not set
 # CONFIG_AIC_UART_DRV_DEBUG is not set
-# CONFIG_AIC_I2C_DRV_DEBUG is not set
 # CONFIG_AIC_RTC_DRV_DEBUG is not set
 # CONFIG_AIC_QSPI_DRV_DEBUG is not set
 # CONFIG_AIC_FB_DRV_DEBUG is not set
@@ -1453,10 +1439,9 @@ CONFIG_AIC_RTC_DRV_TEST=y
 # CONFIG_AIC_VE_TEST is not set
 # CONFIG_AIC_CAN_DRV_TEST is not set
 # CONFIG_AIC_AUDIO_DRV_TEST is not set
-# CONFIG_AIC_I2C_DRV_TEST is not set
-# CONFIG_AIC_TP_DRV_TEST is not set
 # CONFIG_AIC_WDT_DRV_TEST is not set
 # CONFIG_AIC_GPAI_TEST is not set
 # CONFIG_AIC_TSEN_TEST is not set
 # CONFIG_AIC_ZLIB_TEST is not set
+CONFIG_AIC_RTP_TEST=y
 # CONFIG_AIC_SID_BARE_TEST is not set
--- a/target/d21x/demo88-mmc/pack/bootloader.bin
+++ b/target/d21x/demo88-mmc/pack/bootloader.bin
--- a/target/d21x/demo88-mmc/pack/image_cfg.json
+++ b/target/d21x/demo88-mmc/pack/image_cfg.json
@@ -37,7 +37,7 @@
                "part": ["spl"]
            },
            "os": {
-                "file": "os.aic",
+                "file": "d21x_os.itb",
                "attr": ["block", "required"],
                "part": ["os"]
            },
@@ -74,14 +74,10 @@
                    "pbp": "d21x.pbp",
                },
            },
-            "os.aic": {
-                "head_ver": "0x00010001",
-                "loader": {
-                    "file": "d21x.bin",
-                    "load address": "0x40000000",
-                    "entry point":  "0x40000100",
-                    "run in dram": "false",
-                }
+        },
+        "itb": {
+            "d21x_os.itb": {
+                "its": "d21x_os.its"
            },
        },
    },