variables: DESIGN_DIR is overrideable

Plus some driveby cleanup and making things a bit more consistent.

By default in Makefile DESIGN_DIR points to the DESIGN_CONFIG dir,
but it can be useful to override it, w.r.t. rules.json and
metadata.json support in bazel-orfs.

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/Makefile

@@ -87,7 +87,7 @@ DESIGN_CONFIG ?= ./designs/nangate45/gcd/config.mk
 export DESIGN_CONFIG
 include $(DESIGN_CONFIG)
 
-export DESIGN_DIR  = $(dir $(DESIGN_CONFIG))
+export DESIGN_DIR ?= $(dir $(DESIGN_CONFIG))
 
 # default value "base" is duplicated from variables.yaml because we need it
 # earlier in the flow for BLOCKS. BLOCKS is a feature specific to the

flow/designs/gf55/aes/config.mk

@@ -1,6 +1,4 @@
 
-DESIGN_DIR              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
-
 export DESIGN_NICKNAME   = aes
 export DESIGN_NAME       = aes_cipher_top
 export PLATFORM          = gf55

flow/designs/intel16/aes/config.mk

@@ -1,4 +1,3 @@
-DESIGN_DIR                   := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 DESIGN_PDK_HOME              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
 export DESIGN_NICKNAME = aes

flow/designs/intel16/ibex/config.mk

@@ -1,4 +1,3 @@
-DESIGN_DIR                   := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 DESIGN_PDK_HOME              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
 export DESIGN_NICKNAME = ibex

flow/designs/intel16/jpeg/config.mk

@@ -1,4 +1,3 @@
-DESIGN_DIR                   := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 DESIGN_PDK_HOME              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
 export DESIGN_NICKNAME = jpeg