[Zrouter-src] ZRouter.org: push to ZRouter socs/Atheros/AR7161/soc.mk socs/Ath...

Fri Dec 9 15:25:07 UTC 2011

details:   http://zrouter.org/hg/zrouter//rev/3dfccd2b27ab
changeset: 259:3dfccd2b27ab
user:      ray at terran.dlink.ua
date:      Fri Dec 09 17:23:15 2011 +0200
description:
remove KERNCONF_MAKEOPTIONS+="KERNLOADADDR=0x80001000"
define global variable KERNCONF_KERNLOADADDR
set it default to 0x80001000(ok for most MIPS32)

diffstat:

 socs/Atheros/AR7161/soc.mk   |  2 +-
 socs/Atheros/AR7240/soc.mk   |  1 -
 socs/Atheros/AR7242/soc.mk   |  1 -
 socs/Atheros/AR9132/soc.mk   |  2 +-
 socs/Broadcom/BCM5354/soc.mk |  1 -
 socs/Cavium/CN5010/soc.mk    |  2 +-
 socs/Intel/i386/soc.mk       |  2 +-
 socs/Ralink/RT3050F/soc.mk   |  1 -
 socs/Ralink/RT3052F/soc.mk   |  1 -
 socs/Ralink/RT5350F/soc.mk   |  1 -
 socs/socs.mk                 |  3 +++
 11 files changed, 7 insertions(+), 10 deletions(-)

diffs (127 lines):

diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Atheros/AR7161/soc.mk

--- a/socs/Atheros/AR7161/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Atheros/AR7161/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -13,7 +13,7 @@
 # XXX Maybe project definitions, maybe only board
 
 KERNCONF_MAKEOPTIONS+=	"INLINE_LIMIT=768"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80050000"
+KERNCONF_KERNLOADADDR?=		0x80050000
 KERNCONF_OPTIONS+=		HZ=1000
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Atheros/AR7240/soc.mk
--- a/socs/Atheros/AR7240/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Atheros/AR7240/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -18,7 +18,6 @@
 KERNCONF_MAKEOPTIONS+=	"MIPS_BIG_ENDIAN=defined"
 
 
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80001000"
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
 KERNCONF_OPTIONS+=		NSFBUFS=1024
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Atheros/AR7242/soc.mk
--- a/socs/Atheros/AR7242/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Atheros/AR7242/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -22,7 +22,6 @@
 KERNCONF_MAKEOPTIONS+=	"MIPS_BIG_ENDIAN=defined"
 
 
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80001000"
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
 KERNCONF_OPTIONS+=		NSFBUFS=1024
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Atheros/AR9132/soc.mk
--- a/socs/Atheros/AR9132/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Atheros/AR9132/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -13,7 +13,7 @@
 # XXX Maybe project definitions, maybe only board
 
 KERNCONF_MAKEOPTIONS+=	"INLINE_LIMIT=768"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80050000"
+KERNCONF_KERNLOADADDR?=		0x80050000
 KERNCONF_OPTIONS+=		HZ=1000
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Broadcom/BCM5354/soc.mk
--- a/socs/Broadcom/BCM5354/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Broadcom/BCM5354/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -25,7 +25,6 @@
 # XXX Maybe project definitions, maybe only board
 
 KERNCONF_MAKEOPTIONS+=	"INLINE_LIMIT=768"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80001000"
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
 #KERNCONF_OPTIONS+=		NMBCLUSTERS=1024
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Cavium/CN5010/soc.mk
--- a/socs/Cavium/CN5010/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Cavium/CN5010/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -18,7 +18,7 @@
 KERNCONF_MAKEOPTIONS+=	"ARCH_FLAGS=\"-march=octeon -mabi=64\""
 KERNCONF_MAKEOPTIONS+=	"MIPS_BIG_ENDIAN=defined"
 KERNCONF_MAKEOPTIONS+=	"LDSCRIPT_NAME=ldscript.mips.octeon1"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0xffffffff80100000"
+KERNCONF_KERNLOADADDR?=		0xffffffff80100000
 
 KERNCONF_OPTIONS+=	MALLOC_DEBUG_MAXZONES=8
 
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Intel/i386/soc.mk
--- a/socs/Intel/i386/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Intel/i386/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -29,7 +29,7 @@
 ##KERNCONF_MAKEOPTIONS+=	"DEBUG=-g"
 #KERNCONF_OPTIONS+=		DDB
 #KERNCONF_OPTIONS+=		KDB
-##KERNCONF_OPTIONS+=		PREEMPTION
+KERNCONF_OPTIONS+=		PREEMPTION
 ##KERNCONF_OPTIONS+=		KTRACE
 #KERNCONF_OPTIONS+=		LOCK_PROFILING
 #KERNCONF_OPTIONS+=		KTR
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Ralink/RT3050F/soc.mk
--- a/socs/Ralink/RT3050F/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Ralink/RT3050F/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -20,7 +20,6 @@
 # XXX Maybe project definitions, maybe only board
 
 #KERNCONF_MAKEOPTIONS+=	"INLINE_LIMIT=768"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80001000"
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
 #KERNCONF_OPTIONS+=		NMBCLUSTERS=1024
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Ralink/RT3052F/soc.mk
--- a/socs/Ralink/RT3052F/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Ralink/RT3052F/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -24,7 +24,6 @@
 # XXX Maybe project definitions, maybe only board
 
 #KERNCONF_MAKEOPTIONS+=	"INLINE_LIMIT=768"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80001000"
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
 #KERNCONF_OPTIONS+=		NMBCLUSTERS=1024
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/Ralink/RT5350F/soc.mk
--- a/socs/Ralink/RT5350F/soc.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/Ralink/RT5350F/soc.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -20,7 +20,6 @@
 # XXX Maybe project definitions, maybe only board
 
 #KERNCONF_MAKEOPTIONS+=	"INLINE_LIMIT=768"
-KERNCONF_MAKEOPTIONS+=	"KERNLOADADDR=0x80001000"
 KERNCONF_OPTIONS+=		MAXUSERS=3
 KERNCONF_OPTIONS+=		MAXFILES=512
 #KERNCONF_OPTIONS+=		NMBCLUSTERS=1024
diff -r e028dcc1bf68 -r 3dfccd2b27ab socs/socs.mk
--- a/socs/socs.mk	Fri Dec 09 17:18:12 2011 +0200
+++ b/socs/socs.mk	Fri Dec 09 17:23:15 2011 +0200
@@ -1,6 +1,9 @@
 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"
