summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbernard <[email protected]>2017-11-13 15:24:23 +0800
committerbernard <[email protected]>2017-11-13 15:24:23 +0800
commitd913068c7321cec5679a9c75df97ab5dc0934da9 (patch)
tree852e3e58951db2b75fdd51c0b40a061a3ec2f184
parent9fa72925a2a891087f83315e6eff706acc7e5b0b (diff)
[BSP] Remove CANNA board information.
-rw-r--r--bsp/x1000/drivers/Kconfig3
-rw-r--r--bsp/x1000/drivers/board.h4
-rw-r--r--bsp/x1000/drivers/board/canna/PD_X1000_CANNA_BASEBOARD_V2.1.pdfbin231314 -> 0 bytes
-rw-r--r--bsp/x1000/drivers/board/canna/PD_X1000_CANNA_COREBOARD_V1.0.pdfbin210900 -> 0 bytes
-rw-r--r--bsp/x1000/drivers/board/canna/board_canna.h6
-rw-r--r--bsp/x1000/drivers/board/phoenix/Ingenic Studio User Guide.docxbin1851919 -> 0 bytes
-rw-r--r--bsp/x1000/drivers/board/phoenix/JDI User Guide.docxbin714104 -> 0 bytes
-rw-r--r--bsp/x1000/drivers/board/phoenix/jz-x1000.gdbinit11
-rw-r--r--bsp/x1000/drivers/board_io.c19
9 files changed, 3 insertions, 40 deletions
diff --git a/bsp/x1000/drivers/Kconfig b/bsp/x1000/drivers/Kconfig
index 66d75a826c..881708a1fa 100644
--- a/bsp/x1000/drivers/Kconfig
+++ b/bsp/x1000/drivers/Kconfig
@@ -8,9 +8,6 @@ choice
config BOARD_HALLEY2
bool "Halley2 board"
- config BOARD_CANNA
- bool "CANNA board"
-
config BOARD_HALLEY2_FIR
bool "Fir board"
diff --git a/bsp/x1000/drivers/board.h b/bsp/x1000/drivers/board.h
index 62d70c6116..7053efbecc 100644
--- a/bsp/x1000/drivers/board.h
+++ b/bsp/x1000/drivers/board.h
@@ -52,10 +52,6 @@
#include "board/phoenix/board_phoenix.h"
#endif
-#ifdef BOARD_CANNA
-#include "board/canna/board_canna.h"
-#endif
-
/*
* Clock setting
*/
diff --git a/bsp/x1000/drivers/board/canna/PD_X1000_CANNA_BASEBOARD_V2.1.pdf b/bsp/x1000/drivers/board/canna/PD_X1000_CANNA_BASEBOARD_V2.1.pdf
deleted file mode 100644
index 15a3f892e9..0000000000
--- a/bsp/x1000/drivers/board/canna/PD_X1000_CANNA_BASEBOARD_V2.1.pdf
+++ /dev/null
Binary files differ
diff --git a/bsp/x1000/drivers/board/canna/PD_X1000_CANNA_COREBOARD_V1.0.pdf b/bsp/x1000/drivers/board/canna/PD_X1000_CANNA_COREBOARD_V1.0.pdf
deleted file mode 100644
index 1ce34921a8..0000000000
--- a/bsp/x1000/drivers/board/canna/PD_X1000_CANNA_COREBOARD_V1.0.pdf
+++ /dev/null
Binary files differ
diff --git a/bsp/x1000/drivers/board/canna/board_canna.h b/bsp/x1000/drivers/board/canna/board_canna.h
deleted file mode 100644
index 816abe1f0e..0000000000
--- a/bsp/x1000/drivers/board/canna/board_canna.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef BOARD_CANNA_H__
-#define BOARD_CANNA_H__
-
-
-#endif
-
diff --git a/bsp/x1000/drivers/board/phoenix/Ingenic Studio User Guide.docx b/bsp/x1000/drivers/board/phoenix/Ingenic Studio User Guide.docx
deleted file mode 100644
index ff7ef2b0fa..0000000000
--- a/bsp/x1000/drivers/board/phoenix/Ingenic Studio User Guide.docx
+++ /dev/null
Binary files differ
diff --git a/bsp/x1000/drivers/board/phoenix/JDI User Guide.docx b/bsp/x1000/drivers/board/phoenix/JDI User Guide.docx
deleted file mode 100644
index 27085345b7..0000000000
--- a/bsp/x1000/drivers/board/phoenix/JDI User Guide.docx
+++ /dev/null
Binary files differ
diff --git a/bsp/x1000/drivers/board/phoenix/jz-x1000.gdbinit b/bsp/x1000/drivers/board/phoenix/jz-x1000.gdbinit
deleted file mode 100644
index 1c12b9af77..0000000000
--- a/bsp/x1000/drivers/board/phoenix/jz-x1000.gdbinit
+++ /dev/null
@@ -1,11 +0,0 @@
-#connect to the JDI gdb server
-target remote 169.28.23.51:2823
-
-#set remote write size
-set remotewritesize fixed
-set remotewritesize 8192
-
-#load the debug image
-load
-
-#debug begin
diff --git a/bsp/x1000/drivers/board_io.c b/bsp/x1000/drivers/board_io.c
index b890ba43ad..d4c4289714 100644
--- a/bsp/x1000/drivers/board_io.c
+++ b/bsp/x1000/drivers/board_io.c
@@ -52,31 +52,18 @@ INIT_DEVICE_EXPORT(io_AP6212);
*/
int io_AP6212_bt(void)
{
- rtc32k_enable();
+ rtc32k_enable();
return 0;
}
INIT_DEVICE_EXPORT(io_AP6212_bt);
#endif
-#if defined(BOARD_CANNA)
-int io_canna(void)
-{
- /* PC25(1) for Audio Shutdown IO */
- gpio_set_func(GPIO_PORT_C, GPIO_Pin_25, GPIO_FUNC_1);
- gpio_direction_output(GPIO_PORT_C,GPIO_Pin_25, 0);
- gpio_set_value(GPIO_PORT_C,GPIO_Pin_25, 0);
-
- return 0;
-}
-INIT_DEVICE_EXPORT(io_canna);
-#endif
-
#if defined(BOARD_HALLEY2)
int io_halley2(void)
{
#ifdef RT_USING_EMAC
- /* PC23 for MAC_RST_N */
+ /* 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);
@@ -133,7 +120,7 @@ int io_realboard(void)
gpio_direction_output(GPIO_PORT_C, GPIO_Pin_23, 1);
_delay_ms(100);
#endif
- return 0;
+ return 0;
}
INIT_BOARD_EXPORT(io_realboard);
#endif /* BOARD_HALLEY2_REALBOARD_X1000 */