diff --git a/bsp/allwinner/f133/.config b/bsp/allwinner/d1s/.config similarity index 93% rename from bsp/allwinner/f133/.config rename to bsp/allwinner/d1s/.config index f65eadfe0421c0120421a34525ad1855dd392fb8..1d1717007ac5b5ac8db1974f38f2192972d50701 100644 --- a/bsp/allwinner/f133/.config +++ b/bsp/allwinner/d1s/.config @@ -93,22 +93,19 @@ CONFIG_RT_MAIN_THREAD_PRIORITY=10 # C++ features # # CONFIG_RT_USING_CPLUSPLUS is not set - -# -# Command shell -# -CONFIG_RT_USING_FINSH=y CONFIG_RT_USING_MSH=y +CONFIG_RT_USING_FINSH=y CONFIG_FINSH_USING_MSH=y CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=8192 CONFIG_FINSH_USING_HISTORY=y CONFIG_FINSH_HISTORY_LINES=5 CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y CONFIG_FINSH_USING_DESCRIPTION=y # CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set -CONFIG_FINSH_THREAD_PRIORITY=20 -CONFIG_FINSH_THREAD_STACK_SIZE=8192 -CONFIG_FINSH_CMD_SIZE=80 # CONFIG_FINSH_USING_AUTH is not set CONFIG_FINSH_ARG_MAX=10 @@ -142,6 +139,7 @@ CONFIG_RT_USING_DFS_DEVFS=y # CONFIG_RT_USING_DFS_ROMFS is not set # CONFIG_RT_USING_DFS_CROMFS is not set # CONFIG_RT_USING_DFS_RAMFS is not set +# CONFIG_RT_USING_DFS_TMPFS is not set # CONFIG_RT_USING_DFS_UFFS is not set # CONFIG_RT_USING_DFS_JFFS2 is not set # CONFIG_RT_USING_DFS_NFS is not set @@ -156,8 +154,9 @@ CONFIG_RT_USING_SYSTEM_WORKQUEUE=y CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=4096 CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23 CONFIG_RT_USING_SERIAL=y +# CONFIG_RT_USING_SERIAL_V1 is not set +CONFIG_RT_USING_SERIAL_V2=y # CONFIG_RT_SERIAL_USING_DMA is not set -CONFIG_RT_SERIAL_RB_BUFSZ=64 CONFIG_RT_USING_TTY=y # CONFIG_RT_TTY_DEBUG is not set # CONFIG_RT_USING_CAN is not set @@ -195,6 +194,7 @@ CONFIG_RT_AUDIO_REPLAY_MP_BLOCK_COUNT=2 CONFIG_RT_AUDIO_RECORD_PIPE_SIZE=2048 # CONFIG_RT_USING_SENSOR is not set CONFIG_RT_USING_TOUCH=y +CONFIG_RT_TOUCH_PIN_IRQ=y # CONFIG_RT_USING_LCD is not set # CONFIG_RT_USING_HWCRYPTO is not set # CONFIG_RT_USING_PULSE_ENCODER is not set @@ -233,6 +233,11 @@ CONFIG_RT_WLAN_WORKQUEUE_THREAD_PRIO=15 # # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set +CONFIG_RT_USING_FAL=y +CONFIG_FAL_DEBUG_CONFIG=y +CONFIG_FAL_DEBUG=1 +CONFIG_FAL_PART_HAS_TABLE_CFG=y +# CONFIG_FAL_USING_SFUD_PORT is not set # # POSIX layer and C standard library @@ -406,7 +411,18 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # Wiced WiFi # # CONFIG_PKG_USING_WLAN_WICED is not set -# CONFIG_PKG_USING_RW007 is not set +CONFIG_PKG_USING_RW007=y +CONFIG_PKG_RW007_PATH="/packages/iot/WiFi/rw007" +CONFIG_PKG_USING_RW007_V201=y +# CONFIG_PKG_USING_RW007_V200 is not set +# CONFIG_PKG_USING_RW007_V111 is not set +# CONFIG_PKG_USING_RW007_V110 is not set +# CONFIG_PKG_USING_RW007_V100 is not set +# CONFIG_PKG_USING_RW007_LATEST_VERSION is not set +CONFIG_PKG_RW007_VER="v2.0.1" +CONFIG_RW007_NOT_USE_EXAMPLE_DRIVERS=y +# CONFIG_RW007_USING_STM32_DRIVERS is not set +CONFIG_RW007_SPI_MAX_HZ=25000000 # CONFIG_PKG_USING_COAP is not set # CONFIG_PKG_USING_NOPOLL is not set # CONFIG_PKG_USING_NETUTILS is not set @@ -494,12 +510,10 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # XML: Extensible Markup Language # # CONFIG_PKG_USING_SIMPLE_XML is not set -CONFIG_PKG_USING_EZXML=y -CONFIG_PKG_EZXML_PATH="/packages/language/XML/ezXML" -CONFIG_PKG_USING_EZXML_LATEST_VERSION=y +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_EZXML_LATEST_VERSION is not set # CONFIG_PKG_USING_EZXML_V0681 is not set # CONFIG_PKG_USING_EZXML_V068 is not set -CONFIG_PKG_EZXML_VER="latest" # CONFIG_PKG_USING_LUATOS_SOC is not set # CONFIG_PKG_USING_LUA is not set # CONFIG_PKG_USING_JERRYSCRIPT is not set @@ -638,8 +652,6 @@ CONFIG_PKG_USING_PARTITION=y CONFIG_PKG_PARTITION_PATH="/packages/system/partition" CONFIG_PKG_PARTITION_VER="v1.0.1" # CONFIG_PKG_USING_PERF_COUNTER is not set -CONFIG_FAL_DEBUG_CONFIG=y -CONFIG_FAL_PART_HAS_TABLE_CFG=y # CONFIG_PKG_USING_FLASHDB is not set # CONFIG_PKG_USING_SQLITE is not set # CONFIG_PKG_USING_RTI is not set @@ -665,7 +677,33 @@ CONFIG_FAL_PART_HAS_TABLE_CFG=y # CONFIG_PKG_USING_ARM_2D is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set -# CONFIG_PKG_USING_CHERRYUSB is not set +CONFIG_PKG_USING_CHERRYUSB=y +CONFIG_PKG_CHERRYUSB_DEVICE=y +# CONFIG_PKG_CHERRYUSB_DEVICE_FS is not set +CONFIG_PKG_CHERRYUSB_DEVICE_HS=y +# CONFIG_PKG_CHERRYUSB_DEVICE_BL is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_CH32 is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_FSDEV is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_DWC2 is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_MM32 is not set +CONFIG_PKG_CHERRYUSB_DEVICE_MUSB=y +# CONFIG_PKG_CHERRYUSB_DEVICE_NUVOTON is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_IMXRT is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_MUSB_MSP432 is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_MUSB_ES32F3 is not set +CONFIG_PKG_CHERRYUSB_DEVICE_MUSB_SUNXI=y +# CONFIG_PKG_CHERRYUSB_DEVICE_CDC is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_HID is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_MSC is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_AUDIO is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_VIDEO is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_RNDIS is not set +# CONFIG_PKG_CHERRYUSB_DEVICE_DFU is not set +# CONFIG_PKG_CHERRYUSB_DEVIEC_HUB is not set +# CONFIG_PKG_CHERRYUSB_HOST is not set +CONFIG_PKG_CHERRYUSB_PATH="/packages/system/CherryUSB" +CONFIG_PKG_USING_CHERRYUSB_LATEST_VERSION=y +CONFIG_PKG_CHERRYUSB_VER="latest" # CONFIG_PKG_USING_KMULTI_RTIMER is not set # CONFIG_PKG_USING_TFDB is not set # CONFIG_PKG_USING_QPC is not set @@ -899,7 +937,6 @@ CONFIG_UART0_RX_USING_GPIOE3=y CONFIG_BSP_USING_SDMMC=y CONFIG_SD_CARD_CHECK=y CONFIG_BSP_USING_FS=y -# CONFIG_BSP_USING_G2D is not set # CONFIG_BSP_USING_LCD is not set # diff --git a/bsp/allwinner/f133/.gitignore b/bsp/allwinner/d1s/.gitignore similarity index 100% rename from bsp/allwinner/f133/.gitignore rename to bsp/allwinner/d1s/.gitignore diff --git a/bsp/allwinner/f133/Kconfig b/bsp/allwinner/d1s/Kconfig similarity index 100% rename from bsp/allwinner/f133/Kconfig rename to bsp/allwinner/d1s/Kconfig diff --git a/bsp/allwinner/f133/README.md b/bsp/allwinner/d1s/README.md similarity index 100% rename from bsp/allwinner/f133/README.md rename to bsp/allwinner/d1s/README.md diff --git a/bsp/allwinner/f133/SConscript b/bsp/allwinner/d1s/SConscript similarity index 100% rename from bsp/allwinner/f133/SConscript rename to bsp/allwinner/d1s/SConscript diff --git a/bsp/allwinner/f133/SConstruct b/bsp/allwinner/d1s/SConstruct similarity index 100% rename from bsp/allwinner/f133/SConstruct rename to bsp/allwinner/d1s/SConstruct diff --git a/bsp/allwinner/f133/applications/SConscript b/bsp/allwinner/d1s/applications/SConscript similarity index 100% rename from bsp/allwinner/f133/applications/SConscript rename to bsp/allwinner/d1s/applications/SConscript diff --git a/bsp/allwinner/f133/applications/main.c b/bsp/allwinner/d1s/applications/main.c similarity index 100% rename from bsp/allwinner/f133/applications/main.c rename to bsp/allwinner/d1s/applications/main.c diff --git a/bsp/allwinner/f133/applications/mnt.c b/bsp/allwinner/d1s/applications/mnt.c similarity index 100% rename from bsp/allwinner/f133/applications/mnt.c rename to bsp/allwinner/d1s/applications/mnt.c diff --git a/bsp/allwinner/f133/board/SConscript b/bsp/allwinner/d1s/board/SConscript similarity index 100% rename from bsp/allwinner/f133/board/SConscript rename to bsp/allwinner/d1s/board/SConscript diff --git a/bsp/allwinner/f133/board/board.c b/bsp/allwinner/d1s/board/board.c similarity index 100% rename from bsp/allwinner/f133/board/board.c rename to bsp/allwinner/d1s/board/board.c diff --git a/bsp/allwinner/f133/board/board.h b/bsp/allwinner/d1s/board/board.h similarity index 100% rename from bsp/allwinner/f133/board/board.h rename to bsp/allwinner/d1s/board/board.h diff --git a/bsp/allwinner/f133/figures/board.png b/bsp/allwinner/d1s/figures/board.png similarity index 100% rename from bsp/allwinner/f133/figures/board.png rename to bsp/allwinner/d1s/figures/board.png diff --git a/bsp/allwinner/f133/figures/ddr_partition.png b/bsp/allwinner/d1s/figures/ddr_partition.png similarity index 100% rename from bsp/allwinner/f133/figures/ddr_partition.png rename to bsp/allwinner/d1s/figures/ddr_partition.png diff --git a/bsp/allwinner/f133/figures/emmc_partition.png b/bsp/allwinner/d1s/figures/emmc_partition.png similarity index 100% rename from bsp/allwinner/f133/figures/emmc_partition.png rename to bsp/allwinner/d1s/figures/emmc_partition.png diff --git a/bsp/allwinner/f133/figures/error_name.png b/bsp/allwinner/d1s/figures/error_name.png similarity index 100% rename from bsp/allwinner/f133/figures/error_name.png rename to bsp/allwinner/d1s/figures/error_name.png diff --git a/bsp/allwinner/f133/figures/fel_driver.png b/bsp/allwinner/d1s/figures/fel_driver.png similarity index 100% rename from bsp/allwinner/f133/figures/fel_driver.png rename to bsp/allwinner/d1s/figures/fel_driver.png diff --git a/bsp/allwinner/f133/figures/lwip.png b/bsp/allwinner/d1s/figures/lwip.png similarity index 100% rename from bsp/allwinner/f133/figures/lwip.png rename to bsp/allwinner/d1s/figures/lwip.png diff --git a/bsp/allwinner/f133/figures/mobaxterm.png b/bsp/allwinner/d1s/figures/mobaxterm.png similarity index 100% rename from bsp/allwinner/f133/figures/mobaxterm.png rename to bsp/allwinner/d1s/figures/mobaxterm.png diff --git a/bsp/allwinner/f133/figures/mount.png b/bsp/allwinner/d1s/figures/mount.png similarity index 100% rename from bsp/allwinner/f133/figures/mount.png rename to bsp/allwinner/d1s/figures/mount.png diff --git a/bsp/allwinner/f133/figures/user_app.png b/bsp/allwinner/d1s/figures/user_app.png similarity index 100% rename from bsp/allwinner/f133/figures/user_app.png rename to bsp/allwinner/d1s/figures/user_app.png diff --git a/bsp/allwinner/f133/link.lds b/bsp/allwinner/d1s/link.lds similarity index 100% rename from bsp/allwinner/f133/link.lds rename to bsp/allwinner/d1s/link.lds diff --git a/bsp/allwinner/f133/link_stacksize.lds b/bsp/allwinner/d1s/link_stacksize.lds similarity index 100% rename from bsp/allwinner/f133/link_stacksize.lds rename to bsp/allwinner/d1s/link_stacksize.lds diff --git a/bsp/allwinner/f133/mkimage b/bsp/allwinner/d1s/mkimage old mode 100755 new mode 100644 similarity index 100% rename from bsp/allwinner/f133/mkimage rename to bsp/allwinner/d1s/mkimage diff --git a/bsp/allwinner/f133/mksdimg.sh b/bsp/allwinner/d1s/mksdimg.sh old mode 100755 new mode 100644 similarity index 65% rename from bsp/allwinner/f133/mksdimg.sh rename to bsp/allwinner/d1s/mksdimg.sh index 259bac736036802312c1d80a8d62f7906fbcb303..e8fdc0adc32dcb4d37b762da98034c3c54fedd04 --- a/bsp/allwinner/f133/mksdimg.sh +++ b/bsp/allwinner/d1s/mksdimg.sh @@ -1,5 +1,5 @@ #/bin/sh ./mkimage -T sunxi_toc1 -d toc1.cfg sd.bin # offset: 8K of spl，+48K of toc1 -#sudo dd if=boot0_sdcard_sun20iw1p1.bin of=/dev/sdb bs=1024 seek=8 +#sudo dd if=boot0_sdcard_sun20iw1p1_d1s.bin of=/dev/sdb bs=1024 seek=8 #sudo dd if=sd.bin of=/dev/sdb bs=1024 seek=56 diff --git a/bsp/allwinner/f133/ports/SConscript b/bsp/allwinner/d1s/ports/SConscript similarity index 100% rename from bsp/allwinner/f133/ports/SConscript rename to bsp/allwinner/d1s/ports/SConscript diff --git a/bsp/allwinner/f133/ports/fal/SConscript b/bsp/allwinner/d1s/ports/fal/SConscript similarity index 100% rename from bsp/allwinner/f133/ports/fal/SConscript rename to bsp/allwinner/d1s/ports/fal/SConscript diff --git a/bsp/allwinner/f133/ports/fal/fal_cfg.h b/bsp/allwinner/d1s/ports/fal/fal_cfg.h similarity index 100% rename from bsp/allwinner/f133/ports/fal/fal_cfg.h rename to bsp/allwinner/d1s/ports/fal/fal_cfg.h diff --git a/bsp/allwinner/f133/ports/fal/fal_init.c b/bsp/allwinner/d1s/ports/fal/fal_init.c similarity index 100% rename from bsp/allwinner/f133/ports/fal/fal_init.c rename to bsp/allwinner/d1s/ports/fal/fal_init.c diff --git a/bsp/allwinner/f133/ports/fal/fal_norflash_sfud_port.c b/bsp/allwinner/d1s/ports/fal/fal_norflash_sfud_port.c similarity index 100% rename from bsp/allwinner/f133/ports/fal/fal_norflash_sfud_port.c rename to bsp/allwinner/d1s/ports/fal/fal_norflash_sfud_port.c diff --git a/bsp/allwinner/f133/ports/fal/fal_sd_sfud_port.c b/bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c similarity index 100% rename from bsp/allwinner/f133/ports/fal/fal_sd_sfud_port.c rename to bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c diff --git a/bsp/allwinner/f133/ports/wifi/SConscript b/bsp/allwinner/d1s/ports/wifi/SConscript similarity index 100% rename from bsp/allwinner/f133/ports/wifi/SConscript rename to bsp/allwinner/d1s/ports/wifi/SConscript diff --git a/bsp/allwinner/f133/ports/wifi/rw007_pin_port.c b/bsp/allwinner/d1s/ports/wifi/rw007_pin_port.c similarity index 100% rename from bsp/allwinner/f133/ports/wifi/rw007_pin_port.c rename to bsp/allwinner/d1s/ports/wifi/rw007_pin_port.c diff --git a/bsp/allwinner/f133/rtconfig.h b/bsp/allwinner/d1s/rtconfig.h similarity index 99% rename from bsp/allwinner/f133/rtconfig.h rename to bsp/allwinner/d1s/rtconfig.h index 99fe9f3e7d81657e466d11a431529d1b00f9beb2..f309245c7c1799f1b2d01d6cb221a524e37dcc23 100644 --- a/bsp/allwinner/f133/rtconfig.h +++ b/bsp/allwinner/d1s/rtconfig.h @@ -273,8 +273,6 @@ /* XML: Extensible Markup Language */ -#define PKG_USING_EZXML -#define PKG_USING_EZXML_LATEST_VERSION /* multimedia packages */ diff --git a/bsp/allwinner/f133/rtconfig.py b/bsp/allwinner/d1s/rtconfig.py similarity index 100% rename from bsp/allwinner/f133/rtconfig.py rename to bsp/allwinner/d1s/rtconfig.py diff --git a/bsp/allwinner/f133/toc1.cfg b/bsp/allwinner/d1s/toc1.cfg similarity index 100% rename from bsp/allwinner/f133/toc1.cfg rename to bsp/allwinner/d1s/toc1.cfg diff --git a/bsp/allwinner/d1s/tools/boot0_sdcard_sun20iw1p1_d1s.bin b/bsp/allwinner/d1s/tools/boot0_sdcard_sun20iw1p1_d1s.bin new file mode 100644 index 0000000000000000000000000000000000000000..47e9fc278c0439c7c98e5dad884cea8ca235a71e Binary files /dev/null and b/bsp/allwinner/d1s/tools/boot0_sdcard_sun20iw1p1_d1s.bin differ diff --git a/bsp/allwinner/f133/u-boot.dtb b/bsp/allwinner/d1s/u-boot.dtb similarity index 100% rename from bsp/allwinner/f133/u-boot.dtb rename to bsp/allwinner/d1s/u-boot.dtb diff --git a/bsp/allwinner/libraries/drivers/Kconfig b/bsp/allwinner/libraries/drivers/Kconfig index 59153ca1b49c1e64eea4fe1afade9b35744e61eb..46e5e963de1d15ed0cdc892f8b4f0d6ff0ec97d6 100644 --- a/bsp/allwinner/libraries/drivers/Kconfig +++ b/bsp/allwinner/libraries/drivers/Kconfig @@ -266,13 +266,8 @@ menuconfig BSP_USING_FS select FAL_PART_HAS_TABLE_CFG default y -config BSP_USING_G2D - bool "Enable G2D" - default n - menuconfig BSP_USING_LCD bool "Enable LCD" - select BSP_USING_G2D select BSP_USING_PWM default n diff --git a/bsp/allwinner/libraries/drivers/lcd_cfg.c b/bsp/allwinner/libraries/drivers/lcd_cfg.c index 31272e3489e23de430ba632376581f5e578ca79e..023b98d066d62310f5100c3d7d2a28a8d5f13d61 100644 --- a/bsp/allwinner/libraries/drivers/lcd_cfg.c +++ b/bsp/allwinner/libraries/drivers/lcd_cfg.c @@ -8,13 +8,11 @@ #include "disp_board_config.h" #include -#include "ezxml.h" #include "lcd_cfg.h" struct property_t *g_lcd0_config = NULL; static struct lcd_cfg_panel_info _panel_info = DEFAULT_LCD_CONFIG; -// struct property_t *cur = NULL; struct property_t g_lcd0_config_rgb[] = { { @@ -30,12 +28,12 @@ struct property_t g_lcd0_config_rgb[] = { { .name = "lcd_if", .type = PROPERTY_INTGER, - .v.value = 0, /* LCD_IF_HV */ + .v.value = 0, /* LCD_IF_HV */ }, { .name = "lcd_hv_if", .type = PROPERTY_INTGER, - .v.value = 0, /* LCD_HV_IF_PRGB_1CYC */ + .v.value = 0, /* LCD_HV_IF_PRGB_1CYC */ }, { .name = "lcd_x", @@ -189,7 +187,7 @@ struct property_t g_lcd0_config_rgb[] = { .data = 1, }, }, - //gpio + // gpio { .name = "LCD0_D2", .type = PROPERTY_PIN, @@ -409,8 +407,7 @@ struct property_t g_lcd0_config_rgb[] = { .pull = 0, .drv_level = 3, }, - } -}; + }}; struct property_t g_lcd0_config_mipi[] = { { @@ -441,7 +438,7 @@ struct property_t g_lcd0_config_mipi[] = { { .name = "lcd_y", .type = PROPERTY_INTGER, - .v.value = 960,//1280 + .v.value = 960, // 1280 }, { .name = "lcd_width", @@ -584,7 +581,6 @@ struct property_t g_lcd0_config_mipi[] = { .v.value = 1000, }, - // backlight enable /* { @@ -611,7 +607,7 @@ struct property_t g_lcd0_config_mipi[] = { // .data = 1, // }, // }, - //gpio + // gpio { .name = "LCD0_D0", .type = PROPERTY_PIN, @@ -712,129 +708,6 @@ struct property_t g_lcd0_config_mipi[] = { .drv_level = 3, }, }, - -#if 0 - { - .name = "LCD0_D10", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(10), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D11", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(11), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D12", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(12), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D13", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(13), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D14", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(14), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D15", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(15), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D16", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(16), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_D17", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(17), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_CLK", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(18), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_DE", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(19), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_HSYNC", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(20), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, - { - .name = "LCD0_VSYNC", - .type = PROPERTY_PIN, - .v.gpio_list = { - .gpio = GPIOD(21), - .mul_sel = 2, - .pull = 0, - .drv_level = 3, - }, - }, -#endif }; struct property_t g_lcd0_config_lvds[] = { @@ -881,7 +754,7 @@ struct property_t g_lcd0_config_lvds[] = { { .name = "lcd_dclk_freq", .type = PROPERTY_INTGER, - .v.value = 71*2, // dual lvds, freq=single*2. + .v.value = 71 * 2, // dual lvds, freq=single*2. }, { .name = "lcd_rb_swap", @@ -916,12 +789,12 @@ struct property_t g_lcd0_config_lvds[] = { { .name = "lcd_hbp", .type = PROPERTY_INTGER, - .v.value = 90,// P19: Tblk(h) period 74-90-140 + .v.value = 90, // P19: Tblk(h) period 74-90-140 }, { .name = "lcd_ht", .type = PROPERTY_INTGER, - .v.value = (960+90)*2,// x+hbp P19: Th period 1034-1050-1100 + .v.value = (960 + 90) * 2, // x+hbp P19: Th period 1034-1050-1100 }, { .name = "lcd_hspw", @@ -936,7 +809,7 @@ struct property_t g_lcd0_config_lvds[] = { { .name = "lcd_vt", .type = PROPERTY_INTGER, - .v.value = (1080+50)+50, // y+vbp P19: Tv period 1092-1130-1818 + .v.value = (1080 + 50) + 50, // y+vbp P19: Tv period 1092-1130-1818 }, { .name = "lcd_vspw", @@ -1009,8 +882,7 @@ struct property_t g_lcd0_config_lvds[] = { .v.value = 90, }, - -//gpio + // gpio { .name = "LCD0_D0", .type = PROPERTY_PIN, @@ -1212,26 +1084,6 @@ struct property_t g_lcd0_config_lvds[] = { .drv_level = 3, }, }, - // { - // .name = "LCD0_HSYNC", - // .type = PROPERTY_PIN, - // .v.gpio_list = { - // .gpio = GPIOD(20), - // .mul_sel = 2, - // .pull = 0, - // .drv_level = 3, - // }, - // }, - // { - // .name = "LCD0_VSYNC", - // .type = PROPERTY_PIN, - // .v.gpio_list = { - // .gpio = GPIOD(21), - // .mul_sel = 2, - // .pull = 0, - // .drv_level = 3, - // }, - // }, #endif }; @@ -1253,12 +1105,12 @@ struct property_t g_disp_config[] = { { .name = "disp_mode", .type = PROPERTY_INTGER, - .v.value = 0, /* DISP_INIT_MODE_SCREEN0 */ + .v.value = 0, /* DISP_INIT_MODE_SCREEN0 */ }, { .name = "screen0_output_type", .type = PROPERTY_INTGER, - .v.value = 1, /* DISP_OUTPUT_TYPE_LCD */ + .v.value = 1, /* DISP_OUTPUT_TYPE_LCD */ }, { .name = "screen0_output_mode", @@ -1311,34 +1163,6 @@ u32 g_lcd0_config_len = sizeof(g_lcd0_config_rgb) / sizeof(struct property_t); u32 g_lcd1_config_len = sizeof(g_lcd1_config) / sizeof(struct property_t); u32 g_disp_config_len = sizeof(g_disp_config) / sizeof(struct property_t); - - -// #define LCD_CONFIG_XML_1V1MAP -#ifdef LCD_CONFIG_XML_1V1MAP - -static void _load_xml_attr(ezxml_t xml, struct property_t *_config, const u32 config_len) -{ - const char *p_str; - u32 i; - - for (i = 0; i < config_len; i++) - { - if (_config[i].type != PROPERTY_INTGER) - { - continue; - } - - p_str = ezxml_attr(xml, _config[i].name); - if (p_str != NULL) - { - _config[i].v.value = atoi(p_str); - rt_kprintf("lcd config '%s':%u\n", _config[i].name, _config[i].v.value); - } - } -} - -#else - static struct property_t *_lcd_property_find(const char *name, struct property_t *_config, const u32 config_len) { u32 i; @@ -1359,218 +1183,16 @@ static struct property_t *_lcd_property_find(const char *name, struct property_t return NULL; } -static void _get_xml_attr_type(ezxml_t xml) -{ - const char *p_str; - p_str = ezxml_attr(xml,"type"); - if (p_str != RT_NULL) strcpy(_panel_info.type, p_str); -} - -static void _load_xml_attr(ezxml_t xml, struct property_t *_config, const u32 config_len) -{ -#if defined(RT_USING_DFS) && defined(PKG_USING_EZXML) - { - const char *p_str; - struct property_t *_config_item; - const char *_attr_table[][2] = { - {"x", "lcd_x"}, - {"y", "lcd_y"}, - {"dclk_freq", "lcd_dclk_freq"}, - {"hbp", "lcd_hbp"}, - {"vbp", "lcd_vbp"}, - {"hspw", "lcd_hspw"}, - {"vspw", "lcd_vspw"}, - }; - size_t i; - int hv_pol = 0; - int clk_pha = 0; - - for (i = 0; i < sizeof(_attr_table) / sizeof(_attr_table[0]); i++) - { - p_str = ezxml_attr(xml, _attr_table[i][0]); - if (p_str != RT_NULL) - { - _config_item = _lcd_property_find(_attr_table[i][1], _config, config_len); - if (_config_item) - { - _config_item->v.value = atoi(p_str); - } - } - } - - /* lcd_ht = lcd_x + lcd_hspw + lcd_hbp + lcd_hfp */ - p_str = ezxml_attr(xml, "hfp"); - if (p_str != RT_NULL) - { - struct property_t *lcd_ht; - struct property_t *lcd_x; - struct property_t *lcd_hspw; - struct property_t *lcd_hbp; - - lcd_ht = _lcd_property_find("lcd_ht", _config, config_len); - lcd_x = _lcd_property_find("lcd_x", _config, config_len); - lcd_hspw = _lcd_property_find("lcd_hspw", _config, config_len); - lcd_hbp = _lcd_property_find("lcd_hbp", _config, config_len); - - if (lcd_ht && lcd_x && lcd_hspw && lcd_hbp) - { - int hfp; - - hfp = atoi(p_str); - - lcd_ht->v.value = lcd_x->v.value + lcd_hspw->v.value + lcd_hbp->v.value + hfp; - } - } - - /* lcd_vt = lcd_y + lcd_vspw + lcd_vbp + lcd_vfp */ - p_str = ezxml_attr(xml, "vfp"); - if (p_str != RT_NULL) - { - struct property_t *lcd_vt; - struct property_t *lcd_y; - struct property_t *lcd_vspw; - struct property_t *lcd_vbp; - - lcd_vt = _lcd_property_find("lcd_vt", _config, config_len); - lcd_y = _lcd_property_find("lcd_y", _config, config_len); - lcd_vspw = _lcd_property_find("lcd_vspw", _config, config_len); - lcd_vbp = _lcd_property_find("lcd_vbp", _config, config_len); - - if (lcd_vt && lcd_y && lcd_vspw && lcd_vbp) - { - int vfp; - - vfp = atoi(p_str); - - lcd_vt->v.value = lcd_y->v.value + lcd_vspw->v.value + lcd_vbp->v.value + vfp; - } - } - - p_str = ezxml_attr(xml, "ht"); - if (p_str != RT_NULL) - { - struct property_t *lcd_ht; - - lcd_ht = _lcd_property_find("lcd_ht", _config, config_len); - if (lcd_ht) - { - lcd_ht->v.value = atoi(p_str); - } - } - - p_str = ezxml_attr(xml, "vt"); - if (p_str != RT_NULL) - { - struct property_t *lcd_vt; - - lcd_vt = _lcd_property_find("lcd_vt", _config, config_len); - if (lcd_vt) - { - lcd_vt->v.value = atoi(p_str); - } - } - - p_str = ezxml_attr(xml, "h_sync_active"); - if (p_str != RT_NULL) - { - hv_pol |= 1; - } - - p_str = ezxml_attr(xml, "v_sync_active"); - if (p_str != RT_NULL) - { - hv_pol |= 2; - } - - if (hv_pol != 0) - { - struct property_t *lcd_hv_sync_polarity; - - lcd_hv_sync_polarity = _lcd_property_find("lcd_hv_sync_polarity", _config, config_len); - - if (lcd_hv_sync_polarity) - { - lcd_hv_sync_polarity->v.value = hv_pol; - } - } - - p_str = ezxml_attr(xml, "den_active"); - if (p_str != RT_NULL) - { - struct property_t *lcd_de_polarity; - - lcd_de_polarity = _lcd_property_find("lcd_de_polarity", _config, config_len); - - if (lcd_de_polarity) - { - lcd_de_polarity->v.value = atoi(p_str); - } - } - - p_str = ezxml_attr(xml, "clk_active"); - if (p_str != RT_NULL) - { - clk_pha |= 2; - } - - if (clk_pha != 0) - { - struct property_t *lcd_de_polarity; - - lcd_de_polarity = _lcd_property_find("lcd_hv_clk_phase", _config, config_len); - - if (lcd_de_polarity) - { - lcd_de_polarity->v.value = clk_pha; - } - } - - p_str = ezxml_attr(xml,"x"); - if (p_str != RT_NULL) _panel_info.width = atoi(p_str); - p_str = ezxml_attr(xml,"y"); - if (p_str != RT_NULL) _panel_info.height = atoi(p_str); - p_str = ezxml_attr(xml,"lane"); - if (p_str != RT_NULL) _panel_info.lane = atoi(p_str); - p_str = ezxml_attr(xml,"swap_flag"); - if (p_str != RT_NULL) _panel_info.swap_flag = atoi(p_str); - p_str = ezxml_attr(xml,"ctp_flag"); - if (p_str != RT_NULL) _panel_info.ctp_flag = atoi(p_str); - p_str = ezxml_attr(xml,"bl_mode"); - if (p_str != RT_NULL) _panel_info.bl_mode = atoi(p_str); - p_str = ezxml_attr(xml,"bl_gpio_pin"); - if (p_str != RT_NULL) _panel_info.bl_gpio_pin = atoi(p_str); - p_str = ezxml_attr(xml,"bl_gpio_level"); - if (p_str != RT_NULL) _panel_info.bl_gpio_level = atoi(p_str); - p_str = ezxml_attr(xml,"bl_pwm_name"); - if (p_str != RT_NULL) strcpy(_panel_info.bl_pwm_name, p_str); - p_str = ezxml_attr(xml,"bl_pwm_hz"); - if (p_str != RT_NULL) _panel_info.bl_pwm_hz = atoi(p_str); - p_str = ezxml_attr(xml,"bl_pwm_val"); - if (p_str != RT_NULL) _panel_info.bl_pwm_val = atoi(p_str); - p_str = ezxml_attr(xml,"bl_pin"); - if (p_str != RT_NULL) _panel_info.bl_pin = atoi(p_str); - p_str = ezxml_attr(xml,"bl_level"); - if (p_str != RT_NULL) _panel_info.bl_level = atoi(p_str); - p_str = ezxml_attr(xml,"pwr_pin"); - if (p_str != RT_NULL) _panel_info.pwr_pin = atoi(p_str); - p_str = ezxml_attr(xml,"pwr_level"); - if (p_str != RT_NULL) _panel_info.pwr_level = atoi(p_str); - } -#endif /* RT_USING_DFS && PKG_USING_EZXML */ -} -#endif /* LCD_CONFIG_XML_1V1MAP */ - #ifndef LCD_XML_CONFIG_FILE #define LCD_CONFIG_FILE "/etc/lcd_config.xml" #else #define LCD_CONFIG_FILE LCD_XML_CONFIG_FILE #endif -const struct lcd_cfg_panel_info* load_lcd_config_from_xml(void) +const struct lcd_cfg_panel_info *load_lcd_config_from_xml(void) { struct property_t *_config_item; static rt_uint8_t init_state = 0; - rt_enter_critical(); if (init_state == 0) { @@ -1590,51 +1212,6 @@ const struct lcd_cfg_panel_info* load_lcd_config_from_xml(void) g_lcd0_config = g_lcd0_config_rgb; g_lcd0_config_len = sizeof(g_lcd0_config_rgb) / sizeof(struct property_t); - -#if defined(RT_USING_DFS) && defined(PKG_USING_EZXML) - { - ezxml_t xml; - const char *p_str; - int i; - - if (access(LCD_CONFIG_FILE,0) != 0) - { - rt_kprintf("Can not found %s\r\nLCD setting the default configuration\r\n", LCD_CONFIG_FILE); - goto _RET; - } - xml = ezxml_parse_file(LCD_CONFIG_FILE); - if (xml == RT_NULL) - { - rt_kprintf("parse failed %s\r\nLCD setting the default configuration\r\n", LCD_CONFIG_FILE); - goto _RET; - } - - _get_xml_attr_type(xml); - - if(strstr(_panel_info.type, "rgb")) - { - - } - else if(strstr(_panel_info.type, "lvds")) - { - g_lcd0_config = g_lcd0_config_lvds; - g_lcd0_config_len = sizeof(g_lcd0_config_lvds) / sizeof(struct property_t); - } - else if(strstr(_panel_info.type, "mipi")) - { - g_lcd0_config = g_lcd0_config_mipi; - g_lcd0_config_len = sizeof(g_lcd0_config_mipi) / sizeof(struct property_t); - } - - _load_xml_attr(xml, g_lcd0_config, g_lcd0_config_len); -#ifdef LCD_CONFIG_XML_1V1MAP - _load_xml_attr(xml, g_lcd1_config, g_lcd1_config_len); - _load_xml_attr(xml, g_disp_config, g_disp_config_len); -#endif - - } -#endif - _RET: init_state = 2;