kernel: Update to 3.9.3.

[people/ms/ipfire-3.x.git] / kernel / scripts / configure

diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index b2b4627f4d503656d198c885ddedeee16d8e00c2..6ed0bd4122ae6e42a6b7a5691b8579eedefa6f95 100755 (executable)
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -7,8 +7,17 @@
 BASEDIR=$(dirname ${0})
 SCRIPTS_DIR=${BASEDIR}
 
-CONFIGS="x86_64:default i686:legacy i686:default"
-CONFIGS="${CONFIGS} armv7hl:exynos armv7hl:omap armv5tel:versatile armv5tel:kirkwood"
+# x86_64
+CONFIGS="x86_64:default"
+
+# i686
+CONFIGS="${CONFIGS} i686:legacy i686:default"
+
+# armv7hl
+CONFIGS="${CONFIGS} armv7hl:exynos armv7hl:default"
+
+# armv5tel
+CONFIGS="${CONFIGS} armv5tel:versatile armv5tel:kirkwood"
 
 function merge_config() {
        local arch=${1}
@@ -64,11 +73,12 @@ function merge_config() {
                armv5tel:kirkwood)
                        configs="${configs} config-arm-generic config-armv5tel-kirkwood"
                        ;;
-               armv7hl:exynos)
-                       configs="${configs} config-arm-generic config-armv7hl-exynos"
+               armv7hl:default)
+                       configs="${configs} config-arm-generic config-armv7hl-default"
                        ;;
-               armv7hl:omap)
-                       configs="${configs} config-arm-generic config-armv7hl-omap"
+               armv7hl:exynos)
+                       configs="${configs} config-arm-generic config-armv7hl-default"
+                       configs="${configs} config-armv7hl-exynos"
                        ;;
                *)
                        echo >&2 "ERROR: Invalid parameters given: $@"
@@ -242,6 +252,11 @@ function diff_configs() {
                                ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-i686-default \
                                        ${filename} > ${filename}.tmp
                                ;;
+                       armv7hl:exynos)
+                               # Exynos depends directly on the default configuration.
+                               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-armv7hl-default \
+                                       ${filename} > ${filename}.tmp
+                               ;;
                        armv5tel:versatile)
                                rm -f ${filename}
                                continue