diff --git a/iopsys-econet/base-files/etc/board-db/boards/arcee b/iopsys-econet/base-files/etc/board-db/boards/arcee
index eb3d60748aa434c975d79110962af2ccb2b0dea1..d06313513d9426b93df0ae1bd165f36ca22ee15d 100644
--- a/iopsys-econet/base-files/etc/board-db/boards/arcee
+++ b/iopsys-econet/base-files/etc/board-db/boards/arcee
@@ -1,6 +1,7 @@
 
 config board 'board'
 	# Specs
+	option hasEthWan '0'
 	option hasAdsl '0'
 	option hasVdsl '0'
 	option hasVoice '0'
@@ -11,179 +12,8 @@ config board 'board'
 	option hasWifi '1'
 	# Ethernet
 	option ethernetPorts '2'
-	option ethernetPortNames 'LAN1 WAN'
+	option ethernetPortNames 'LAN1 LAN2'
 	option ethernetPortOrder 'eth0.1 eth0.2'
-	option ethernetLanPorts 'eth0.1'
-	option ethernetWanPort 'eth0.2'
-	# I2C
-	option sx9512_i2c_device '/dev/i2c-0'
-	option sx9512_i2c_address 2b
-	option sx9512_irq_pin 10
-	option sx9512_active_capsense_channels 0f
-	option sx9512_active_led_channels ff
-
-
-############### mapping function button to driver button
-config button RESET
-        list button gpio_reset
-        option minpress 5000
-        option hotplug resetbutton
-	option enable 1
-
-###############################################################################
-#
-#		Button config, start
-#
-
-############### gpio buttons, driver config
-config gpio_button gpio_buttons
-        list buttons gpio_reset
-
-config gpio_button gpio_reset
-        option addr 18
-	option mode linux
-        option active low
-
-############### sx9512, i2c buttons, driver config
-config 9512_button 9512_buttons
-       list buttons 9512_wps
-       list buttons 9512_wifi_2g
-       list buttons 9512_wifi_5g
-       list buttons 9512_touch_near
-       list buttons 9512_touch_far
-
-config 9512_button 9512_wifi_2g
-       option addr   1
-
-config 9512_button 9512_wifi_5g
-       option addr   2
-
-config 9512_button 9512_wps
-       option addr   3
-
-config 9512_button 9512_touch_near
-       option addr   8
-
-config 9512_button 9512_touch_far
-       option addr   9
-
-
-#
-#		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 Wireless_24
-	list leds Wireless_5
-
-config 9512_led Internet_green
-       option addr     5
-
-config 9512_led Internet_red
-       option addr     4
-
-config 9512_led Wireless_24
-       option addr     7
-
-config 9512_led Wireless_5
-       option addr     6
-
-
-############### gpio led, driver config
-config gpio_led gpio_leds
-        list leds Status_green
-        list leds Status_red
-	list leds WPS_green
-
-config gpio_led Status_green
-       option addr	8
-       option active	low
-       option mode	linux
-
-config gpio_led Status_red
-       option addr	11
-       option active	hi
-       option mode	linux
-
-config 9512_led WPS_green
-       option addr	12
-       option active	low
-       option mode	linux
-
-############### mapping led function to driver led
-config led_map led_map
-       list press_indicator led_wifi_2g
-       list press_indicator led_wifi_5g
-       list press_indicator led_wps
-       list press_indicator led_internet
-
-	list functions 'wifi_2g'
-	list functions 'wifi_5g'
-	list functions wps
-	list functions status
-	list functions internet
-
-# dimming turn leds off unless above cutof level
-       option dimming_level	off
-       option dimming_on	5
-       list dimming		wifi
-       list dimming		wps
-       list dimming 		status
-       list dimming		internet
-
-config led_map 'led_wifi_2g'
-       list led_action_ok     'Wireless_24 = ON'
-       list led_action_off    'Wireless_24 = OFF'
-       list led_action_notice 'Wireless_24 = FLASH_SLOW'
-       list led_action_alert  'Wireless_24 = FLASH_SLOW'
-       list led_action_error  'Wireless_24 = FLASH_FAST'
-
-config led_map 'led_wifi_5g'
-       list led_action_ok     'Wireless_5 = ON'
-       list led_action_off    'Wireless_5 = OFF'
-       list led_action_notice 'Wireless_5 = FLASH_SLOW'
-       list led_action_alert  'Wireless_5 = FLASH_SLOW'
-       list led_action_error  'Wireless_5 = 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_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   = OFF'
-       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_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   = ON'
+	option ethernetLanPorts 'eth0.1 eth0.2'
+	option ethernetWanPort ''
 
diff --git a/iopsys-econet/base-files/etc/board-db/boards/rodimus b/iopsys-econet/base-files/etc/board-db/boards/rodimus
index dc6e05b5d6e5812efd570e8c2dde41baeadd6dc4..2d1bdb381b446aa896a271ca562800195b7c1407 100644
--- a/iopsys-econet/base-files/etc/board-db/boards/rodimus
+++ b/iopsys-econet/base-files/etc/board-db/boards/rodimus
@@ -1,6 +1,7 @@
 
 config board 'board'
 	# Specs
+	option hasEthWan '1'
 	option hasAdsl '0'
 	option hasVdsl '0'
 	option hasVoice '0'
@@ -10,180 +11,9 @@ config board 'board'
 	option hasSfp '0'
 	option hasWifi '1'
 	# Ethernet
-	option ethernetPorts '4'
-	option ethernetPortNames 'LAN1 WAN LAN2 LAN3'
-	option ethernetPortOrder 'eth0.1 eth0.2 eth0.3 eth0.4'
-	option ethernetLanPorts 'eth0.1 eth0.3 eth0.4'
-	option ethernetWanPort 'eth0.2'
-	# I2C
-	option sx9512_i2c_device '/dev/i2c-0'
-	option sx9512_i2c_address 2b
-	option sx9512_irq_pin 10
-	option sx9512_active_capsense_channels 0f
-	option sx9512_active_led_channels ff
-
-
-############### mapping function button to driver button
-config button RESET
-        list button gpio_reset
-        option minpress 5000
-        option hotplug resetbutton
-	option enable 1
-
-###############################################################################
-#
-#		Button config, start
-#
-
-############### gpio buttons, driver config
-config gpio_button gpio_buttons
-        list buttons gpio_reset
-
-config gpio_button gpio_reset
-        option addr 18
-	option mode linux
-        option active low
-
-############### sx9512, i2c buttons, driver config
-config 9512_button 9512_buttons
-       list buttons 9512_wps
-       list buttons 9512_wifi_2g
-       list buttons 9512_wifi_5g
-       list buttons 9512_touch_near
-       list buttons 9512_touch_far
-
-config 9512_button 9512_wifi_2g
-       option addr   1
-
-config 9512_button 9512_wifi_5g
-       option addr   2
-
-config 9512_button 9512_wps
-       option addr   3
-
-config 9512_button 9512_touch_near
-       option addr   8
-
-config 9512_button 9512_touch_far
-       option addr   9
-
-
-#
-#		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 Wireless_24
-	list leds Wireless_5
-
-config 9512_led Internet_green
-       option addr     5
-
-config 9512_led Internet_red
-       option addr     4
-
-config 9512_led Wireless_24
-       option addr     7
-
-config 9512_led Wireless_5
-       option addr     6
-
-
-############### gpio led, driver config
-config gpio_led gpio_leds
-        list leds Status_green
-        list leds Status_red
-	list leds WPS_green
-
-config gpio_led Status_green
-       option addr	8
-       option active	low
-       option mode	linux
-
-config gpio_led Status_red
-       option addr	11
-       option active	hi
-       option mode	linux
-
-config 9512_led WPS_green
-       option addr	12
-       option active	low
-       option mode	linux
-
-############### mapping led function to driver led
-config led_map led_map
-       list press_indicator led_wifi_2g
-       list press_indicator led_wifi_5g
-       list press_indicator led_wps
-       list press_indicator led_internet
-
-	list functions 'wifi_2g'
-	list functions 'wifi_5g'
-	list functions wps
-	list functions status
-	list functions internet
-
-# dimming turn leds off unless above cutof level
-       option dimming_level	off
-       option dimming_on	5
-       list dimming		wifi
-       list dimming		wps
-       list dimming 		status
-       list dimming		internet
-
-config led_map 'led_wifi_2g'
-       list led_action_ok     'Wireless_24 = ON'
-       list led_action_off    'Wireless_24 = OFF'
-       list led_action_notice 'Wireless_24 = FLASH_SLOW'
-       list led_action_alert  'Wireless_24 = FLASH_SLOW'
-       list led_action_error  'Wireless_24 = FLASH_FAST'
-
-config led_map 'led_wifi_5g'
-       list led_action_ok     'Wireless_5 = ON'
-       list led_action_off    'Wireless_5 = OFF'
-       list led_action_notice 'Wireless_5 = FLASH_SLOW'
-       list led_action_alert  'Wireless_5 = FLASH_SLOW'
-       list led_action_error  'Wireless_5 = 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_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   = OFF'
-       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_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   = ON'
+	option ethernetPorts '5'
+	option ethernetPortNames 'LAN1 LAN2 LAN3 LAN4 WAN'
+	option ethernetPortOrder 'eth0.1 eth0.2 eth0.3 eth0.4 eth1'
+	option ethernetLanPorts 'eth0.1 eth0.2 eth0.3 eth0.4'
+	option ethernetWanPort 'eth1'