diff --git a/bsp/x1000/Kconfig b/bsp/x1000/Kconfig index 0da207221c0991b2bbd05d015b6fa20259db0dbc..3ab47dd30d21edca58100b1fb873d638bebe8a71 100644 --- a/bsp/x1000/Kconfig +++ b/bsp/x1000/Kconfig @@ -8,8 +8,8 @@ config $BSP_DIR config $RTT_DIR string option env="RTT_ROOT" - default "E:/rt-thread" - + default "../.." + # you can change the RTT_ROOT default "../.." to your rtthread_root, # example : default "F:/git_repositories/rt-thread" @@ -21,4 +21,3 @@ config $PKGS_DIR source "$RTT_DIR/KConfig" source "$PKGS_DIR/KConfig" source "$BSP_DIR/drivers/Kconfig" - diff --git a/bsp/x1000/drivers/Kconfig b/bsp/x1000/drivers/Kconfig index 3c5a59acba32a924930bcb3928662a2368b450f5..66d75a826c7364fe8cb2d886165cffab51e964a9 100644 --- a/bsp/x1000/drivers/Kconfig +++ b/bsp/x1000/drivers/Kconfig @@ -1,27 +1,24 @@ choice - prompt "Choice bsp board" + prompt "Board Type" default BOARD_HALLEY2_REALBOARD_V2 - - config BOARD_HALLEY2 - bool "Using haller2 board" - + config BOARD_PHOENIX - bool "Using phoenix board" + bool "Phoenix board" + + config BOARD_HALLEY2 + bool "Halley2 board" config BOARD_CANNA - bool "Using canna board" - + bool "CANNA board" + config BOARD_HALLEY2_FIR - bool "Using haller2 fir board" - + bool "Fir board" + config BOARD_HALLEY2_REALBOARD - bool "Using haller2 realboard board" - + bool "RealBoard board" + config BOARD_HALLEY2_REALBOARD_V2 - bool "Using haller2 realboard v2 board" - - config BOARD_HALLEY2_IDELAN - bool "Using haller2 idelan board" + bool "RealBoard v2 board" endchoice if RT_USING_SERIAL @@ -31,8 +28,8 @@ if RT_USING_SERIAL config RT_USING_UART1 bool "Using UART1" - default n - + default n + config RT_USING_UART2 bool "Using UART2" default y @@ -40,39 +37,39 @@ endif if RT_USING_SDIO config RT_USING_MSC0 - bool "Using MSC0 for sd card" + bool "Using MMC/SD 0" default y - + config RT_USING_MSC1 - bool "Using MSC1 for wifi" + bool "Using MMC/SD 1" default y config RT_MMCSD_STACK_SIZE - int "Set mmc thread stack size" - default 2048 + int "Set MMC/SD thread stack size" + default 2048 endif if RT_USING_GUIENGINE config RT_USING_SLCD - bool "Using lcd display" + bool "Using LCD display" default y - + if RT_USING_SLCD choice prompt "Choice LCD controller" default RT_USING_ILI9488 - + config RT_USING_ILI9488 - bool "Using ILI9488 controller" - + bool "Using ILI9488 controller" + config RT_USING_ILI9341 - bool "Using ILI9341 controller" + bool "Using ILI9341 controller" config RT_USING_OTM4802 - bool "Using OTM4802 controller" - + bool "Using OTM4802 controller" + config RT_USING_TRULY_TFT240240 - bool "Using TFT240240 controller" + bool "Using TFT240240 controller" endchoice endif @@ -80,19 +77,19 @@ if RT_USING_GUIENGINE config RT_USING_TOUCH bool "Using touch" default y - + if RT_USING_TOUCH choice prompt "Choice touch controller" default RT_USING_GT9XX - + config RT_USING_GT9XX bool "Using GT9XX controller" - + config RT_USING_FT6x06 bool "Using FT6x06 controller" endchoice - + config RT_TOUCH_THREAD_PRIORITY int "Set touch thread priority" range 2 32 @@ -105,7 +102,7 @@ if RT_USING_I2C config RT_USING_I2C0 bool "Using iic0 bus" default y - + config RT_USING_I2C1 bool "Using iic1 bus" default n @@ -115,17 +112,14 @@ if RT_USING_I2C default n endif +config RT_USING_ICODEC + default n + config RT_USING_AUDIO bool "Using audio" + select RT_USING_ICODEC default n -if RT_USING_AUDIO - config RT_USING_ICODEC - bool "Using icodec" - default n -endif config RT_USING_CPU_FFS bool "Using CPU FFS" default y - - diff --git a/bsp/x1000/drivers/board.h b/bsp/x1000/drivers/board.h index d91fb2f7c0e7923b414c5d889853360dce90a95e..62d70c6116bd2200d9fd6c39366fd6c52800dd36 100644 --- a/bsp/x1000/drivers/board.h +++ b/bsp/x1000/drivers/board.h @@ -44,10 +44,6 @@ #include "board/halley2_realboard_v2/board_halley2_readboard_v2.h" #endif -#ifdef BOARD_HALLEY2_IDELAN -#include "board/halley2_idelan/board_halley2_idelan.h" -#endif - #ifdef BOARD_HALLEY2 #include "board/halley2/board_halley2.h" #endif diff --git a/bsp/x1000/drivers/board/halley2_idelan/DL3223D-WIFIAUDIO-V1.0-SCH.pdf b/bsp/x1000/drivers/board/halley2_idelan/DL3223D-WIFIAUDIO-V1.0-SCH.pdf deleted file mode 100644 index 88fe788ca30e72918e7bf230dc581c8bf4870be7..0000000000000000000000000000000000000000 Binary files a/bsp/x1000/drivers/board/halley2_idelan/DL3223D-WIFIAUDIO-V1.0-SCH.pdf and /dev/null differ diff --git "a/bsp/x1000/drivers/board/halley2_idelan/MTF0240CMIL-06-SPEC(V4.0)-8\344\275\215\345\261\217.pdf" "b/bsp/x1000/drivers/board/halley2_idelan/MTF0240CMIL-06-SPEC(V4.0)-8\344\275\215\345\261\217.pdf" deleted file mode 100644 index baed15fe8134955d0c7b04e7af22590f137be5ce..0000000000000000000000000000000000000000 Binary files "a/bsp/x1000/drivers/board/halley2_idelan/MTF0240CMIL-06-SPEC(V4.0)-8\344\275\215\345\261\217.pdf" and /dev/null differ diff --git a/bsp/x1000/drivers/board/halley2_idelan/README_20160819.txt b/bsp/x1000/drivers/board/halley2_idelan/README_20160819.txt deleted file mode 100644 index af1be545675ea3f5efa06afed184100dca9be7ad..0000000000000000000000000000000000000000 --- a/bsp/x1000/drivers/board/halley2_idelan/README_20160819.txt +++ /dev/null @@ -1,6 +0,0 @@ -2016/08/29发布 -已知的硬件错误： --I2S 信号分配错误 I2SDI I2SDO反了 核心板的DO是输出 Codec的DO也是输出，核心板的DO需要接到Codec的SDI0上 --X1 12.288晶振不焊接，R13 需要焊接，核心板提供时钟（layout的时候，晶振保留） -- --layout问题，整个板子GND走线 很多实连接，手工焊接质量不保证 diff --git a/bsp/x1000/drivers/board/halley2_idelan/board_halley2_idelan.h b/bsp/x1000/drivers/board/halley2_idelan/board_halley2_idelan.h deleted file mode 100644 index ad4afc081c0961ac9b59f69c9b45ce05c26200b0..0000000000000000000000000000000000000000 --- a/bsp/x1000/drivers/board/halley2_idelan/board_halley2_idelan.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef BOARD_HALLEY2_IDELAN_H__ -#define BOARD_HALLEY2_IDELAN_H__ - - -#endif diff --git a/bsp/x1000/drivers/board_io.c b/bsp/x1000/drivers/board_io.c index 64ebfc2f322073cc265e71a7a5d6443cb8f9a172..b890ba43adabfe65f9f8f3dccdfe5b2c83c76a41 100644 --- a/bsp/x1000/drivers/board_io.c +++ b/bsp/x1000/drivers/board_io.c @@ -109,35 +109,6 @@ int io_phoenix(void) INIT_DEVICE_EXPORT(io_phoenix); #endif -#if defined(BOARD_OX) -int io_ox(void) -{ - /* PB6 for Audio Shutdown IO */ - gpio_set_func(GPIO_PORT_B, GPIO_Pin_6, GPIO_FUNC_1); - gpio_direction_output(GPIO_PORT_B,GPIO_Pin_6, 0); - gpio_set_value(GPIO_PORT_B,GPIO_Pin_6, 0); - - gpio_direction_output(GPIO_PORT_C, GPIO_Pin_25, GPIO_OUTPUT0); - rt_thread_delay(rt_tick_from_millisecond(100)); - gpio_direction_output(GPIO_PORT_C, GPIO_Pin_25, GPIO_OUTPUT1); - - /* PB19 for LCD black light */ - gpio_direction_output(GPIO_PORT_B,GPIO_Pin_19, GPIO_OUTPUT1); - -#ifdef RT_USING_EMAC - /* PC23 for MAC_RST_N */ - // gpio_set_func(GPIO_PORT_C, GPIO_Pin_23, GPIO_FUNC_0); - gpio_direction_output(GPIO_PORT_C, GPIO_Pin_23, 0); - rt_thread_delay(1); - gpio_direction_output(GPIO_PORT_C, GPIO_Pin_23, 1); - rt_thread_delay(1); -#endif - - return 0; -} -INIT_DEVICE_EXPORT(io_ox); -#endif - #ifdef BOARD_HALLEY2_REALBOARD int io_realboard(void) { @@ -194,7 +165,6 @@ int io_realboard_v2(void) INIT_BOARD_EXPORT(io_realboard_v2); #endif /* BOARD_HALLEY2_REALBOARD_V2 */ - #ifdef BOARD_HALLEY2_FIR int io_halley2_fir(void) {