setup: support single-deep machine conf directories

The witherspoon config was moved directly into meta-ibm, which caused
the setup script to not be able to find it.  Modify the setup script
to also find machine config files in single-deep meta directories.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Icb24649c2e90cd29f72e8b661085b85cde6fcad5
diff --git a/setup b/setup
index 9676bb3..a5e9047 100755
--- a/setup
+++ b/setup
@@ -31,7 +31,7 @@
 	local target=$1
 	local build_dir=$2
 	local cfg name tmpl
-	for cfg in meta-*/meta-*/conf/machine/*.conf; do
+	for cfg in meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do
 		name=${cfg##*/}
 		name=${name%.conf}
 		tmpl=${cfg%/machine/*.conf}