From c8cc6726fc91e81bc1019007527b4a89af7e7a49 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 20 Oct 2020 05:21:34 +0200
Subject: [PATCH] constraints: update, prefix ports with the board name

---
 constraints                             |  2 +-
 vga/board/icestick/Icestick_Top.vhd     | 37 ++++++++-----------------
 vga/board/tinyfpgabx/TinyFPGABX_Top.vhd | 32 ++++++++++-----------
 3 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/constraints b/constraints
index 1c60fae..8a13b22 160000
--- a/constraints
+++ b/constraints
@@ -1 +1 @@
-Subproject commit 1c60fae1db8237f537b61b399fa4497090c80945
+Subproject commit 8a13b2231b0dca83121587d8b27925d86dc294ae
diff --git a/vga/board/icestick/Icestick_Top.vhd b/vga/board/icestick/Icestick_Top.vhd
index c3f8166..27992f2 100644
--- a/vga/board/icestick/Icestick_Top.vhd
+++ b/vga/board/icestick/Icestick_Top.vhd
@@ -11,19 +11,12 @@ entity Icestick_Top is
     SCREEN : natural := 22
   );
   port (
-    CLK : in std_logic; -- System clock (12 Mhz)
-
-    PMOD7 : out std_logic; -- VGA vsync
-    PMOD8 : out std_logic; -- VGA HSync
-    PMOD1 : out std_logic; -- VGA R
-    PMOD2 : out std_logic; -- VGA G
-    PMOD3 : out std_logic; -- VGA B
-
-    LED1 : out std_logic;
-    LED2 : out std_logic;
-    LED3 : out std_logic;
-    LED4 : out std_logic;
-    LED5 : out std_logic
+    IceStick_CLK   : in  std_logic; -- System clock (12 Mhz)
+    IceStick_PMOD7 : out std_logic; -- VGA vsync
+    IceStick_PMOD8 : out std_logic; -- VGA HSync
+    IceStick_PMOD1 : out std_logic; -- VGA R
+    IceStick_PMOD2 : out std_logic; -- VGA G
+    IceStick_PMOD3 : out std_logic -- VGA B
   );
 end;
 
@@ -42,7 +35,7 @@ begin
     DIVQ => to_unsigned( PLL_cfg.DIVQ, 3)
   )
   port map (
-    REFERENCECLK => CLK,
+    REFERENCECLK => IceStick_CLK,
     PLLOUTCORE   => clki,
     BYPASS       => '0',
     RESETB       => '1'
@@ -56,19 +49,13 @@ begin
     CLK   => clki,
     EN    => '1',
     RST   => '0',
-    HSYNC => PMOD8,
-    VSYNC => PMOD7,
+    HSYNC => IceStick_PMOD8,
+    VSYNC => IceStick_PMOD7,
     RGB   => rgb
   );
 
-  PMOD1 <= rgb(2);
-  PMOD2 <= rgb(1);
-  PMOD3 <= rgb(0);
-
-  LED1 <= '0';
-  LED2 <= '0';
-  LED3 <= '0';
-  LED4 <= '0';
-  LED5 <= '1';
+  IceStick_PMOD1 <= rgb(2);
+  IceStick_PMOD2 <= rgb(1);
+  IceStick_PMOD3 <= rgb(0);
 
 end;
diff --git a/vga/board/tinyfpgabx/TinyFPGABX_Top.vhd b/vga/board/tinyfpgabx/TinyFPGABX_Top.vhd
index 9c8160d..786569c 100644
--- a/vga/board/tinyfpgabx/TinyFPGABX_Top.vhd
+++ b/vga/board/tinyfpgabx/TinyFPGABX_Top.vhd
@@ -11,16 +11,16 @@ entity TinyFPGABX_Top is
     SCREEN : natural := 22
   );
   port (
-    CLK    : in  std_logic; -- System clock (16 Mhz)
-    PIN_15 : in  std_logic; -- Reset
+    TinyFPGABX_CLK    : in  std_logic; -- System clock (16 Mhz)
+    TinyFPGABX_PIN_15 : in  std_logic; -- Reset
 
-    USBPU  : out std_logic; -- USB pull resistor
+    TinyFPGABX_USBPU  : out std_logic; -- USB pull resistor
 
-    PIN_13 : out std_logic; -- VGA VSync
-    PIN_12 : out std_logic; -- VGA HSync
-    PIN_11 : out std_logic; -- VGA R
-    PIN_10 : out std_logic; -- VGA G
-    PIN_9  : out std_logic  -- VGA B
+    TinyFPGABX_PIN_13 : out std_logic; -- VGA VSync
+    TinyFPGABX_PIN_12 : out std_logic; -- VGA HSync
+    TinyFPGABX_PIN_11 : out std_logic; -- VGA R
+    TinyFPGABX_PIN_10 : out std_logic; -- VGA G
+    TinyFPGABX_PIN_9  : out std_logic  -- VGA B
   );
 end;
 
@@ -34,7 +34,7 @@ architecture arch of TinyFPGABX_Top is
 begin
 
   -- Drive USB pull-up resistor to '0' to disable USB
-  USBPU <= '0';
+  TinyFPGABX_USBPU <= '0';
 
   PLL_0: SB_PLL40_CORE
   generic map (
@@ -42,7 +42,7 @@ begin
     DIVQ => to_unsigned( PLL_cfg.DIVQ, 3)
   )
   port map (
-    REFERENCECLK => CLK,
+    REFERENCECLK => TinyFPGABX_CLK,
     PLLOUTCORE   => clki,
     BYPASS       => '0',
     RESETB       => '1'
@@ -55,14 +55,14 @@ begin
   port map (
     CLK   => clki,
     EN    => '1',
-    RST   => PIN_15,
-    HSYNC => PIN_12,
-    VSYNC => PIN_13,
+    RST   => TinyFPGABX_PIN_15,
+    HSYNC => TinyFPGABX_PIN_12,
+    VSYNC => TinyFPGABX_PIN_13,
     RGB   => rgb
   );
 
-  PIN_11 <= rgb(2);
-  PIN_10 <= rgb(1);
-  PIN_9  <= rgb(0);
+  TinyFPGABX_PIN_11 <= rgb(2);
+  TinyFPGABX_PIN_10 <= rgb(1);
+  TinyFPGABX_PIN_9  <= rgb(0);
 
 end;