refactor the lower case symbols out

We don't need this, as ARCH is implicit through the directory.
All lower case symbols should be removed now.

1 files changed, 5 insertions, 15 deletions

diff --git a/scripts/create-menu b/scripts/create-menu
index 8bd7de4b3..67176ccdf 100755
--- a/scripts/create-menu
+++ b/scripts/create-menu
@@ -19,7 +19,7 @@ if [ -d "$topdir/target/appliances" ];then
 	printf "prompt \"Appliance\"\n\n" >> $topdir/target/config/Config.in.appliances
 	printf "config ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances
 	printf "\tprompt \"choose an appliance\"\n" >> $topdir/target/config/Config.in.appliances
-	printf "\tboolean\n\n" >> $topdir/target/config/Config.in.appliances
+	printf "\tbool\n\n" >> $topdir/target/config/Config.in.appliances
 	cat $topdir/target/appliances/*.appliance >> $topdir/target/config/Config.in.appliances 2>/dev/null
 	printf "\nendchoice\n\n" >> $topdir/target/config/Config.in.appliances
 	printf "menu \"Appliance Options\"\n" >> $topdir/target/config/Config.in.appliances
@@ -30,12 +30,6 @@ fi
 
 # create system default
 printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.system.default
-for j in $systems;do
-	system=${j#ADK_TARGET_SYSTEM_}
-	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
-	printf "config ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
-	printf "\tboolean\n\n" >> $topdir/target/config/Config.in.system.default
-done
 
 cat >> $topdir/target/config/Config.in.system.default << EOD
 config ADK_TARGET_SYSTEM
@@ -46,7 +40,7 @@ for i in $systems;do
 	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
+	printf "\tdefault \"${system}\" if $i\n" >> $topdir/target/config/Config.in.system.default
 done
 
 # create or update systems
@@ -67,8 +61,6 @@ for arch in $(cat $topdir/target/arch.lst);do
 	printf "source target/$arch/Config.in.systems\n" >> $topdir/target/$arch/Config.in.arch
 	printf "endchoice\n" >> $topdir/target/$arch/Config.in.arch
 	printf "source target/$arch/Config.in.arch\n" >> target/config/Config.in.system.choice
-	printf "config ADK_$arch\n" >> target/config/Config.in.arch.default
-	printf "\tboolean\n\n" >> target/config/Config.in.arch.default
 done
 
 cat >> $topdir/target/config/Config.in.arch.default << EOD
@@ -77,7 +69,8 @@ config ADK_TARGET_ARCH
 EOD
 
 for arch in $(cat $topdir/target/arch.lst);do
-	printf "\tdefault \"$arch\" if ADK_$arch\n" >> target/config/Config.in.arch.default
+	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
+	printf "\tdefault \"$arch\" if ADK_TARGET_ARCH_$ARCH\n" >> target/config/Config.in.arch.default
 done
 
 cat > $topdir/target/config/Config.in.arch.choice << EOD
@@ -90,12 +83,9 @@ EOD
 for arch in $(cat $topdir/target/arch.lst);do
 	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
 	printf "config ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/config/Config.in.arch.choice
-	printf "\tprompt \"$arch system\"\n" >> $topdir/target/config/Config.in.arch.choice
-	printf "\tboolean\n" >> $topdir/target/config/Config.in.arch.choice
-	printf "\tselect ADK_$arch\n" >> $topdir/target/config/Config.in.arch.choice
+	printf "\tbool \"$arch system\"\n" >> $topdir/target/config/Config.in.arch.choice
 	printf "\thelp\n" >> $topdir/target/config/Config.in.arch.choice
 	printf "\t  Support for $ARCH systems.\n\n" >> $topdir/target/config/Config.in.arch.choice
 done
-
 printf "endchoice\n" >> $topdir/target/config/Config.in.arch.choice
 exit 0