Add ARM architecture support to manage-config

Makefile

@@ -94,7 +94,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Optionally add/remove kernel options
 	if [ -f ../manage-config ]; then
-		../manage-config amd64
+		../manage-config $(CONFIGURED_ARCH)
 	fi
 
 	# Building a custom kernel from Debian kernel source

manage-config

@@ -29,12 +29,50 @@ case "$ARCH" in
     amd64)
         CONFIG_FILE_LOC=debian/build/build_amd64_none_amd64
         ;;
+    arm64)
+        CONFIG_FILE_LOC=debian/build/build_arm64_none_arm64
+        ;;
+    armhf)
+        CONFIG_FILE_LOC=debian/build/build_armhf_none_armmp
+        ;;
     *)
         CONFIG_FILE_LOC=debian/build/build_amd64_none_amd64
         ;;
 esac
 CONFIG_FILE=${CONFIG_FILE_LOC}/.config
 
+# Add multi-architecture support
+#
+# To remove the option for specify architecture from the kernel,
+# add the arch tag such as [amd64] or [arm64] or [armhf] and options into the
+# flat text file patch/kconfig-exclusions.
+# if no tag appears, it is in effect for all architectures.
+#
+# Example:
+#   [amd64]CONFIG_SOUND
+#   [arm64]CONFIG_ISDN
+#   [armhf]CONFIG_ISDN
+#
+# To add the options for specify architecture into the kernel,
+# add the arch tag such as [amd64] or [arm64] or [armhf] options into the
+# flat text file patch/kconfig-inclusions.
+# if no tag appears, it is in effect for all architectures.
+#
+# Example:
+#   [amd64]CONFIG_AD5064=y
+
+function match_arch(){
+    opt=$1
+    assigned_arch=$(expr $opt : '.*\[\(.*\)\]')
+    if [ ! -z "$assigned_arch" ]; then
+         if [ ! "$assigned_arch" = "$ARCH" ]; then
+             return 1
+         else
+             opt=${opt#*]}
+         fi
+     fi
+}
+
 ret=0
 if [ -e ../patch/kconfig-exclusions -o -e ../patch/kconfig-inclusions ];
 then
@@ -43,6 +81,10 @@ then
     if [ -f ../patch/kconfig-exclusions ]; then
         while read -r opt; do
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
+                match_arch $opt
+                if [ $? = 1 ]; then
+                    continue
+                fi
                 scripts/config --file ${CONFIG_FILE} -d $opt
             fi
         done < ../patch/kconfig-exclusions;
@@ -52,6 +94,10 @@ then
     if [ -f ../patch/kconfig-inclusions ]; then
         while read -r opt; do
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
+                match_arch $opt
+                if [ $? = 1 ]; then
+                    continue
+                fi
                 echo $opt >> ${CONFIG_FILE}
             fi
         done < ../patch/kconfig-inclusions;
@@ -66,6 +112,10 @@ then
         echo "Checking removed kernel options..."
         while read -r opt; do
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
+                match_arch $opt
+                if [ $? = 1 ]; then
+                    continue
+                fi
                 s=$(scripts/config --file ${CONFIG_FILE} -k --state $opt)
                 if [ ! "$s" = "undef" -a ! "$s" = "n" ]; then
                     ret=1
@@ -84,6 +134,10 @@ then
         echo "Checking added kernel options..."
         while read -r opt; do
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
+                match_arch $opt
+                if [ $? = 1 ]; then
+                    continue
+                fi
                 n=${opt%=*}
                 v="${opt#*=}"
                 s=$(scripts/config --file ${CONFIG_FILE} -k --state $n)

patch/kconfig-inclusions

@@ -2,7 +2,7 @@
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_DPS1900=m
 # For cig-cs6436
-CONFIG_SERIAL_8250_LPSS=m
+[amd64]CONFIG_SERIAL_8250_LPSS=m
 # SFF_8436
 CONFIG_EEPROM_SFF_8436=m
 # For Dell S6000
@@ -12,14 +12,14 @@ CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_DNI_DPS460=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_SCH=m
+[amd64]CONFIG_GPIO_SCH=m
 # For Dell Z9100
 CONFIG_I2C_MUX_PCA954x=m
 # For Ingrasys S9100
 CONFIG_I2C_GPIO=m
 CONFIG_GPIO_PCA953X=m
 # For Inventec d7032
-CONFIG_GPIO_ICH=m
+[amd64]CONFIG_GPIO_ICH=m
 # For mitac ly1200
 CONFIG_SENSORS_MAX31790=m
 # For optoe
@@ -33,19 +33,19 @@ CONFIG_MLXSW_I2C=m
 CONFIG_MLXSW_MINIMAL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_MUX_MLXCPLD=m
-CONFIG_I2C_MLXCPLD=m
+[amd64]CONFIG_I2C_MLXCPLD=m
 CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_MLXREG_FAN=m
+[amd64]CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
-CONFIG_MLX_WDT=y
+[amd64]CONFIG_MLX_WDT=y
 CONFIG_LEDS_MLXREG=m
 CONFIG_DW_DMAC_PCI=m
-CONFIG_MLX_PLATFORM=m
-CONFIG_MELLANOX_PLATFORM=y
-CONFIG_MLXREG_HOTPLUG=m
-CONFIG_MLXREG_IO=m
+[amd64]CONFIG_MLX_PLATFORM=m
+[amd64]CONFIG_MELLANOX_PLATFORM=y
+[amd64]CONFIG_MLXREG_HOTPLUG=m
+[amd64]CONFIG_MLXREG_IO=m
 CONFIG_MAX1363=m