!611 Fix d1s compilation error

Merge pull request !611 from Rb/d1s

bsp/allwinner/README.md

@@ -1,3 +1,3 @@
 # allwinner-bsp
 
-针对全志芯片的rt-smart bsp，包括D1/F133（RISC-V64）
+针对全志芯片的rt-smart bsp，包括D1/D1s（RISC-V64）

bsp/allwinner/d1s/.config

@@ -142,7 +142,6 @@ CONFIG_RT_USING_DFS_DEVFS=y
 # 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
 
 #
 # Device Drivers
@@ -162,9 +161,7 @@ CONFIG_RT_USING_TTY=y
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set
-CONFIG_RT_USING_I2C=y
-# CONFIG_RT_I2C_DEBUG is not set
-# CONFIG_RT_USING_I2C_BITOPS is not set
+# CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
@@ -172,7 +169,7 @@ CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_NULL=y
 CONFIG_RT_USING_ZERO=y
 CONFIG_RT_USING_RANDOM=y
-CONFIG_RT_USING_PWM=y
+# CONFIG_RT_USING_PWM is not set
 # CONFIG_RT_USING_MTD_NOR is not set
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_PM is not set
@@ -181,12 +178,7 @@ CONFIG_RT_USING_RTC=y
 # CONFIG_RT_USING_ALARM is not set
 # CONFIG_RT_USING_SOFT_RTC is not set
 # CONFIG_RT_USING_SDIO is not set
-CONFIG_RT_USING_SPI=y
-# CONFIG_RT_USING_QSPI is not set
-# CONFIG_RT_USING_SPI_MSD is not set
-# CONFIG_RT_USING_SFUD is not set
-# CONFIG_RT_USING_ENC28J60 is not set
-# CONFIG_RT_USING_SPI_WIFI is not set
+# CONFIG_RT_USING_SPI is not set
 CONFIG_RT_USING_WDT=y
 CONFIG_RT_USING_AUDIO=y
 CONFIG_RT_AUDIO_REPLAY_MP_BLOCK_SIZE=4096
@@ -194,39 +186,13 @@ 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 is not set
+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
 # CONFIG_RT_USING_INPUT_CAPTURE is not set
 CONFIG_RT_USING_DEV_BUS=y
-CONFIG_RT_USING_WIFI=y
-CONFIG_RT_WLAN_DEVICE_STA_NAME="wlan0"
-CONFIG_RT_WLAN_DEVICE_AP_NAME="wlan1"
-CONFIG_RT_WLAN_SSID_MAX_LENGTH=32
-CONFIG_RT_WLAN_PASSWORD_MAX_LENGTH=32
-CONFIG_RT_WLAN_DEV_EVENT_NUM=2
-CONFIG_RT_WLAN_MANAGE_ENABLE=y
-CONFIG_RT_WLAN_SCAN_WAIT_MS=10000
-CONFIG_RT_WLAN_CONNECT_WAIT_MS=10000
-CONFIG_RT_WLAN_SCAN_SORT=y
-CONFIG_RT_WLAN_MSH_CMD_ENABLE=y
-CONFIG_RT_WLAN_AUTO_CONNECT_ENABLE=y
-CONFIG_AUTO_CONNECTION_PERIOD_MS=2000
-CONFIG_RT_WLAN_CFG_ENABLE=y
-CONFIG_RT_WLAN_CFG_INFO_MAX=3
-CONFIG_RT_WLAN_PROT_ENABLE=y
-CONFIG_RT_WLAN_PROT_NAME_LEN=8
-CONFIG_RT_WLAN_PROT_MAX=2
-CONFIG_RT_WLAN_DEFAULT_PROT="lwip"
-CONFIG_RT_WLAN_PROT_LWIP_ENABLE=y
-CONFIG_RT_WLAN_PROT_LWIP_NAME="lwip"
-# CONFIG_RT_WLAN_PROT_LWIP_PBUF_FORCE is not set
-CONFIG_RT_WLAN_WORK_THREAD_ENABLE=y
-CONFIG_RT_WLAN_WORKQUEUE_THREAD_NAME="wlan"
-CONFIG_RT_WLAN_WORKQUEUE_THREAD_SIZE=4096
-CONFIG_RT_WLAN_WORKQUEUE_THREAD_PRIO=15
-# CONFIG_RT_WLAN_DEBUG is not set
+# CONFIG_RT_USING_WIFI is not set
 # CONFIG_RT_USING_VIRTIO is not set
 
 #
@@ -262,99 +228,22 @@ CONFIG_RT_USING_POSIX_CLOCKTIME=y
 #
 # Socket abstraction layer
 #
-CONFIG_RT_USING_SAL=y
-
-#
-# protocol stack implement
-#
-CONFIG_SAL_USING_LWIP=y
-# CONFIG_SAL_USING_POSIX is not set
-# CONFIG_SAL_USING_AF_UNIX is not set
-CONFIG_SAL_SOCKETS_NUM=16
+# CONFIG_RT_USING_SAL is not set
 
 #
 # Network interface device
 #
-CONFIG_RT_USING_NETDEV=y
-CONFIG_NETDEV_USING_IFCONFIG=y
-CONFIG_NETDEV_USING_PING=y
-CONFIG_NETDEV_USING_NETSTAT=y
-CONFIG_NETDEV_USING_AUTO_DEFAULT=y
-# CONFIG_NETDEV_USING_IPV6 is not set
-CONFIG_NETDEV_IPV4=1
-CONFIG_NETDEV_IPV6=0
-# CONFIG_NETDEV_IPV6_SCOPES is not set
+# CONFIG_RT_USING_NETDEV is not set
 
 #
 # light weight TCP/IP stack
 #
-CONFIG_RT_USING_LWIP=y
-# CONFIG_RT_USING_LWIP141 is not set
-CONFIG_RT_USING_LWIP202=y
-# CONFIG_RT_USING_LWIP212 is not set
-# CONFIG_RT_USING_LWIP_IPV6 is not set
-CONFIG_RT_LWIP_MEM_ALIGNMENT=4
-CONFIG_RT_LWIP_IGMP=y
-CONFIG_RT_LWIP_ICMP=y
-# CONFIG_RT_LWIP_SNMP is not set
-CONFIG_RT_LWIP_DNS=y
-CONFIG_RT_LWIP_DHCP=y
-CONFIG_IP_SOF_BROADCAST=1
-CONFIG_IP_SOF_BROADCAST_RECV=1
-
-#
-# Static IPv4 Address
-#
-CONFIG_RT_LWIP_IPADDR="192.168.1.30"
-CONFIG_RT_LWIP_GWADDR="192.168.1.1"
-CONFIG_RT_LWIP_MSKADDR="255.255.255.0"
-CONFIG_RT_LWIP_UDP=y
-CONFIG_RT_LWIP_TCP=y
-CONFIG_RT_LWIP_RAW=y
-# CONFIG_RT_LWIP_PPP is not set
-CONFIG_RT_MEMP_NUM_NETCONN=16
-CONFIG_RT_MEMP_NUM_TCPIP_MSG_API=16
-CONFIG_RT_MEMP_NUM_TCPIP_MSG_INPKT=16
-CONFIG_RT_LWIP_PBUF_NUM=32
-CONFIG_RT_LWIP_PBUF_STRUCT_NUM=16
-CONFIG_RT_LWIP_NETBUF_NUM=16
-CONFIG_RT_LWIP_RAW_PCB_NUM=4
-CONFIG_RT_LWIP_UDP_PCB_NUM=4
-CONFIG_RT_UDP_RECVMBOX_SIZE=16
-CONFIG_RT_RECV_BUFSIZE_DEFAULT=64
-CONFIG_RT_LWIP_TCP_PCB_NUM=4
-CONFIG_RT_LWIP_TCP_SEG_NUM=40
-CONFIG_RT_LWIP_TCP_SND_BUF=8196
-CONFIG_RT_LWIP_TCP_WND=8196
-CONFIG_RT_TCP_RECVMBOX_SIZE=16
-CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=10
-CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=8
-CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=8192
-# CONFIG_LWIP_NO_RX_THREAD is not set
-# CONFIG_LWIP_NO_TX_THREAD is not set
-CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=12
-CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=1024
-CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=32
-# CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set
-CONFIG_LWIP_NETIF_STATUS_CALLBACK=1
-CONFIG_LWIP_NETIF_LINK_CALLBACK=1
-CONFIG_SO_REUSE=1
-CONFIG_LWIP_SO_RCVTIMEO=1
-CONFIG_LWIP_SO_SNDTIMEO=1
-CONFIG_LWIP_SO_RCVBUF=1
-CONFIG_LWIP_SO_LINGER=0
-# CONFIG_RT_LWIP_NETIF_LOOPBACK is not set
-CONFIG_LWIP_NETIF_LOOPBACK=0
-# CONFIG_RT_LWIP_STATS is not set
-# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
-CONFIG_RT_LWIP_USING_PING=y
-# CONFIG_RT_LWIP_DEBUG is not set
+# CONFIG_RT_USING_LWIP is not set
 
 #
 # AT commands
 #
 # CONFIG_RT_USING_AT is not set
-# CONFIG_LWIP_USING_DHCPD is not set
 
 #
 # VBUS(Virtual Software BUS)
@@ -864,7 +753,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64
 #
 # CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
 # CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
-CONFIG_BOARD_allwinnerf133=y
+CONFIG_BOARD_allwinnerd1s=y
 CONFIG_ENABLE_FPU=y
 # CONFIG_RT_USING_USERSPACE_32BIT_LIMIT is not set
 CONFIG___STACKSIZE__=16384
@@ -896,7 +785,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
 
 #

bsp/allwinner/d1s/Kconfig

@@ -18,7 +18,7 @@ config PKGS_DIR
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"
 
-config BOARD_allwinnerf133
+config BOARD_allwinnerd1s
     bool
     select ARCH_RISCV64
     select RT_USING_COMPONENTS_INIT

bsp/allwinner/d1s/applications/mnt.c

@@ -44,14 +44,9 @@ int sd_check_thread_entry(void *p)
         /* 挂载sd1分区 */
         if (RT_NULL != rt_device_find("sd0p1"))
         {
-            if (access("/data", 0) != 0)
+            if (dfs_mount("sd0p1", "/", "elm", 0, 0) == 0)
             {
-                mkdir("/data", 0777);
-            }
-
-            if (dfs_mount("sd0p1", "/data", "elm", 0, 0) == 0)
-            {
-                rt_kprintf("Mount \"sd0p1\" on \"/data\" success\n");
+                rt_kprintf("Mount \"sd0p1\" on \"/\" success\n");
             }
             else
             {

bsp/allwinner/d1s/mkimage

@@ -61,20 +61,18 @@
 
 /* C++ features */
 
-
-/* Command shell */
-
-#define RT_USING_FINSH
 #define RT_USING_MSH
+#define RT_USING_FINSH
 #define FINSH_USING_MSH
 #define FINSH_THREAD_NAME "tshell"
+#define FINSH_THREAD_PRIORITY 20
+#define FINSH_THREAD_STACK_SIZE 8192
 #define FINSH_USING_HISTORY
 #define FINSH_HISTORY_LINES 5
 #define FINSH_USING_SYMTAB
-#define FINSH_USING_DESCRIPTION
-#define FINSH_THREAD_PRIORITY 20
-#define FINSH_THREAD_STACK_SIZE 8192
 #define FINSH_CMD_SIZE 80
+#define MSH_USING_BUILT_IN_COMMANDS
+#define FINSH_USING_DESCRIPTION
 #define FINSH_ARG_MAX 10
 
 /* Device virtual file system */
@@ -107,50 +105,28 @@
 #define RT_SYSTEM_WORKQUEUE_STACKSIZE 4096
 #define RT_SYSTEM_WORKQUEUE_PRIORITY 23
 #define RT_USING_SERIAL
-#define RT_SERIAL_RB_BUFSZ 64
+#define RT_USING_SERIAL_V2
 #define RT_USING_TTY
-#define RT_USING_I2C
 #define RT_USING_PIN
 #define RT_USING_NULL
 #define RT_USING_ZERO
 #define RT_USING_RANDOM
-#define RT_USING_PWM
 #define RT_USING_RTC
-#define RT_USING_SPI
 #define RT_USING_WDT
 #define RT_USING_AUDIO
 #define RT_AUDIO_REPLAY_MP_BLOCK_SIZE 4096
 #define RT_AUDIO_REPLAY_MP_BLOCK_COUNT 2
 #define RT_AUDIO_RECORD_PIPE_SIZE 2048
 #define RT_USING_TOUCH
-#define RT_USING_WIFI
-#define RT_WLAN_DEVICE_STA_NAME "wlan0"
-#define RT_WLAN_DEVICE_AP_NAME "wlan1"
-#define RT_WLAN_SSID_MAX_LENGTH 32
-#define RT_WLAN_PASSWORD_MAX_LENGTH 32
-#define RT_WLAN_DEV_EVENT_NUM 2
-#define RT_WLAN_MANAGE_ENABLE
-#define RT_WLAN_SCAN_WAIT_MS 10000
-#define RT_WLAN_CONNECT_WAIT_MS 10000
-#define RT_WLAN_SCAN_SORT
-#define RT_WLAN_MSH_CMD_ENABLE
-#define RT_WLAN_AUTO_CONNECT_ENABLE
-#define AUTO_CONNECTION_PERIOD_MS 2000
-#define RT_WLAN_CFG_ENABLE
-#define RT_WLAN_CFG_INFO_MAX 3
-#define RT_WLAN_PROT_ENABLE
-#define RT_WLAN_PROT_NAME_LEN 8
-#define RT_WLAN_PROT_MAX 2
-#define RT_WLAN_DEFAULT_PROT "lwip"
-#define RT_WLAN_PROT_LWIP_ENABLE
-#define RT_WLAN_PROT_LWIP_NAME "lwip"
-#define RT_WLAN_WORK_THREAD_ENABLE
-#define RT_WLAN_WORKQUEUE_THREAD_NAME "wlan"
-#define RT_WLAN_WORKQUEUE_THREAD_SIZE 4096
-#define RT_WLAN_WORKQUEUE_THREAD_PRIO 15
+#define RT_TOUCH_PIN_IRQ
+#define RT_USING_DEV_BUS
 
 /* Using USB */
 
+#define RT_USING_FAL
+#define FAL_DEBUG_CONFIG
+#define FAL_DEBUG 1
+#define FAL_PART_HAS_TABLE_CFG
 
 /* POSIX layer and C standard library */
 
@@ -163,73 +139,12 @@
 
 /* Socket abstraction layer */
 
-#define RT_USING_SAL
-
-/* protocol stack implement */
-
-#define SAL_USING_LWIP
-#define SAL_SOCKETS_NUM 16
 
 /* Network interface device */
 
-#define RT_USING_NETDEV
-#define NETDEV_USING_IFCONFIG
-#define NETDEV_USING_PING
-#define NETDEV_USING_NETSTAT
-#define NETDEV_USING_AUTO_DEFAULT
-#define NETDEV_IPV4 1
-#define NETDEV_IPV6 0
 
 /* light weight TCP/IP stack */
 
-#define RT_USING_LWIP
-#define RT_USING_LWIP202
-#define RT_LWIP_MEM_ALIGNMENT 4
-#define RT_LWIP_IGMP
-#define RT_LWIP_ICMP
-#define RT_LWIP_DNS
-#define RT_LWIP_DHCP
-#define IP_SOF_BROADCAST 1
-#define IP_SOF_BROADCAST_RECV 1
-
-/* Static IPv4 Address */
-
-#define RT_LWIP_IPADDR "192.168.1.30"
-#define RT_LWIP_GWADDR "192.168.1.1"
-#define RT_LWIP_MSKADDR "255.255.255.0"
-#define RT_LWIP_UDP
-#define RT_LWIP_TCP
-#define RT_LWIP_RAW
-#define RT_MEMP_NUM_NETCONN 16
-#define RT_MEMP_NUM_TCPIP_MSG_API 16
-#define RT_MEMP_NUM_TCPIP_MSG_INPKT 16
-#define RT_LWIP_PBUF_NUM 32
-#define RT_LWIP_PBUF_STRUCT_NUM 16
-#define RT_LWIP_NETBUF_NUM 16
-#define RT_LWIP_RAW_PCB_NUM 4
-#define RT_LWIP_UDP_PCB_NUM 4
-#define RT_UDP_RECVMBOX_SIZE 16
-#define RT_RECV_BUFSIZE_DEFAULT 64
-#define RT_LWIP_TCP_PCB_NUM 4
-#define RT_LWIP_TCP_SEG_NUM 40
-#define RT_LWIP_TCP_SND_BUF 8196
-#define RT_LWIP_TCP_WND 8196
-#define RT_TCP_RECVMBOX_SIZE 16
-#define RT_LWIP_TCPTHREAD_PRIORITY 10
-#define RT_LWIP_TCPTHREAD_MBOX_SIZE 8
-#define RT_LWIP_TCPTHREAD_STACKSIZE 8192
-#define RT_LWIP_ETHTHREAD_PRIORITY 12
-#define RT_LWIP_ETHTHREAD_STACKSIZE 1024
-#define RT_LWIP_ETHTHREAD_MBOX_SIZE 32
-#define LWIP_NETIF_STATUS_CALLBACK 1
-#define LWIP_NETIF_LINK_CALLBACK 1
-#define SO_REUSE 1
-#define LWIP_SO_RCVTIMEO 1
-#define LWIP_SO_SNDTIMEO 1
-#define LWIP_SO_RCVBUF 1
-#define LWIP_SO_LINGER 0
-#define LWIP_NETIF_LOOPBACK 0
-#define RT_LWIP_USING_PING
 
 /* AT commands */
 
@@ -301,9 +216,6 @@
 
 /* Micrium: Micrium software products porting for RT-Thread */
 
-#define PKG_USING_PARTITION
-#define FAL_DEBUG_CONFIG
-#define FAL_PART_HAS_TABLE_CFG
 
 /* peripheral libraries and drivers */
 
@@ -338,7 +250,7 @@
 
 /* Project libraries */
 
-#define BOARD_allwinnerf133
+#define BOARD_allwinnerd1s
 #define ENABLE_FPU
 #define __STACKSIZE__ 16384
 

bsp/allwinner/libraries/drivers/Kconfig

@@ -17,7 +17,7 @@ menuconfig BSP_USING_UART0
     if BSP_USING_UART0
         choice
             prompt "UART0 TX PIN"
-            default UART0_TX_USING_GPIOE2 if BOARD_allwinnerf133
+            default UART0_TX_USING_GPIOE2 if BOARD_allwinnerd1s
             default UART0_TX_USING_GPIOB8 if BOARD_allwinnerd1
 
             if BOARD_allwinnerd1
@@ -31,7 +31,7 @@ menuconfig BSP_USING_UART0
         endchoice
         choice
             prompt "UART0 RX PIN"
-            default UART0_RX_USING_GPIOE3 if BOARD_allwinnerf133
+            default UART0_RX_USING_GPIOE3 if BOARD_allwinnerd1s
             default UART0_RX_USING_GPIOB9 if BOARD_allwinnerd1
 
             if BOARD_allwinnerd1

bsp/allwinner/libraries/drivers/drv_lcd.c

@@ -15,6 +15,7 @@
 
 #include "interrupt.h"
 #include "mmu.h"
+#include "cache.h"
 
 #ifdef BSP_USING_LCD
 
@@ -506,6 +507,22 @@ void set_lcd_backlight(rt_uint8_t value)
     rt_pwm_enable(pwm_dev, LCD_PWM_DEV_CHANNEL);
 }
 
+rt_err_t rt_pwm_get(struct rt_device_pwm *device, int channel)
+{
+    rt_err_t result = RT_EOK;
+    struct rt_pwm_configuration configuration = {0};
+
+    if (!device)
+    {
+        return -RT_EIO;
+    }
+
+    configuration.channel = channel;
+    result = rt_device_control(&device->parent, PWM_CMD_GET, &configuration);
+
+    return result;
+}
+
 rt_uint8_t get_lcd_backlight(void)
 {
     int result = 0;
@@ -514,8 +531,7 @@ rt_uint8_t get_lcd_backlight(void)
 
     pwm_dev = (struct rt_device_pwm *)rt_device_find(_panel->bl_pwm_name);
     cfg.channel = LCD_PWM_DEV_CHANNEL;
-    extern rt_err_t rt_pwm_get(struct rt_device_pwm * device, struct rt_pwm_configuration * cfg);
-    rt_pwm_get(pwm_dev, &cfg);
+    rt_pwm_get(pwm_dev, LCD_PWM_DEV_CHANNEL);
 
     return cfg.pulse / (10000000 / _panel->bl_pwm_hz);
 }

bsp/allwinner/libraries/sunxi-hal/hal/source/gmac/Kconfig

@@ -6,7 +6,7 @@ config DRIVERS_GMAC
     if DRIVERS_GMAC
         choice
             prompt "GMAC media independent interface"
-            default GMAC_USING_RMII if BOARD_allwinnerf133
+            default GMAC_USING_RMII if BOARD_allwinnerd1s
             default GMAC_USING_RGMII if BOARD_allwinnerd1
 
             config GMAC_USING_RGMII
@@ -16,7 +16,7 @@ config DRIVERS_GMAC
         endchoice
         choice
             prompt "GMAC GPIO GROUP"
-            default GMAC_USING_GPIOG if BOARD_allwinnerf133
+            default GMAC_USING_GPIOG if BOARD_allwinnerd1s
             default GMAC_USING_GPIOE if BOARD_allwinnerd1
 
             config GMAC_USING_GPIOE

bsp/allwinner/libraries/sunxi-hal/hal/source/gmac/hal_geth.c

@@ -458,10 +458,10 @@ static void geth_pinctrl_init(void)
     hal_gpio_pinmux_set_function(GPIO_PE15, 8);
 #endif /* BOARD_allwinnerd1 */
 
-#ifdef BOARD_allwinnerf133
+#ifdef BOARD_allwinnerd1s
     hal_gpio_pinmux_set_function(GPIO_PG9, 4);
     hal_gpio_pinmux_set_function(GPIO_PG10, 4);
-#endif /* BOARD_allwinnerf133 */
+#endif /* BOARD_allwinnerd1s */
 
 #endif /* GMAC_USING_RGMII */
 #endif /* GMAC_USING_GPIOE */

bsp/allwinner/libraries/sunxi-hal/hal/source/uart/platform/uart-sun8iw20.h

@@ -117,7 +117,7 @@
 #ifdef BOARD_allwinnerd1
 #define UART0_TX        GPIOB(8)
 #define UART0_RX        GPIOB(9)
-#elif defined(BOARD_allwinnerf133)
+#elif defined(BOARD_allwinnerd1s)
 #define UART0_TX        GPIOE(2)
 #define UART0_RX        GPIOE(3)
 #endif