[PATCH] merge_config.sh: Add switch to specify ARCH variable

[Victor Erminpour]

Add a switch to merge_config.sh to specify the ARCH variable
which defines the target architecture.

Set x86 as the default architecture.

Signed-off-by: Victor Erminpour <victor.erminpour@xxxxxxxxxx>
---
 scripts/kconfig/merge_config.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 63c8565206a4..b7a687f093f0 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -22,6 +22,7 @@ clean_up() {
 
 usage() {
 	echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
+	echo "  -a    set ARCH variable to define the target architecture"
 	echo "  -h    display this help text"
 	echo "  -m    only merge the fragments, do not execute the make command"
 	echo "  -n    use allnoconfig instead of alldefconfig"
@@ -34,6 +35,7 @@ usage() {
 
 RUNMAKE=true
 ALLTARGET=alldefconfig
+ARCH=x86
 WARNREDUN=false
 BUILTIN=false
 OUTPUT=.
@@ -46,6 +48,11 @@ while true; do
 		shift
 		continue
 		;;
+	"-a")
+		ARCH=$2
+		shift 2
+		continue
+		;;
 	"-m")
 		RUNMAKE=false
 		shift
@@ -172,7 +179,7 @@ fi
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
+make ARCH=$ARCH KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
-- 
1.8.3.1