From 4dd2db7634b5df38e60dd9cd496a0a5b331f537f Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Tue, 22 Apr 2014 11:50:56 +0200
Subject: [PATCH] use consistent scheme for chosen MAC addresses

Take a similar MAC address scheme within run scripts like
within the nic bridge to simplify DHCP configuration.
---
 dde_linux/run/linux_nic_panda.run                   | 2 +-
 dde_linux/run/usb_net.run                           | 2 +-
 gems/run/http_blk.run                               | 2 +-
 libports/run/http_srv_tracing_nonblocking_panda.run | 2 +-
 libports/run/http_srv_tracing_panda.run             | 2 +-
 libports/run/lwip.run                               | 2 +-
 libports/run/network_test.inc                       | 4 ++--
 libports/run/test-ping_client.run                   | 2 +-
 libports/run/test-ping_server.run                   | 2 +-
 os/run/network_test_nic.inc                         | 2 +-
 ports-foc/run/l4android.run                         | 2 +-
 ports-foc/run/l4linux.run                           | 2 +-
 ports-foc/run/l4linux_dynamic.run                   | 2 +-
 ports-foc/run/l4linux_netperf.inc                   | 2 +-
 ports-foc/run/linux_panda.run                       | 2 +-
 ports-foc/run/smp_linux_panda.run                   | 2 +-
 ports-foc/run/two_linux.run                         | 2 +-
 ports/run/genode_org.run                            | 2 +-
 ports/run/netperf.inc                               | 2 +-
 ports/run/noux_net_netcat.run                       | 2 +-
 20 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dde_linux/run/linux_nic_panda.run b/dde_linux/run/linux_nic_panda.run
index 6e44f5fa2a..4de2c81224 100644
--- a/dde_linux/run/linux_nic_panda.run
+++ b/dde_linux/run/linux_nic_panda.run
@@ -65,7 +65,7 @@ set config  {
 		</provides>
 		<config ehci="yes">
 			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>
 	<start name="part_blk" priority="-1">
diff --git a/dde_linux/run/usb_net.run b/dde_linux/run/usb_net.run
index 0b3695089b..0db99b8e82 100644
--- a/dde_linux/run/usb_net.run
+++ b/dde_linux/run/usb_net.run
@@ -58,7 +58,7 @@ set config {
 			<service name="Nic"/>
 		</provides>
 		<config uhci="no" ehci="yes" xhci="yes">
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>
 	<start name="test-lwip_httpsrv">
diff --git a/gems/run/http_blk.run b/gems/run/http_blk.run
index b3e7783f93..058346991c 100644
--- a/gems/run/http_blk.run
+++ b/gems/run/http_blk.run
@@ -80,7 +80,7 @@ append_if $use_usb_driver config {
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<nic mac="2e:60:90:0c:4e:05"/>
+			<nic mac="02:00:00:00:01:01"/>
 		</config>
 	</start>}
 
diff --git a/libports/run/http_srv_tracing_nonblocking_panda.run b/libports/run/http_srv_tracing_nonblocking_panda.run
index e0a3b0c4d8..f934ac8317 100644
--- a/libports/run/http_srv_tracing_nonblocking_panda.run
+++ b/libports/run/http_srv_tracing_nonblocking_panda.run
@@ -54,7 +54,7 @@ set config  {
 		</provides>
 		<config ehci="yes">
 			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>
 
diff --git a/libports/run/http_srv_tracing_panda.run b/libports/run/http_srv_tracing_panda.run
index 4a3763ef36..a7008d1502 100644
--- a/libports/run/http_srv_tracing_panda.run
+++ b/libports/run/http_srv_tracing_panda.run
@@ -54,7 +54,7 @@ set config  {
 		</provides>
 		<config ehci="yes">
 			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>
 
diff --git a/libports/run/lwip.run b/libports/run/lwip.run
index 95be1b3b6e..871ef627e8 100644
--- a/libports/run/lwip.run
+++ b/libports/run/lwip.run
@@ -97,7 +97,7 @@ append_if $use_usb_driver config {
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>}
 
diff --git a/libports/run/network_test.inc b/libports/run/network_test.inc
index 6c390321a2..0cca42ce98 100644
--- a/libports/run/network_test.inc
+++ b/libports/run/network_test.inc
@@ -103,8 +103,8 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config {
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<nic mac="2e:60:90:0c:4e:02" />
-			<!--<nic mac="aa:bb:cc:dd:ee:00" />-->
+			<nic mac="02:00:00:00:01:01" />
+			<!--<nic mac="02:00:00:00:01:01" />-->
 		</config>
 	</start>}
 
diff --git a/libports/run/test-ping_client.run b/libports/run/test-ping_client.run
index cd72a72345..9052f04d07 100644
--- a/libports/run/test-ping_client.run
+++ b/libports/run/test-ping_client.run
@@ -69,7 +69,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config {
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<nic mac="2e:60:90:0c:4e:02" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>}
 
diff --git a/libports/run/test-ping_server.run b/libports/run/test-ping_server.run
index 0de106712b..967b5434d8 100644
--- a/libports/run/test-ping_server.run
+++ b/libports/run/test-ping_server.run
@@ -75,7 +75,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config {
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<nic mac="2e:60:90:0c:4e:02" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>}
 
diff --git a/os/run/network_test_nic.inc b/os/run/network_test_nic.inc
index c8a10bf9ef..d55eb04856 100644
--- a/os/run/network_test_nic.inc
+++ b/os/run/network_test_nic.inc
@@ -75,7 +75,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config "
 			<service name=\"Nic\"/>
 		</provides>
 		<config>
-			<nic mac=\"2e:60:90:0c:4e:01\" />
+			<nic mac=\"02:00:00:00:01:01\" />
 		</config>
 	</start>"
 
diff --git a/ports-foc/run/l4android.run b/ports-foc/run/l4android.run
index 7883824ab2..6f7bd7803b 100644
--- a/ports-foc/run/l4android.run
+++ b/ports-foc/run/l4android.run
@@ -184,7 +184,7 @@ append_if $use_usb_drv config {
 			<service name="Input"/>
 		</provides>
 		<config uhci="yes" ehci="yes" xhci="yes">
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 			<hid/>
 		</config>
 	</start>}
diff --git a/ports-foc/run/l4linux.run b/ports-foc/run/l4linux.run
index e41c96c045..df1383559f 100644
--- a/ports-foc/run/l4linux.run
+++ b/ports-foc/run/l4linux.run
@@ -116,7 +116,7 @@ append_if $use_usb_driver config {
 			<service name="Input"/>
 		</provides>
 		<config uhci="yes" ehci="yes">
-			<nic mac="2e:60:90:0c:4e:01"/>
+			<nic mac="02:00:00:00:01:01"/>
 			<hid />
 		</config>
 	</start>}
diff --git a/ports-foc/run/l4linux_dynamic.run b/ports-foc/run/l4linux_dynamic.run
index aad524cb49..de300669e2 100644
--- a/ports-foc/run/l4linux_dynamic.run
+++ b/ports-foc/run/l4linux_dynamic.run
@@ -116,7 +116,7 @@ set config  {
 		</provides>
 		<config uhci="yes" ehci="yes">
 			<hid />
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 		<route>
 			<service name="LOG"> <child name="terminal_log"/> </service>
diff --git a/ports-foc/run/l4linux_netperf.inc b/ports-foc/run/l4linux_netperf.inc
index 8372c0b589..c3f03275db 100644
--- a/ports-foc/run/l4linux_netperf.inc
+++ b/ports-foc/run/l4linux_netperf.inc
@@ -97,7 +97,7 @@ set config  {
 append config "
 		<config uhci=\"$use_usb_11\" ehci=\"$use_usb_20\" xhci=\"$use_usb_30\">"
 append config {
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 		<route>
 			<any-service> <parent/> <any-child/> </any-service>
diff --git a/ports-foc/run/linux_panda.run b/ports-foc/run/linux_panda.run
index 3e96d0f592..fce413d0b6 100644
--- a/ports-foc/run/linux_panda.run
+++ b/ports-foc/run/linux_panda.run
@@ -65,7 +65,7 @@ set config  {
 		</provides>
 		<config ehci="yes">
 			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>
 	<!--<start name="part_blk">
diff --git a/ports-foc/run/smp_linux_panda.run b/ports-foc/run/smp_linux_panda.run
index ea82195c93..add4a425f4 100644
--- a/ports-foc/run/smp_linux_panda.run
+++ b/ports-foc/run/smp_linux_panda.run
@@ -62,7 +62,7 @@ set config  {
 		</provides>
 		<config ehci="yes">
 			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>
 	<start name="nitpicker">
diff --git a/ports-foc/run/two_linux.run b/ports-foc/run/two_linux.run
index 3bcf0a91cf..2c2731b353 100644
--- a/ports-foc/run/two_linux.run
+++ b/ports-foc/run/two_linux.run
@@ -89,7 +89,7 @@ append_if [expr ![have_spec ps2] && [have_spec usb]] config {
 		</provides>
 		<config uhci="yes" ehci="yes" xhci="yes">
 			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start> }
 
diff --git a/ports/run/genode_org.run b/ports/run/genode_org.run
index fb994b0e07..d8c0ab06e9 100644
--- a/ports/run/genode_org.run
+++ b/ports/run/genode_org.run
@@ -76,7 +76,7 @@ append_if $use_usb_driver config {
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<nic mac="2e:60:90:0c:4e:05" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>}
 
diff --git a/ports/run/netperf.inc b/ports/run/netperf.inc
index 66b99d7c65..8030e0386c 100644
--- a/ports/run/netperf.inc
+++ b/ports/run/netperf.inc
@@ -137,7 +137,7 @@ append_if $use_usb_driver config {
 append_if $use_usb_driver config "
 		<config uhci=\"$use_usb_11\" ehci=\"$use_usb_20\" xhci=\"$use_usb_30\">"
 append_if $use_usb_driver config {
-			<nic mac="2e:60:90:0c:4e:05" />
+			<nic mac="02:00:00:00:01:01" />
 		</config>
 	</start>}
 
diff --git a/ports/run/noux_net_netcat.run b/ports/run/noux_net_netcat.run
index 3bcb3947de..c49c0392ed 100644
--- a/ports/run/noux_net_netcat.run
+++ b/ports/run/noux_net_netcat.run
@@ -130,7 +130,7 @@ append_if $use_usb_driver config {
 			<service name="Input"/>
 		</provides>
 		<config uhci="no" ehci="yes" xhci="no">
-			<nic mac="2e:60:90:0c:4e:03"/>
+			<nic mac="02:00:00:00:01:01"/>
 		</config>
 	</start>}