X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fscripts%2Fconfigure;h=c12f8b1b749cecee900f1fd8b585b4da1efa9171;hb=9bf77c63d07566141a318b206f7766d445efd8b0;hp=e60bc83966738ec0798b0a7a72f292beaea6a286;hpb=7e3dbc56531a1958ef865827eaf8e20cd12e9459;p=people%2Fms%2Fipfire-3.x.git

diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index e60bc8396..c12f8b1b7 100755
--- 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:omap armv5tel:versatile armv5tel:kirkwood"
+# x86_64
+CONFIGS="x86_64:default"
+
+# i686
+CONFIGS="${CONFIGS} i686:legacy i686:default"
+
+# armv7hl
+CONFIGS="${CONFIGS} armv7hl:lpae armv7hl:default"
+
+# armv5tel
+CONFIGS="${CONFIGS} armv5tel:default"
 
 function merge_config() {
 	local arch=${1}
@@ -58,14 +67,15 @@ function merge_config() {
 			;;
 
 		# ARM
-		armv5tel:versatile)
-			configs="${configs} config-arm-generic"
+		armv5tel:default)
+			configs="${configs} config-arm-generic config-armv5tel-default"
 			;;
-		armv5tel:kirkwood)
-			configs="${configs} config-arm-generic config-armv5tel-kirkwood"
+		armv7hl:default)
+			configs="${configs} config-arm-generic config-armv7hl-default"
 			;;
-		armv7hl:omap)
-			configs="${configs} config-arm-generic config-armv7hl-omap"
+		armv7hl:lpae)
+			configs="${configs} config-arm-generic config-armv7hl-default"
+			configs="${configs} config-armv7hl-lpae"
 			;;
 		*)
 			echo >&2 "ERROR: Invalid parameters given: $@"
@@ -166,6 +176,7 @@ function diff_configs() {
 	local extra_configs="$@"
 
 	declare -A arch_configs
+	declare -A subarch_configs
 
 	tmpdir=$(mktemp -d)
 
@@ -177,14 +188,12 @@ function diff_configs() {
 
 		merge_config ${arch} ${flavour} ${filename} ${extra_configs}
 
-		# Do not include i686 legacy.
+		# Do not include leaf configuration.
 		case "${config}" in
-			i686:legacy)
+			armv7hl:lpae)
 				continue
 				;;
-			armv5tel:versatile)
-				;;
-			arm*)
+			i686:legacy)
 				continue
 				;;
 		esac
@@ -200,6 +209,8 @@ function diff_configs() {
 				echo >&2 "ERROR: Invalid architecture: ${arch}"
 				;;
 		esac
+
+		subarch_configs[${arch}]="${subarch_configs[${arch}]} ${filename}"
 	done
 
 	common_configs=""
@@ -213,11 +224,10 @@ function diff_configs() {
 
 	${SCRIPTS_DIR}/configcommon.py ${common_configs} > ${tmpdir}/config-generic
 
-	${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-generic ${tmpdir}/config-arm-common \
-		> ${tmpdir}/config-arm-generic
-
-	${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-generic ${tmpdir}/config-x86-common \
-		> ${tmpdir}/config-x86-generic
+	for arch in x86 arm; do
+		${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-generic \
+			${tmpdir}/config-${arch}-common > ${tmpdir}/config-${arch}-generic
+	done
 
 	for config in ${CONFIGS}; do
 		arch=${config%:*}
@@ -234,15 +244,11 @@ function diff_configs() {
 		filename=${tmpdir}/config-${arch}-${flavour}
 
 		case "${config}" in
-			i686:legacy)
+			armv7hl:lpae|i686:legacy)
 				# Legacy depends directly on the default configuration.
-				${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-i686-default \
+				${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-default \
 					${filename} > ${filename}.tmp
 				;;
-			armv5tel:versatile)
-				rm -f ${filename}
-				continue
-				;;
 			*)
 				${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${suparch}-common \
 					${filename} > ${filename}.tmp