summaryrefslogtreecommitdiff
path: root/mkconfig
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2011-06-16 13:29:47 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:39:29 -0700
commit50d5b04a93a5ba7fb1762615d410932392c3fe30 (patch)
tree9bec45fc196d683f0f92d3c3c0581bd13a6de42f /mkconfig
parentee8eb6e15d3aad43744b68661bed4c2f22d26fb5 (diff)
Allow pick device tree by specifying an environment variable.
The default device tree used by the make system is board/nvidia/seaboard/tegra2-seaboard.dts, it is expected to be defined in the main config file used by the related targets. If 'DEV_TREE_SRC' is defined in the environment, the file board/nvidia/seaboard/${DEV_TREE_SRC} is used as the device tree source instead. ./mkconfig is being restored to remove the device tree related changes. BUG=chromium-os:834 TEST=manual Change-Id: I2232c5f4413b719057ec3def77ca03a78068c3c9 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: http://gerrit.chromium.org/gerrit/2776 Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'mkconfig')
-rwxr-xr-xmkconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/mkconfig b/mkconfig
index 04ea12a464..6ff533f339 100755
--- a/mkconfig
+++ b/mkconfig
@@ -127,10 +127,7 @@ echo "BOARD = ${board}" >> config.mk
[ "${vendor}" ] && echo "VENDOR = ${vendor}" >> config.mk
-if [ -n "${soc}" ] ; then
- echo "SOC = ${soc}" >> config.mk
- echo "DEVICE_TREE = ${soc}-${board}" >> config.mk
-fi
+[ "${soc}" ] && echo "SOC = ${soc}" >> config.mk
# Assign board directory to BOARDIR variable
if [ -z "${vendor}" ] ; then