[Zrouter-src] ZRouter.org: push to ZRouter socs/socs.mk

Mon Jan 16 21:28:39 UTC 2012

details:   http://zrouter.org/hg/zrouter//rev/617912b36846
changeset: 316:617912b36846
user:      ray at terran.dlink.ua
date:      Mon Jan 16 23:30:09 2012 +0200
description:
Move KERNCONF_KERNLOADADDR?= to correct place, otherwise it will set illegal
value for SoC's which define own value.

diffstat:

 socs/socs.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r eb82a92a14b5 -r 617912b36846 socs/socs.mk

--- a/socs/socs.mk	Mon Jan 16 13:52:07 2012 +0200
+++ b/socs/socs.mk	Mon Jan 16 23:30:09 2012 +0200
@@ -1,14 +1,14 @@
 SOC_CHIP?="NONE"
 SOC_VENDOR?="NONE"
 
-# Defaults
-KERNCONF_KERNLOADADDR?=		0x80001000
-
 .if exists(${ZROUTER_ROOT}/socs/${SOC_VENDOR}/${SOC_CHIP}/)
 TARGET_SOCDIR= ${ZROUTER_ROOT}/socs/${SOC_VENDOR}/${SOC_CHIP}
 .include "${TARGET_SOCDIR}/soc.mk"
 .endif
 
+# Defaults
+KERNCONF_KERNLOADADDR?=		0x80001000
+
 .if !defined(TARGET_SOCDIR)
 SOC_PAIRS!=ls -d ${ZROUTER_ROOT}/socs/*/* | sed 's/^.*\/socs\///'
 .endif
