From 5b1fa4133f978ab978175273903e8142241ef18c Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Mon, 31 Dec 2018 09:37:37 +0100
Subject: [PATCH 1/4] Move the settings files out of the database into settings
 directory.

Fixes #421.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 database/artix7/settings.sh => settings/artix7.sh   | 2 +-
 database/kintex7/settings.sh => settings/kintex7.sh | 2 +-
 database/zynq7/settings.sh => settings/zynq7.sh     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename database/artix7/settings.sh => settings/artix7.sh (93%)
 rename database/kintex7/settings.sh => settings/kintex7.sh (92%)
 rename database/zynq7/settings.sh => settings/zynq7.sh (92%)

diff --git a/database/artix7/settings.sh b/settings/artix7.sh
similarity index 93%
rename from database/artix7/settings.sh
rename to settings/artix7.sh
index df3e244f..b6d90a2f 100644
--- a/database/artix7/settings.sh
+++ b/settings/artix7.sh
@@ -23,4 +23,4 @@ export XRAY_PIN_04="G21"
 export XRAY_PIN_05="G22"
 export XRAY_PIN_06="F21"
 
-source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
+source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
diff --git a/database/kintex7/settings.sh b/settings/kintex7.sh
similarity index 92%
rename from database/kintex7/settings.sh
rename to settings/kintex7.sh
index 98b481e1..acd366a3 100644
--- a/database/kintex7/settings.sh
+++ b/settings/kintex7.sh
@@ -23,4 +23,4 @@ export XRAY_PIN_04="M19"
 export XRAY_PIN_05="M20"
 export XRAY_PIN_06="M21"
 
-source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
+source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
diff --git a/database/zynq7/settings.sh b/settings/zynq7.sh
similarity index 92%
rename from database/zynq7/settings.sh
rename to settings/zynq7.sh
index 765b4657..fa4d3a26 100644
--- a/database/zynq7/settings.sh
+++ b/settings/zynq7.sh
@@ -23,4 +23,4 @@ export XRAY_PIN_04="K16"
 export XRAY_PIN_05="J16"
 export XRAY_PIN_06="J15"
 
-source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
+source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh

From 97d798ae62439eb643d3178014afb74ea5d4a6ff Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Mon, 31 Dec 2018 09:40:38 +0100
Subject: [PATCH 2/4] Adding redirect scripts.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 database/artix7/settings.sh  | 1 +
 database/kintex7/settings.sh | 1 +
 database/zynq7/settings.sh   | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 database/artix7/settings.sh
 create mode 100644 database/kintex7/settings.sh
 create mode 100644 database/zynq7/settings.sh

diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh
new file mode 100644
index 00000000..d5bf6312
--- /dev/null
+++ b/database/artix7/settings.sh
@@ -0,0 +1 @@
+source $(dirname ${BASH_SOURCE[0]})/../../settings/artix7.sh
diff --git a/database/kintex7/settings.sh b/database/kintex7/settings.sh
new file mode 100644
index 00000000..aead0cac
--- /dev/null
+++ b/database/kintex7/settings.sh
@@ -0,0 +1 @@
+source $(dirname ${BASH_SOURCE[0]})/../../settings/kintex7.sh
diff --git a/database/zynq7/settings.sh b/database/zynq7/settings.sh
new file mode 100644
index 00000000..96e1614c
--- /dev/null
+++ b/database/zynq7/settings.sh
@@ -0,0 +1 @@
+source $(dirname ${BASH_SOURCE[0]})/../../settings/zynq7.sh

From b525769555842cdb268ed2ca1242f2748e3e64ac Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Mon, 31 Dec 2018 09:41:31 +0100
Subject: [PATCH 3/4] Ignore everything under the database directory.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26ba6eed..f9585e4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
 /env/
 /build/
+/database/
 .Xil
-# Ignore database directories _except_ for their settings
-database/*/*
-!database/*/settings.sh
 **/specimen_*
 **/output
 run.ok

From f98dad14ed9878e1f0195cab82203af360e2d065 Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Mon, 31 Dec 2018 09:39:00 +0100
Subject: [PATCH 4/4] Update README for settings move.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4821424..e883f326 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ correctly build and install pyjson5. After this, run either option 1 or 2 again.
 Always make sure to set the environment for the device you are working on before
 running any other commands:
 
-    source database/artix7/settings.sh
+    source settings/artix7.sh
 
 ### Step 7: ###
 (Option 1, recommended) - Download a current stable version (you can use the