From e55f9d10b4ba852782709a9f03dd8f2a7f62475c Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 31 Jan 2013 19:29:45 +0100
Subject: [PATCH] defenv2: move config-board out of /env/init

Having the board config file in /env/init has the problem that
the settings in /env/config are overwritten in the init sequence.

This moves the config-board files to /env/ and sources them explicitly
from /env/bin/init before sourcing /env/config

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/beagle/env/{init => }/config-board               | 0
 .../arm/boards/crystalfontz-cfa10036/env/{init => }/config-board | 0
 arch/arm/boards/efika-mx-smartbook/env/{init => }/config-board   | 0
 arch/arm/boards/freescale-mx51-pdk/env/{init => }/config-board   | 0
 arch/arm/boards/freescale-mx53-loco/env/{init => }/config-board  | 0
 .../boards/freescale-mx6-sabrelite/env/{init => }/config-board   | 0
 arch/arm/boards/karo-tx53/env/{init => }/config-board            | 0
 arch/arm/boards/panda/env/{init => }/config-board                | 0
 arch/arm/boards/pcm037/env/{init => }/config-board               | 0
 arch/arm/boards/pcm038/env/{init => }/config-board               | 0
 arch/arm/boards/tqma53/env/{init => }/config-board               | 0
 defaultenv-2/base/bin/init                                       | 1 +
 12 files changed, 1 insertion(+)
 rename arch/arm/boards/beagle/env/{init => }/config-board (100%)
 rename arch/arm/boards/crystalfontz-cfa10036/env/{init => }/config-board (100%)
 rename arch/arm/boards/efika-mx-smartbook/env/{init => }/config-board (100%)
 rename arch/arm/boards/freescale-mx51-pdk/env/{init => }/config-board (100%)
 rename arch/arm/boards/freescale-mx53-loco/env/{init => }/config-board (100%)
 rename arch/arm/boards/freescale-mx6-sabrelite/env/{init => }/config-board (100%)
 rename arch/arm/boards/karo-tx53/env/{init => }/config-board (100%)
 rename arch/arm/boards/panda/env/{init => }/config-board (100%)
 rename arch/arm/boards/pcm037/env/{init => }/config-board (100%)
 rename arch/arm/boards/pcm038/env/{init => }/config-board (100%)
 rename arch/arm/boards/tqma53/env/{init => }/config-board (100%)

diff --git a/arch/arm/boards/beagle/env/init/config-board b/arch/arm/boards/beagle/env/config-board
similarity index 100%
rename from arch/arm/boards/beagle/env/init/config-board
rename to arch/arm/boards/beagle/env/config-board
diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/init/config-board b/arch/arm/boards/crystalfontz-cfa10036/env/config-board
similarity index 100%
rename from arch/arm/boards/crystalfontz-cfa10036/env/init/config-board
rename to arch/arm/boards/crystalfontz-cfa10036/env/config-board
diff --git a/arch/arm/boards/efika-mx-smartbook/env/init/config-board b/arch/arm/boards/efika-mx-smartbook/env/config-board
similarity index 100%
rename from arch/arm/boards/efika-mx-smartbook/env/init/config-board
rename to arch/arm/boards/efika-mx-smartbook/env/config-board
diff --git a/arch/arm/boards/freescale-mx51-pdk/env/init/config-board b/arch/arm/boards/freescale-mx51-pdk/env/config-board
similarity index 100%
rename from arch/arm/boards/freescale-mx51-pdk/env/init/config-board
rename to arch/arm/boards/freescale-mx51-pdk/env/config-board
diff --git a/arch/arm/boards/freescale-mx53-loco/env/init/config-board b/arch/arm/boards/freescale-mx53-loco/env/config-board
similarity index 100%
rename from arch/arm/boards/freescale-mx53-loco/env/init/config-board
rename to arch/arm/boards/freescale-mx53-loco/env/config-board
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/env/init/config-board b/arch/arm/boards/freescale-mx6-sabrelite/env/config-board
similarity index 100%
rename from arch/arm/boards/freescale-mx6-sabrelite/env/init/config-board
rename to arch/arm/boards/freescale-mx6-sabrelite/env/config-board
diff --git a/arch/arm/boards/karo-tx53/env/init/config-board b/arch/arm/boards/karo-tx53/env/config-board
similarity index 100%
rename from arch/arm/boards/karo-tx53/env/init/config-board
rename to arch/arm/boards/karo-tx53/env/config-board
diff --git a/arch/arm/boards/panda/env/init/config-board b/arch/arm/boards/panda/env/config-board
similarity index 100%
rename from arch/arm/boards/panda/env/init/config-board
rename to arch/arm/boards/panda/env/config-board
diff --git a/arch/arm/boards/pcm037/env/init/config-board b/arch/arm/boards/pcm037/env/config-board
similarity index 100%
rename from arch/arm/boards/pcm037/env/init/config-board
rename to arch/arm/boards/pcm037/env/config-board
diff --git a/arch/arm/boards/pcm038/env/init/config-board b/arch/arm/boards/pcm038/env/config-board
similarity index 100%
rename from arch/arm/boards/pcm038/env/init/config-board
rename to arch/arm/boards/pcm038/env/config-board
diff --git a/arch/arm/boards/tqma53/env/init/config-board b/arch/arm/boards/tqma53/env/config-board
similarity index 100%
rename from arch/arm/boards/tqma53/env/init/config-board
rename to arch/arm/boards/tqma53/env/config-board
diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
index b606b634a..e4a7feef7 100644
--- a/defaultenv-2/base/bin/init
+++ b/defaultenv-2/base/bin/init
@@ -13,6 +13,7 @@ global linux.bootargs.dyn.ip
 global linux.bootargs.dyn.root
 global editcmd=sedit
 
+/env/config-board
 /env/config
 
 if [ -e /env/menu ]; then