From 611e358ad94d5e05a2f20a78690671423439fac3 Mon Sep 17 00:00:00 2001
From: harald42 <harald@digiel-5.7>
Date: Tue, 4 Jun 2013 11:28:42 +0200
Subject: [PATCH] add BOOTLOADER_GET_MAC

---
 platform/osd-merkur/Makefile.osd-merkur | 6 ++++++
 platform/osd-merkur/params.c            | 9 +++++++++
 platform/osd-merkur/params.h            | 6 ++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/platform/osd-merkur/Makefile.osd-merkur b/platform/osd-merkur/Makefile.osd-merkur
index 3c97ed6cb..fd3a75b36 100644
--- a/platform/osd-merkur/Makefile.osd-merkur
+++ b/platform/osd-merkur/Makefile.osd-merkur
@@ -43,6 +43,12 @@ AVRDUDE_PORT=usb:00B000000D79
 # Verify off
 AVRDUDE_OPTIONS=-V
 
+#debug
+# CFLAGS  += -save-temps
+# Bootloader bonsai
+# LDFLAGS  += -save-temps
+LDFLAGS  += -Wl,--defsym,bootloader_get_mac=0x0001f3a0
+
 
 include $(CONTIKIAVR)/Makefile.avr
 include $(CONTIKIAVR)/radio/Makefile.radio
diff --git a/platform/osd-merkur/params.c b/platform/osd-merkur/params.c
index aadbb83c4..a5a83932a 100644
--- a/platform/osd-merkur/params.c
+++ b/platform/osd-merkur/params.c
@@ -84,6 +84,9 @@ const uint8_t default_domain_name[] PROGMEM = PARAMS_DOMAINNAME;
 
 #if PARAMETER_STORAGE==0
 /* 0 Hard coded, minmal program and eeprom usage. */
+
+extern uint8_t bootloader_get_mac(uint8_t);
+
 uint8_t
 params_get_eui64(uint8_t *eui64) {
 #if CONTIKI_CONF_RANDOM_MAC
@@ -92,7 +95,13 @@ params_get_eui64(uint8_t *eui64) {
     return 1;
 #else
     uint8_t i;
+#if BOOTLOADER_GET_MAC
+    for (i=0;i<sizeof(default_mac_address);i++){
+      eui64[i] =  bootloader_get_mac(i);
+    }
+#else
     for (i=0;i<sizeof(default_mac_address);i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);
+#endif
     return 0;
 #endif
 }
diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur/params.h
index 6ee669635..100f57586 100644
--- a/platform/osd-merkur/params.h
+++ b/platform/osd-merkur/params.h
@@ -14,12 +14,14 @@
  */
 #define CONTIKI_CONF_RANDOM_MAC 0        //adds 78 bytes
 #define CONTIKI_CONF_SETTINGS_MANAGER 0  //adds 1696 bytes
+#define BOOTLOADER_GET_MAC 0             // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
 
 #if CONTIKI_CONF_SETTINGS_MANAGER
 //#define PARAMETER_STORAGE 2
 #define PARAMETER_STORAGE 2
 #else
-#define PARAMETER_STORAGE 1
+//#define PARAMETER_STORAGE 1
+#define PARAMETER_STORAGE 0
 #endif
 
 /* Include settings.h, then dummy out the write routines */
@@ -73,7 +75,7 @@ extern uint8_t eemem_domain_name[30];
 #if UIP_CONF_LL_802154
 //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN}
 //#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}
-#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x26, 0x6c}
+#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x26, 0xd0}
 //#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB}
 #else
 //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}