From c5febda73d18f002e6b81598dd7bbb5cc18bba74 Mon Sep 17 00:00:00 2001
From: "Carl D. Roth" <carl.roth@bigswitch.com>
Date: Tue, 17 May 2016 19:23:31 -0700
Subject: [PATCH] Include sample configs for fw_env.config and interface name
 mappings - default mapping (eth0 --> ma1) should just work

---
 .../lib/platform-config-defaults-uboot.yml    | 25 +++++++++++++++++++
 .../lib/platform-config-defaults-x86-64.yml   | 15 +++++++++++
 2 files changed, 40 insertions(+)

diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml
index 4343389e..e2c03f68 100644
--- a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml
+++ b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml
@@ -113,6 +113,15 @@ default:
 
     nos_bootcmds: *ide_bootcmds
 
+    # Configure the fw_env.config file,
+    # based on board settings (no defaults here)
+    # XXX NOTE that you will need to define this for each platform!
+    ##environment:
+    ##- device: /dev/mtd3
+    ##  env_offset: 0x00000000
+    ##  env_size: 0x00002000
+    ##  sector_size: 0x00020000
+      
   # Default partitioning scheme
   # boot, config --> 128MiB (ext2)
   # images --> 1GiB
@@ -134,3 +143,19 @@ default:
   - ONL-DATA:
       =: 100%
       format: ext4
+
+  network:
+
+    # remap interface names on boot (loader only)
+    # make sure you have a valid 'ma1' entry in your platform config...
+
+    interfaces:
+
+      # this should work for most systems
+      ma1:
+        name: eth0
+      
+      # for other wierd corner cases
+      ##ma1:
+      ##  name: ~
+      ##  syspath: SOME-PATH
diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml
index 2b188f5c..c3f416bf 100644
--- a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml
+++ b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml
@@ -104,3 +104,18 @@ default:
   ##- ONL-IMAGES: 384MiB
   ##- ONL-DATA: 100%
   
+  network:
+
+    # remap interface names on boot (loader only)
+    # make sure you have a valid 'ma1' entry in your platform config...
+
+    interfaces:
+
+      # this should work for most systems
+      ma1:
+        name: eth0
+      
+      # for other wierd corner cases
+      ##ma1:
+      ##  name: ~
+      ##  syspath: SOME-PATH