Просмотр исходного кода

AT32UC3B: Fix compilation problem for BSP by defining RT_CPUS_NR (#8152)

Raman 1 год назад
Родитель
Сommit
fb5154f741
4 измененных файлов с 13 добавлено и 16 удалено
  1. 7 10
      bsp/avr32uc3b0/.config
  2. 1 1
      bsp/avr32uc3b0/README.md
  3. 1 2
      bsp/avr32uc3b0/drv_uart.c
  4. 4 3
      bsp/avr32uc3b0/rtconfig.h

+ 7 - 10
bsp/avr32uc3b0/.config

@@ -10,6 +10,7 @@ CONFIG_RT_NAME_MAX=8
 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set
 # CONFIG_RT_USING_AMP is not set
 # CONFIG_RT_USING_SMP is not set
+CONFIG_RT_CPUS_NR=1
 CONFIG_RT_ALIGN_SIZE=8
 # CONFIG_RT_THREAD_PRIORITY_8 is not set
 CONFIG_RT_THREAD_PRIORITY_32=y
@@ -64,13 +65,8 @@ CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y
 # CONFIG_RT_USING_MEMTRACE is not set
 # CONFIG_RT_USING_HEAP_ISR is not set
 CONFIG_RT_USING_HEAP=y
-
-#
-# Kernel Device Object
-#
 CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
-# CONFIG_RT_USING_DM is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
@@ -115,6 +111,7 @@ CONFIG_FINSH_USING_OPTION_COMPLETION=y
 #
 # Device Drivers
 #
+# CONFIG_RT_USING_DM is not set
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_UNAMED_PIPE_NUMBER=64
 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
@@ -138,7 +135,6 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_MTD_NOR is not set
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_PM is not set
-# CONFIG_RT_USING_FDT is not set
 # CONFIG_RT_USING_RTC is not set
 # CONFIG_RT_USING_SDIO is not set
 # CONFIG_RT_USING_SPI is not set
@@ -221,6 +217,11 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
 # CONFIG_RT_USING_RT_LINK is not set
 # CONFIG_RT_USING_VBUS is not set
 
+#
+# Memory management
+#
+# CONFIG_RT_USING_MEMBLOCK is not set
+
 #
 # RT-Thread Utestcases
 #
@@ -991,10 +992,6 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
 CONFIG_BSP_USING_PIN=y
 CONFIG_BSP_USING_UART=y
 # CONFIG_BSP_USING_UART0 is not set
-# CONFIG_BSP_UART0_TX_PIN_19 is not set
-# CONFIG_BSP_UART0_TX_PIN_43 is not set
-# CONFIG_BSP_UART0_RX_PIN_18 is not set
-# CONFIG_BSP_UART0_RX_PIN_42 is not set
 CONFIG_BSP_USING_UART1=y
 CONFIG_BSP_UART1_TX_PIN_34=y
 # CONFIG_BSP_UART1_TX_PIN_23 is not set

+ 1 - 1
bsp/avr32uc3b0/README.md

@@ -70,7 +70,7 @@ comes with Microchip Studio. I didn't have to do much here. Just make sure
 `atprogram.exe' is in your PATH.
 
 ```bash
-atprogram -t atmelice -i jtag -d at32uc3a0512 program -f rtthread-uc3b0256.elf
+atprogram -t atmelice -i jtag -d at32uc3b0256 program -f rtthread-uc3b0256.elf
 ```
 
 Note that you should already see the on-board LEDs (PA7, PA8) blink if your

+ 1 - 2
bsp/avr32uc3b0/drv_uart.c

@@ -223,8 +223,7 @@ static rt_err_t avr32uc3b_uart_control(struct rt_serial_device *serial, int cmd,
         // And set up and enable the interrupt handlers
         //INTC_init_interrupts();
         INTC_register_interrupt(uart->uart_isr, uart->irqno, uart->irq_level);
-        //*(uart->instance)->ier = AVR32_USART_IER_RXRDY_MASK;
-        AVR32_USART1.ier = AVR32_USART_IER_RXRDY_MASK;
+        uart->instance->ier = AVR32_USART_IER_RXRDY_MASK;
         break;
     }
     return RT_EOK;

+ 4 - 3
bsp/avr32uc3b0/rtconfig.h

@@ -7,6 +7,7 @@
 /* RT-Thread Kernel */
 
 #define RT_NAME_MAX 8
+#define RT_CPUS_NR 1
 #define RT_ALIGN_SIZE 8
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
@@ -41,9 +42,6 @@
 #define RT_USING_SMALL_MEM
 #define RT_USING_SMALL_MEM_AS_HEAP
 #define RT_USING_HEAP
-
-/* Kernel Device Object */
-
 #define RT_USING_DEVICE
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
@@ -108,6 +106,9 @@
 /* Utilities */
 
 
+/* Memory management */
+
+
 /* RT-Thread Utestcases */