Merge pull request #2617 from qz721/fix-platform

Rename 'platform.h' in 'imx6ul' and 'qemu-vexpress-a9' BSPs.

bsp/imx6ul/drivers/board.h

@@ -13,6 +13,7 @@
 
 #include <registers.h>
 #include <irq_numbers.h>
+#include "imx6ul.h"
 
 #define CONFIG_MX6
 #define CONFIG_MX6UL

bsp/imx6ul/drivers/imx6ul.h

@@ -7,8 +7,8 @@
  * Date           Author       Notes
  * 2018-03-22     quanzhao     first version
  */
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
+#ifndef __IMX6UL_H__
+#define __IMX6UL_H__
 
 #include <rthw.h>
 #include <rtthread.h>
@@ -93,4 +93,4 @@ rt_inline void disable_interrupt(uint32_t irq_id, uint32_t cpu_id)
     rt_hw_interrupt_mask(irq_id);
 }
 
-#endif  /* __PLATFORM_H__ */
+#endif  /* __IMX6UL_H__ */

bsp/qemu-vexpress-a9/drivers/board.h

@@ -16,6 +16,7 @@
 #define __BOARD_H__
 
 #include <realview.h>
+#include "vexpress_a9.h"
 
 #if defined(__CC_ARM)
 extern int Image$$RW_IRAM1$$ZI$$Limit;

bsp/qemu-vexpress-a9/drivers/vexpress_a9.h

@@ -8,8 +8,8 @@
  * 2018-03-22     quanzhao     first version
  */
 
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
+#ifndef __VEXPRESS_A9_H__
+#define __VEXPRESS_A9_H__
 
 /* for 'rt_inline' */
 #include <rtdef.h>
@@ -34,4 +34,4 @@ rt_inline rt_uint32_t platform_get_gic_cpu_base(void)
 
 #define GIC_ACK_INTID_MASK  0x000003ff
 
-#endif  /* __PLATFORM_H__ */
+#endif  /* __VEXPRESS_A9_H__ */

bsp/qemu-vexpress-a9/platform/SConscript

@@ -1,13 +0,0 @@
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-''')
-
-CPPPATH = [ cwd + '/cpu',
-cwd + '/include',
-]
-
-group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libcpu/arm/cortex-a/gic.h

@@ -12,7 +12,7 @@
 #define __GIC_H__
 
 #include <rthw.h>
-#include <platform.h>
+#include <board.h>
 
 int arm_gic_dist_init(rt_uint32_t index, rt_uint32_t dist_base, int irq_start);
 int arm_gic_cpu_init(rt_uint32_t index, rt_uint32_t cpu_base);

libcpu/arm/cortex-a/interrupt.h

@@ -12,7 +12,7 @@
 #define __INTERRUPT_H__
 
 #include <rthw.h>
-#include <platform.h>
+#include <board.h>
 
 #define INT_IRQ     0x00
 #define INT_FIQ     0x01

libcpu/arm/cortex-a/trap.c

@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <platform.h>
+#include <board.h>
 
 #include "armv7.h"
 #include "interrupt.h"