Add support for the DISCO_F429ZI target

Author: adustm

source/led.cpp

@@ -30,7 +30,7 @@ static const UvisorBoxAclItem acl[] = {
 static void my_box_main(const void *);
 
 UVISOR_BOX_NAMESPACE(NULL);
-UVISOR_BOX_HEAPSIZE(8192);
+UVISOR_BOX_HEAPSIZE(3072);
 UVISOR_BOX_MAIN(my_box_main, osPriorityNormal, UVISOR_BOX_STACK_SIZE);
 UVISOR_BOX_CONFIG(my_box, acl, UVISOR_BOX_STACK_SIZE, my_box_context);
 
@@ -64,12 +64,12 @@ static void my_box_main(const void *)
         *uvisor_ctx->led = LED_OFF;
 
         /* allocate a box-specific switch handler */
-        if(!(uvisor_ctx->sw = new InterruptIn(SW2)))
+        if(!(uvisor_ctx->sw = new InterruptIn(SECURE_SWITCH)))
             pc->printf("ERROR: failed to allocate memories for SW1\n");
         else
         {
             /* register handler for switch SW1 */
-            uvisor_ctx->sw->mode(PullUp);
+            uvisor_ctx->sw->mode(SECURE_SWITCH_PULL);
             uvisor_ctx->sw->fall(my_box_switch_irq);
 
             /* no problem to return here as everything is initialized */

source/main-hw.h

@@ -17,17 +17,14 @@
 #ifndef __UVISOR_HELLOWORLD_MAIN_HW_H__
 #define __UVISOR_HELLOWORLD_MAIN_HW_H__
 
-/* The vector containing the challenge is shared with the push-button ISR, so
- * that it can attempt to access it from an IRQ context. */
+#if defined(TARGET_K64F)
 
-#define LED_ON  false
-#define LED_OFF true
-
-#define MAIN_LED LED_BLUE
-#define SECURE_LED LED_RED
-
-#define MAIN_BTN SW2
-#define MAIN_BTN_PUPD PullUp
+#define MAIN_LED           LED1
+#define SECURE_LED         LED2
+#define LED_ON             false
+#define LED_OFF            true
+#define SECURE_SWITCH      SW2
+#define SECURE_SWITCH_PULL PullUp
 
 #define MAIN_ACL(acl_list_name) \
     static const UvisorBoxAclItem acl_list_name[] = {     \
@@ -48,4 +45,36 @@
         {SPI0,   sizeof(*SPI0),   UVISOR_TACLDEF_PERIPH}, \
     }
 
+#elif defined(TARGET_DISCO_F429ZI)
+
+#define MAIN_LED           LED1
+#define SECURE_LED         LED2
+#define LED_ON             true
+#define LED_OFF            false
+#define SECURE_SWITCH      USER_BUTTON
+#define SECURE_SWITCH_PULL PullDown
+
+#define MAIN_ACL(acl_list_name) \
+    static const UvisorBoxAclItem acl_list_name[] = {     \
+        {GPIOA,               sizeof(*GPIOA),  UVISOR_TACLDEF_PERIPH}, \
+        {GPIOB,               sizeof(*GPIOB),  UVISOR_TACLDEF_PERIPH}, \
+        {GPIOC,               sizeof(*GPIOC),  UVISOR_TACLDEF_PERIPH}, \
+        {GPIOD,               sizeof(*GPIOD),  UVISOR_TACLDEF_PERIPH}, \
+        {GPIOE,               sizeof(*GPIOE),  UVISOR_TACLDEF_PERIPH}, \
+        {RTC,                 sizeof(*RTC),    UVISOR_TACLDEF_PERIPH}, \
+        {TIM5,                sizeof(*TIM5),   UVISOR_TACLDEF_PERIPH}, \
+        {USART1,              sizeof(*USART1), UVISOR_TACLDEF_PERIPH}, \
+        {I2C1,                sizeof(*I2C1),   UVISOR_TACLDEF_PERIPH}, \
+        {SPI1,                sizeof(*SPI1),   UVISOR_TACLDEF_PERIPH}, \
+        {RCC,                 sizeof(*RCC),    UVISOR_TACLDEF_PERIPH}, \
+        {FLASH,               sizeof(*FLASH),  UVISOR_TACLDEF_PERIPH}, \
+        {PWR,                 sizeof(*PWR),    UVISOR_TACLDEF_PERIPH}, \
+        {EXTI,                sizeof(*EXTI),   UVISOR_TACLDEF_PERIPH}, \
+        {GPIOG,               sizeof(*GPIOG),  UVISOR_TACLDEF_PERIPH}, \
+        {SYSCFG,              sizeof(*SYSCFG), UVISOR_TACLDEF_PERIPH}, \
+        {(void *) 0x42000000, 0x01000000,      UVISOR_TACLDEF_PERIPH}, /* FIXME */ \
+    }
+
+#endif /* Target-specific settings */
+
 #endif /* __UVISOR_HELLOWORLD_MAIN_HW_H__ */