From d96d43b1a4cca7d44fcd8fceab00c7ecf2fe146f Mon Sep 17 00:00:00 2001
From: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: Fri, 19 Aug 2022 08:27:48 +0200
Subject: [PATCH] iop: genconfig(_min)?: Use target-subtarget-device for
 iopsys_brcm63xx_arm

Adapt genconfig to generate the correct config after the change to the
target-subtarget-device in target iopsys_brcm63xx_arm in feeds/targets.

Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
---
 iop/scripts/genconfig.sh     | 23 ++++++++++++++---------
 iop/scripts/genconfig_min.sh | 23 ++++++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh
index ae5af63a6..1cdf8f3af 100755
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -319,20 +319,25 @@ function genconfig {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES 
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
+		case "$target" in
+		iopsys_ramips | iopsys_econet | iopsys_brcm63xx_arm)
+			# This assumes the device name to be unique within one target,
+			# which is a fair assumption to make.
+			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
+			if [ -z "$mk_file" ]; then
+				echo "Error determining subtarget for $target / ${BOARDTYPE}"
+				return 1
+			fi
+			local subtarget="$(basename "${mk_file%.mk}")"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_econet" ]; then
-			subtarget="en7562"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		else
+			;;
+		*)
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-		fi
+			;;
+		esac
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 
diff --git a/iop/scripts/genconfig_min.sh b/iop/scripts/genconfig_min.sh
index 5bb2f0465..aae30e56d 100644
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -310,20 +310,25 @@ function genconfig_min {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
+		case "$target" in
+		iopsys_ramips | iopsys_econet | iopsys_brcm63xx_arm)
+			# This assumes the device name to be unique within one target,
+			# which is a fair assumption to make.
+			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
+			if [ -z "$mk_file" ]; then
+				echo "Error determining subtarget for $target / ${BOARDTYPE}"
+				return 1
+			fi
+			local subtarget="$(basename "${mk_file%.mk}")"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_econet" ]; then
-			subtarget="en7562"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		else
+			;;
+		*)
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-		fi
+			;;
+		esac
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE