make bulk fixes. fix toolchain building for sparc64/ppc

2 files changed, 15 insertions, 15 deletions

diff --git a/scripts/create-sys b/scripts/create-sys
index bf92870a1..9227a5a14 100755
--- a/scripts/create-sys
+++ b/scripts/create-sys
@@ -6,7 +6,7 @@ while read arch; do
 	count=1
 	mkdir -p $topdir/target/$arch/sys-enabled &&
 	cd $topdir/target/$arch/sys-enabled &&
-	ln -sf ../sys-available/toolchain 0-toolchain
+	ln -sf ../sys-available/toolchain-$arch 0-toolchain-$arch
 	for i in $(ls $topdir/target/$arch/sys-available/|grep -v toolchain);do
 		cd $topdir/target/$arch/sys-enabled/ &&
 		ln -sf ../sys-available/$i $count-$i
@@ -14,14 +14,7 @@ while read arch; do
 	done
 done <${topdir}/target/arch.lst
 
-cat > $topdir/target/config/Config.in.system.default << EOD
-config ADK_qemu
-	boolean
-
-config ADK_toolchain
-	boolean
-
-EOD
+echo '' > $topdir/target/config/Config.in.system.default
 
 for j in $systems;do
 	system=${j#ADK_TARGET_SYSTEM_}
@@ -31,17 +24,18 @@ for j in $systems;do
 done
 
 cat >> $topdir/target/config/Config.in.system.default << EOD
-
 config ADK_TARGET_SYSTEM
 	string
-	default "toolchain" if ADK_toolchain
-	default "qemu" if ADK_qemu
 EOD
 for i in $systems;do
 	system=${i#ADK_TARGET_SYSTEM_}
 	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
 	system=$(echo $system|tr '[:upper:]_' '[:lower:]-')
 	system=$(echo $system|sed 's#x86-64#x86_64#')
-	printf "\tdefault \"$system\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
+	if [ "${system%-*}" = "toolchain" ];then
+		printf "\tdefault \"${system%-*}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
+	else
+		printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
+	fi
 done
 exit 0
diff --git a/scripts/update-sys b/scripts/update-sys
index e6a72bd77..d242e67c3 100755
--- a/scripts/update-sys
+++ b/scripts/update-sys
@@ -43,9 +43,15 @@ fi
 cat > $topdir/target/config/Config.in.arch << EOF 	
 source "target/config/Config.in.arch.default"
 config $archsym
-	bool
+	boolean
 EOF
 
+if [ "${system}" = "toolchain" ];then
+	sys=${system}-$arch
+else
+	sys=$system
+fi
+
 cat > $topdir/target/config/Config.in.system << EOF 	
 source "target/config/Config.in.system.default"
 comment "Architecture: $arch"
@@ -54,7 +60,7 @@ comment "System: $system"
 config $systemsym
 	boolean
 	select $archsym
-$(grep select $topdir/target/$arch/sys-available/$system)
+$(grep select $topdir/target/$arch/sys-available/$sys)
 	default y
 EOF
 else