3 files changed, 5 insertions, 20 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 66ac4af98..abb98a107 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -21,7 +21,7 @@ tools-compile:
 	$(MAKE) -C ../tools/srec2bin all
 	$(MAKE) -C ../tools/squashfs all
 
-ifeq ($(ADK_KERNEL_BCM47XX),y)
+ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y)
 kernel-install: tools-compile
 	${TARGET_CROSS}objcopy ${OSTRIP} -S ${LINUX_DIR}/vmlinuz.elf \
 	    ${BUILD_DIR}/${TARGET_KERNEL}
diff --git a/target/mips/sys-available/linksys-wrt54g b/target/mips/sys-available/broadcom-bcm47xx
index 4a48a2c08..5a8df9df2 100644
--- a/target/mips/sys-available/linksys-wrt54g
+++ b/target/mips/sys-available/broadcom-bcm47xx
@@ -1,14 +1,13 @@
-config ADK_TARGET_SYSTEM_LINKSYS_WRT54G
-	bool "Linksys WRT54G"
+config ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
+	bool "Broadcom BCM47XX"
 	select ADK_mips
 	select ADK_little
-	select ADK_linksys_wrt54g
+	select ADK_broadcom_bcm47xx
 	select ADK_KERNEL_BCM47XX
 	select ADK_KERNEL_KERNEL_LZMA
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_WITH_SSB
 	select ADK_TARGET_WITH_WATCHDOG
 	help
-	  Linksys WRT54G WLAN router.
-	  (Broadcom BCM47xx platform)
+	  Broadcom BCM47xx systems.
 
diff --git a/target/mips/sys-available/linksys-wrt54gs b/target/mips/sys-available/linksys-wrt54gs
deleted file mode 100644
index 0ad417828..000000000
--- a/target/mips/sys-available/linksys-wrt54gs
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_TARGET_SYSTEM_LINKSYS_WRT54GS
-	bool "Linksys WRT54GS"
-	select ADK_mips
-	select ADK_little
-	select ADK_linksys_wrt54gs
-	select ADK_KERNEL_BCM47XX
-	select ADK_KERNEL_KERNEL_LZMA
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_SSB
-	select ADK_TARGET_WITH_WATCHDOG
-	help
-	  Linksys WRT54GS WLAN router.
-	  (Broadcom BCM47xx platform)
-