diff --git a/iopsys-brcm63xx-arm/Config.in b/iopsys-brcm63xx-arm/Config.in
index 27aebf89b913db70120d709178196ee2320cbae9..83330e582088f05d5ba618cd5b95f6f2bf412dfb 100644
--- a/iopsys-brcm63xx-arm/Config.in
+++ b/iopsys-brcm63xx-arm/Config.in
@@ -16,32 +16,12 @@ menu "Target options Brcm63xx (ARM)"
 	config BCM_KERNEL_PROFILE
 	default "963138GWV"  if TARGET_iopsys_brcm63xx_arm_brcm_ref138_p502
 	default "963138GWV"  if TARGET_iopsys_brcm63xx_arm_dg400
-	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_f104w
-	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_eg400
 	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_dg400prime
 
-
-
-
-
-	default "963158GWV" if TARGET_iopsys_brcm63xx_arm_arc63158ref
-
-
-
 	# TODO: defaults to be moved to separate files
 	config BCM_CHIP_ID
 	default "63138" if TARGET_iopsys_brcm63xx_arm_brcm_ref138_p502
-	default "63138" if TARGET_iopsys_brcm63xx_arm_dg400
-	default "63138" if TARGET_iopsys_brcm63xx_arm_f104w
 	default "63138" if TARGET_iopsys_brcm63xx_arm_dg400prime
-	default "63138" if TARGET_iopsys_brcm63xx_arm_eg400
-
-
-
-
-	default "63158" if TARGET_iopsys_brcm63xx_arm_arc63158ref
-
-
 
 
 # TODO: Can we remove this? Only used for image buildign and OpenSDK.
@@ -57,12 +37,7 @@ menu "Target options Brcm63xx (ARM)"
 	default "BRCM_REF138_P502" if TARGET_iopsys_brcm63xx_arm_brcm_ref138_p502
         default "DG400"            if TARGET_iopsys_brcm63xx_arm_dg400
         default "DG400PRIME"       if TARGET_iopsys_brcm63xx_arm_dg400prime
-        default "F104W"            if TARGET_iopsys_brcm63xx_arm_f104w
-        default "EG400"            if TARGET_iopsys_brcm63xx_arm_eg400
-
-
 
-        default "ARC63158REF"      if TARGET_iopsys_brcm63xx_arm_arc63158ref
 
 	config TARGET_HAS_VOICE
 		bool "Whether to build voice or exclude it entirely"
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/963158REF_ARC b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/963158REF_ARC
deleted file mode 100644
index e91dbd42632e03b5abb54e156371dd8c2233a1e7..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/963158REF_ARC
+++ /dev/null
@@ -1,25 +0,0 @@
-
-config board 'board'
-	# Specs
-	option hasAdsl '1'
-	option hasVdsl '1'
-	option hasVoice '1'
-	option hasDect '1'
-	option hasUsb '1'
-	option hasCatv '0'
-	option hasSfp '1'
-	option hasWifi '1'
-	# Voice
-	option VoicePorts '6'
-	option VoicePortNames 'DECT_1 DECT_2 DECT_3 DECT_4 Tel_1 Tel_2'
-	option VoicePortOrder 'brcm0 brcm1 brcm2 brcm3 brcm4 brcm5'
-	# Ethernet
-	option ethernetPorts '4'
-	option ethernetPortNames 'LAN1 LAN2 LAN3 WAN'
-	option ethernetPortOrder 'eth1 eth2 eth3 eth0'
-	option ethernetLanPorts 'eth1 eth2 eth3'
-	option ethernetWanPort 'eth0'
-	# DSL
-	option adslWanPort 'atm0'
-	option vdslWanPort 'ptm0'
-	option wpsButtonGpio '0'
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/EG400R0 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/EG400R0
deleted file mode 100644
index 18a87089d261444405d134c195fbd209325397d1..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/EG400R0
+++ /dev/null
@@ -1,306 +0,0 @@
-
-config board 'board'
-	# Specs
-	option hasAdsl '0'
-	option hasVdsl '0'
-	option hasVoice '1'
-	option hasDect '1'
-	option hasUsb '1'
-	option hasCatv '1'
-	option hasSfp '1'
-	option hasWifi '1'
-	# Voice
-	option VoicePorts '6'
-	option VoicePortNames 'DECT_1 DECT_2 DECT_3 DECT_4 Tel_1 Tel_2'
-	option VoicePortOrder 'brcm0 brcm1 brcm2 brcm3 brcm5 brcm4'
-	# Ethernet
-	option ethernetPorts '5'
-	option ethernetPortNames 'LAN1 LAN2 LAN3 LAN4 WAN'
-	option ethernetPortOrder 'eth1 eth2 eth3 eth4 eth0'
-	option ethernetLanPorts 'eth1 eth2 eth3 eth4'
-	option ethernetWanPort 'eth0'
-	# SFP
-	option sfpBus '/dev/i2c-1'
-	#option fiberPortNames 'SFP'
-	#option fiberPortOrder 'eth0'
-	# I2C
-	option i2cGpioCustom 'bus1=1,24,25'
-	option sx9512_i2c_device '/dev/i2c-0'
-	option sx9512_i2c_address 2b
-	option sx9512_irq_pin 54
-	option sx9512_active_capsense_channels 0f
-	option sx9512_active_led_channels ff
-	option sx9512_threshold_bl1 3
-	option sx9512_threshold_bl2 3
-	option sx9512_threshold_bl3 3
-
-config wifi-chip '435f'
-        option bands 'b'
-
-config wifi-chip '43a0'
-        option bands 'a'
-        option is_ac '1'
-
-config wifi-chip '43a2'
-        option bands 'a'
-        option is_ac '1'
-
-config wifi-chip '43a9'
-        option bands 'b'
-
-config wifi-chip '43bc'
-        option bands 'a'
-        option is_ac '1'
-	option radarthrs '0x6a4 0x30 0x6a4 0x30 0x6a0 0x30 0x6ac 0x30 0x6a6 0x30 0x69c 0x30'
-
-config wifi-chip '43c5'
-	option bands 'a'
-	option is_ac '1'
-	option radarthrs '0x6ac 0x30 0x6aa 0x30 0x6b4 0x30 0x6ac 0x30 0x6aa 0x30 0x6b4 0x30 0x6aa 0x30 0x6aa 0x30'
-
-###############################################################################
-#
-#		Button config, start
-#
-
-############### gpio buttons, driver config
-config gpio_button gpio_buttons
-       list buttons gpio_reset
-
-config gpio_button gpio_reset
-       option addr 32
-       option active low
-
-############### sx9512, i2c buttons, driver config
-config 9512_button 9512_buttons
-       list buttons 9512_dect
-       list buttons 9512_wps
-       list buttons 9512_wireless
-       list buttons 9512_touch_near
-       list buttons 9512_touch_far
-
-config 9512_button 9512_dect
-       option addr   3
-
-config 9512_button 9512_wps
-       option addr   2
-
-config 9512_button 9512_wireless
-       option addr   1
-
-config 9512_button 9512_touch_near
-       option addr   8
-
-config 9512_button 9512_touch_far
-       option addr   9
-
-############### mapping function button to driver button
-config button RESET
-	list button gpio_reset
-	option minpress 5000
-	option hotplug resetbutton
-
-#
-#		Button config , end
-#
-###############################################################################
-
-###############################################################################
-#
-#		Led config, start
-#
-
-############### 9512 led, driver config
-config 9512_led 9512_leds
-	list leds Internet_green
-	list leds Internet_red
-	list leds WAN_green
-	list leds WAN_yellow
-	list leds Voice_green
-	list leds Ethernet_green
-	list leds WPS_green
-	list leds DECT_green
-
-config 9512_led Internet_green
-       option addr     4
-
-config 9512_led Internet_red
-       option addr     5
-
-config 9512_led WAN_green
-       option addr     0
-
-config 9512_led WAN_yellow
-       option addr     1
-
-config 9512_led Voice_green
-       option addr     7
-
-config 9512_led Ethernet_green
-       option addr     6
-
-config 9512_led WPS_green
-       option addr     2
-
-config 9512_led DECT_green
-       option addr     3
-
-############### gpio led, driver config
-config gpio_led gpio_leds
-        list leds Status_green
-        list leds Status_red
-        list leds Wireless_green
-        list leds Wireless_blue
-        list leds EXT_green
-
-config gpio_led Status_green
-       option addr	106
-       option active	low
-       option mode	direct
-
-config gpio_led Status_red
-       option addr	107
-       option active	low
-       option mode	direct
-       option delay	1
-
-config gpio_led Wireless_green
-       option addr	20
-       option active	low
-       option mode	direct
-
-config gpio_led Wireless_blue
-       option addr	21
-       option active	low
-       option mode	direct
-
-config gpio_led EXT_green
-       option addr	19
-       option active	low
-       option mode	direct
-
-############### mapping led function to driver led
-config led_map led_map
-       list press_indicator led_wifi
-       list press_indicator led_wps
-       list press_indicator led_lan
-       list press_indicator led_wan
-       list press_indicator led_internet
-       list press_indicator led_voice
-       list press_indicator led_dect
-       list press_indicator led_ext
-	list functions wifi
-	list functions wps
-	list functions lan
-	list functions status
-	list functions wan
-	list functions internet
-	list functions voice
-	list functions ext
-	list functions dect
-
-# dimming turn leds off unless above cutof level
-       option dimming_level	off
-       option dimming_on	5
-       list dimming		wifi
-       list dimming		wps
-       list dimming		lan
-       list dimming 		status
-       list dimming		wan
-       list dimming		internet
-       list dimming		voice
-       list dimming 		dect
-       list dimming 		ext
-
-config led_map led_wifi
-       list led_action_ok     'Wireless_green = ON'
-       list led_action_ok     'Wireless_blue  = OFF'
-
-       list led_action_eok    'Wireless_green = OFF'
-       list led_action_eok    'Wireless_blue  = ON'
-
-       list led_action_off    'Wireless_green = OFF'
-       list led_action_off    'Wireless_blue  = OFF'
-
-       list led_action_notice 'Wireless_green = FLASH_SLOW'
-       list led_action_notice 'Wireless_blue  = OFF'
-
-       list led_action_alert  'Wireless_green = OFF'
-       list led_action_alert  'Wireless_blue  = FLASH_SLOW'
-
-       list led_action_error  'Wireless_green = OFF'
-       list led_action_error  'Wireless_blue  = FLASH_FAST'
-
-config led_map led_wps
-       list led_action_ok	'WPS_green=ON'
-       list led_action_off	'WPS_green=OFF'
-       list led_action_notice	'WPS_green=FLASH_SLOW'
-       list led_action_alert	'WPS_green=FLASH_FAST'
-       list led_action_error	'WPS_green=OFF'
-
-config led_map led_lan
-       list led_action_ok	Ethernet_green=ON
-       list led_action_off	Ethernet_green=OFF
-       list led_action_notice	Ethernet_green=FLASH_SLOW
-       list led_action_alert	Ethernet_green=FLASH_SLOW
-       list led_action_error	Ethernet_green=FLASH_FAST
-
-config led_map led_status
-       list led_action_ok	'Status_green = ON'
-       list led_action_ok     	'Status_red   = OFF'
-       list led_action_off	'Status_green = OFF'
-       list led_action_off	'Status_red   = OFF'
-       list led_action_notice	'Status_green = FLASH_SLOW'
-       list led_action_notice	'Status_red   = FLASH_SLOW'
-       list led_action_alert	'Status_green = OFF'
-       list led_action_alert	'Status_red   = FLASH_SLOW'
-       list led_action_error	'Status_green = OFF'
-       list led_action_error	'Status_red   = FLASH_FAST'
-
-config led_map led_wan
-       list led_action_ok	'WAN_green  = ON'
-       list led_action_ok     	'WAN_yellow = OFF'
-       list led_action_off	'WAN_green  = OFF'
-       list led_action_off	'WAN_yellow = OFF'
-       list led_action_notice	'WAN_green  = FLASH_SLOW'
-       list led_action_notice	'WAN_yellow = OFF'
-       list led_action_alert	'WAN_green  = OFF'
-       list led_action_alert	'WAN_yellow = FLASH_SLOW'
-       list led_action_error	'WAN_green  = OFF'
-       list led_action_error	'WAN_yellow = ON'
-
-config led_map led_internet
-       list led_action_ok	'Internet_green = ON'
-       list led_action_ok     	'Internet_red   = OFF'
-       list led_action_off	'Internet_green = OFF'
-       list led_action_off	'Internet_red   = OFF'
-       list led_action_notice	'Internet_green = FLASH_SLOW'
-       list led_action_notice	'Internet_red   = OFF'
-       list led_action_alert	'Internet_green = OFF'
-       list led_action_alert	'Internet_red   = FLASH_SLOW'
-       list led_action_error	'Internet_green = OFF'
-       list led_action_error	'Internet_red   = ON'
-	list led_action_eok	'Internet_green = ON'
-	list led_action_eok	'Internet_red   = OFF'
-
-config led_map led_voice
-       list led_action_ok	Voice_green=ON
-       list led_action_off	Voice_green=OFF
-       list led_action_notice	Voice_green=FLASH_SLOW
-       list led_action_alert	Voice_green=FLASH_SLOW
-       list led_action_error	Voice_green=FLASH_FAST
-
-config led_map led_ext
-       list led_action_ok	EXT_green=ON
-       list led_action_off	EXT_green=OFF
-       list led_action_notice	EXT_green=FLASH_SLOW
-       list led_action_alert	EXT_green=FLASH_SLOW
-       list led_action_error	EXT_green=FLASH_FAST
-
-config led_map led_dect
-       list led_action_ok	DECT_green=ON
-       list led_action_off	DECT_green=OFF
-       list led_action_notice	DECT_green=FLASH_SLOW
-       list led_action_alert	DECT_green=FLASH_SLOW
-       list led_action_error	DECT_green=FLASH_FAST
-
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/F104W b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/F104W
deleted file mode 100644
index 53fe83306b01c7dd263b41cd2d67123229c2d41a..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/F104W
+++ /dev/null
@@ -1,174 +0,0 @@
-
-config board 'board'
-	# Specs
-	option hasEthWan '0'
-	option hasAdsl '0'
-	option hasVdsl '1'
-	option hasVoice '0'
-	option hasDect '0'
-	option hasUsb '0'
-	option hasWifi '1'
-	# Ethernet
-	option ethernetPorts '4'
-	option ethernetPortNames 'LAN1 LAN2 LAN3 LAN4'
-	option ethernetPortOrder 'eth0 eth1 eth2 eth3'
-	option ethernetLanPorts 'eth0 eth1 eth2 eth3'
-	# DSL
-	option adslWanPort 'atm0'
-	option vdslWanPort 'ptm0'
-	# GPIO
-	#option gpio_shiftreg_clk 1
-	#option gpio_shiftreg_dat 0
-	#option gpio_shiftreg_mask 2
-	#option gpio_shiftreg_bits 16
-
-config wifi-chip '435f'
-        option bands 'b'
-
-config wifi-chip '43a0'
-        option bands 'a'
-        option is_ac '1'
-
-config wifi-chip '43a2'
-        option bands 'a'
-        option is_ac '1'
-
-config wifi-chip '43bc'
-	option bands 'a'
-	option is_ac '1'
-	option radarthrs '0x688 0x18 0x688 0x18 0x688 0x18 0x688 0x18 0x688 0x18 0x688 0x18'
-
-config wifi-chip '43c5'
-	option bands 'a'
-	option is_ac '1'
-
-###############################################################################
-#
-#		Button config, start
-#
-
-############### gpio buttons, driver config
-config gpio_button gpio_buttons
-	list buttons gpio_reset
-	list buttons gpio_wps
-
-config gpio_button gpio_reset
-	option addr 32
-	option active low
-
-config gpio_button gpio_wps
-       option addr 33
-       option active low
-
-############### mapping function button to driver button
-config button RESET
-	list button gpio_reset
-	option minpress 1000
-	option hotplug restartbutton
-	option longpress 5000
-	option hotplug_long resetbutton
-#
-#		Button config , end
-#
-###############################################################################
-
-###############################################################################
-#
-#		Led config, start
-#
-
-
-############### gpio led, driver config
-config gpio_led gpio_leds
-       list leds gfast_link
-       list leds gfast_fail
-
-config gpio_led gfast_link
-       option addr	31
-       option active	low
-       option mode	direct
-
-config gpio_led gfast_fail
-       option addr	58
-       option active	low
-       option mode	direct
-
-
-############### wlctl_led, driver config
-
-config wlctl_led wlctl_leds
-       list leds wifi5_green
-       list leds wifi2_green
-
-config wlctl_led wifi2_green
-	option addr     3
-	option interface 'wl1'
-	option active   hi
-
-config wlctl_led wifi5_green
-	option addr     10
-	option active   hi
-	option interface 'wl0'
-
-############### mapping led function to driver led
-config led_map led_map
-       list functions dsl
-
-       list functions wps
-       list functions wifi_wps
-       list functions wifi5_wps
-       
-       list functions wifi
-       list functions wifi5	
-
-config led_map led_dsl
-       list led_action_off    'gfast_link = OFF'
-       list led_action_off    'gfast_fail = OFF'
-       list led_action_ok     'gfast_link = ON'
-       list led_action_ok     'gfast_fail = OFF'
-       list led_action_notice 'gfast_link = OFF'
-       list led_action_notice 'gfast_fail = FLASH_SLOW'
-       list led_action_alert  'gfast_link = OFF'
-       list led_action_alert  'gfast_fail = FLASH_FAST'
-       list led_action_error  'gfast_link = FLASH_FAST'
-       list led_action_error  'gfast_fail = FLASH_FAST'
-
-
-config led_map led_wps
-config led_map led_wifi
-config led_map led_wifi5
-
-config led_map led_wifi_wps
-	list led_action_off     wifi2_green=OFF
-	list super_off	       'wifi_off'
-	
-	list led_action_ok      wifi2_green=ON 
-	list super_ok	       'wifi_ok'
-	list super_ok	       'wifi_eok'
-
-	list led_action_notice   wifi2_green=FLASH_SLOW
-	list super_notice	'wifi_notice'
-		
-	list led_action_alert    wifi2_green=FLASH_SLOW
-	list super_alert	'wps_notice, wifi_ok'
-
-	list led_action_error    wifi2_green=FLASH_FAST
-	list super_error	'wifi_error'
-
-config led_map led_wifi5_wps
-	list led_action_off     wifi5_green=OFF
-	list super_off	       'wifi5_off'
-	
-	list led_action_ok      wifi5_green=ON 
-	list super_ok	       'wifi5_ok'
-	list super_ok	       'wifi5_eok'
-
-	list led_action_notice   wifi5_green=FLASH_SLOW
-	list super_notice	'wifi5_notice'
-		
-	list led_action_alert    wifi5_green=FLASH_SLOW
-	list super_alert	'wps_notice, wifi5_ok'
-
-	list led_action_error    wifi5_green=FLASH_FAST
-	list super_error	'wifi5_error'
-
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XCE572 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XCE572
deleted file mode 100644
index 3afa0c4ae42714caaaa76621efe5bc08a00ff4f4..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XCE572
+++ /dev/null
@@ -1,16 +0,0 @@
-
-config board 'board'
-	# Specs
-	option hasAdsl '0'
-	option hasVdsl '0'
-	option hasEthWan '0'
-	option hasVoice '0'
-	option hasDect '0'
-	option hasUsb '0'
-	option hasWifi '0'
-	# Ethernet
-	option ethernetPorts '2'
-	option ethernetWanPort 'eth1'
-	option ethernetPortNames 'LAN1 WAN'
-	option ethernetPortOrder 'eth0 eth1'
-	option ethernetLanPorts 'eth0 eth1'
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XCE573 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XCE573
deleted file mode 100644
index e30a7e96bcc6b4bc06fc562265edcbec07b71602..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XCE573
+++ /dev/null
@@ -1,16 +0,0 @@
-
-config board 'board'
-	# Specs
-	option hasAdsl '0'
-	option hasVdsl '0'
-	option hasEthWan '0'
-	option hasVoice '0'
-	option hasDect '0'
-	option hasUsb '0'
-	option hasWifi '0'
-	# Ethernet
-	option ethernetPorts '2'
-	option ethernetWanPort 'eth2'
-	option ethernetPortNames 'LAN1 LAN2 WAN'
-	option ethernetPortOrder 'eth0 eth1 eth2'
-	option ethernetLanPorts 'eth0 eth1 eth2'
diff --git a/iopsys-brcm63xx-arm/config/arc63158ref/config b/iopsys-brcm63xx-arm/config/arc63158ref/config
deleted file mode 100644
index 47706a86a9696e66bf5c16998ad5c9861b9f6a5e..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/config/arc63158ref/config
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_TARGET_FAMILY="ARC63158REF"
-CONFIG_BCM_KERNEL_PROFILE="963158GWV"
-CONFIG_BCM_CHIP_ID="63158"
diff --git a/iopsys-brcm63xx-arm/config/eg400/config b/iopsys-brcm63xx-arm/config/eg400/config
deleted file mode 100644
index 0168d748086d79db57df282bacdf5fe9d6bef449..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/config/eg400/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_TARGET_FAMILY="EG400"
-CONFIG_BCM_KERNEL_PROFILE="963138GWV"
-CONFIG_BCM_CHIP_ID="63138"
-
-# CONFIG_BCM_DSL is not set
diff --git a/iopsys-brcm63xx-arm/config/f104w/config b/iopsys-brcm63xx-arm/config/f104w/config
deleted file mode 100644
index c08fb11da8ffc0204bf74c91d4765f82e6bad5de..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/config/f104w/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_TARGET_FAMILY="F104W"
-CONFIG_BCM_KERNEL_PROFILE="963138GWV"
-CONFIG_BCM_CHIP_ID="63138"
-
-CONFIG_BCM_DSL_GFAST=y
diff --git a/iopsys-brcm63xx-arm/config/srcmm6752ref/config b/iopsys-brcm63xx-arm/config/srcmm6752ref/config
deleted file mode 100644
index 688a55a61fc2b031b0daf5f0c0aea781a344ce66..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/config/srcmm6752ref/config
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_TARGET_FAMILY="SRCMM6752REF"
-CONFIG_BCM_KERNEL_PROFILE="96750GW"
-CONFIG_BCM_CHIP_ID="63178"
-
-# CONFIG_BCM_VOICE is not set
-# CONFIG_BCM_DSL is not set
-# CONFIG_PACKAGE_libdsl is not set
-# CONFIG_PACKAGE_dslmngr is not set
-# CONFIG_PACKAGE_mwan3 is not set
diff --git a/iopsys-brcm63xx-arm/image/Config.in b/iopsys-brcm63xx-arm/image/Config.in
index 4c69fda8a76de9a20bd063285661ce9420d6eea8..9ed9d6ac8c323dc3e9d6abf8e5dc50d0b2269716 100644
--- a/iopsys-brcm63xx-arm/image/Config.in
+++ b/iopsys-brcm63xx-arm/image/Config.in
@@ -132,15 +132,9 @@ config TARGET_NAND_DEVSZ
 		the order of 268435456 (256 MB).
 	default "134217728"  if TARGET_iopsys_brcm63xx_arm_dg400
 	default "268435456"  if TARGET_iopsys_brcm63xx_arm_dg400prime
-	default "268435456"  if TARGET_iopsys_brcm63xx_arm_f104w
-	default "268435456"  if TARGET_iopsys_brcm63xx_arm_f104
-	default "268435456"  if TARGET_iopsys_brcm63xx_arm_eg400
-	default "268435456"  if TARGET_iopsys_brcm63xx_arm_sdx810_rg
 	default "268435456"  if TARGET_iopsys_brcm63xx_arm_tiger
 	default "268435456"  if TARGET_iopsys_brcm63xx_arm_panther
 	default "268435456"  if TARGET_iopsys_brcm63xx_arm_xug534
-	default "1073741824" if TARGET_iopsys_brcm63xx_arm_arc63158ref
-	default "134217728"  if TARGET_iopsys_brcm63xx_arm_srcmm6752ref
 	range 67108864 4294967296
 	depends on NAND_SUPPORT
 
@@ -151,15 +145,9 @@ config TARGET_NAND_BLOCKSZ
 		the order of 131072 (128 kB).
 	default "131072"     if TARGET_iopsys_brcm63xx_arm_dg400
 	default "131072"     if TARGET_iopsys_brcm63xx_arm_dg400prime
-	default "131072"     if TARGET_iopsys_brcm63xx_arm_f104w
-	default "131072"     if TARGET_iopsys_brcm63xx_arm_f104
-	default "131072"     if TARGET_iopsys_brcm63xx_arm_eg400
-	default "131072"     if TARGET_iopsys_brcm63xx_arm_sdx810_rg
 	default "131072"     if TARGET_iopsys_brcm63xx_arm_tiger
 	default "131072"     if TARGET_iopsys_brcm63xx_arm_panther
 	default "131072"     if TARGET_iopsys_brcm63xx_arm_xug534
-	default "262144"     if TARGET_iopsys_brcm63xx_arm_arc63158ref
-	default "131072"     if TARGET_iopsys_brcm63xx_arm_srcmm6752ref
 	range 16384 1048576
 	depends on NAND_SUPPORT
 
@@ -170,15 +158,9 @@ config TARGET_NAND_PAGESZ
 		the order of 512 or 2048.
 	default "2048"       if TARGET_iopsys_brcm63xx_arm_dg400
 	default "2048"       if TARGET_iopsys_brcm63xx_arm_dg400prime
-	default "2048"       if TARGET_iopsys_brcm63xx_arm_f104w
-	default "2048"       if TARGET_iopsys_brcm63xx_arm_f104
-	default "2048"       if TARGET_iopsys_brcm63xx_arm_eg400
-	default "2048"       if TARGET_iopsys_brcm63xx_arm_sdx810_rg
 	default "2048"       if TARGET_iopsys_brcm63xx_arm_tiger
 	default "2048"       if TARGET_iopsys_brcm63xx_arm_panther
 	default "2048"       if TARGET_iopsys_brcm63xx_arm_xug534
-	default "4096"       if TARGET_iopsys_brcm63xx_arm_arc63158ref
-	default "2048"       if TARGET_iopsys_brcm63xx_arm_srcmm6752ref
 	range 256 65536
 	depends on NAND_SUPPORT
 
@@ -187,7 +169,6 @@ config TARGET_NAND_SPARE_SIZE
 	help
 		NAND flash spare area size (in bytes). Usually in
 		the order of 64 or 16.
-	default "128"      if TARGET_iopsys_brcm63xx_arm_srcmm6752ref
 	default "64"       if TARGET_NAND_PAGESZ = 2048
 	range 16 128
 	depends on NAND_SUPPORT
@@ -209,7 +190,6 @@ choice	DDR_TYPE
 		for addvtoken tool when generating the broadcom w
 		image
 
-	default TARGET_DDR_TYPE_DDR3 if TARGET_iopsys_brcm63xx_arm_arc63158ref
 	default TARGET_DDR_TYPE_NONE
 
 	config TARGET_DDR_TYPE_NONE
diff --git a/iopsys-brcm63xx-arm/profiles/iopsys.mk b/iopsys-brcm63xx-arm/profiles/iopsys.mk
index 7a728701ff5fe65168c5dc6b3e5ed85a4cc183d5..8ba97ecc55063df42012d4a35de61c1918c3dde4 100644
--- a/iopsys-brcm63xx-arm/profiles/iopsys.mk
+++ b/iopsys-brcm63xx-arm/profiles/iopsys.mk
@@ -48,29 +48,6 @@ endef
 
 $(eval $(call Profile,dg400prime))
 
-#################### EG400
-define Profile/eg400
-  NAME:=eg400
-  PACKAGES:=$(VOICE_SUPPORT) $(DECT_SUPPORT) catv
-endef
-
-define Profile/eg400/Description
-	eg400 profile
-endef
-
-$(eval $(call Profile,eg400))
-
-#################### F104W
-define Profile/f104w
-  NAME:=f104w
-endef
-
-define Profile/f104w/Description
-	f104w profile
-endef
-
-$(eval $(call Profile,f104w))
-
 #################### TIGER
 define Profile/tiger
   NAME:=tiger
@@ -106,16 +83,6 @@ endef
 
 $(eval $(call Profile,xug534))
 
-#################### arc63158ref
-define Profile/arc63158ref
-  NAME:=arc63158ref
-endef
-
-define Profile/arc63158ref/Description
-	arc63158ref profile
-endef
-
-$(eval $(call Profile,arc63158ref))
 #################### smarthub3
 define Profile/smarthub3
   NAME:=smarthub3
@@ -128,17 +95,6 @@ endef
 
 $(eval $(call Profile,smarthub3))
 
-#################### srcmm6752ref
-define Profile/srcmm6752ref
-  NAME:=srcmm6752ref
-endef
-
-define Profile/srcmm6752ref/Description
-	srcmm6752ref profile
-endef
-
-$(eval $(call Profile,srcmm6752ref))
-
 #################### disc
 define Profile/disc
   NAME:=disc