summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/beaglebone
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-05-15 13:00:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-15 13:54:56 +0200
commit4049aea7a86edd9dad3fe8bef6a8aaeee137eb8a (patch)
tree216b3bed320f8f4c02f2b1d44f1b7be794a23c61 /arch/arm/boards/beaglebone
parent14f7e1d491c54bec398dd1ac9fc43ca9bd834e97 (diff)
downloadbarebox-4049aea7a86edd9dad3fe8bef6a8aaeee137eb8a.tar.gz
barebox-4049aea7a86edd9dad3fe8bef6a8aaeee137eb8a.tar.xz
ARM: AM335x: beaglebone: change to defaultenv_append_directory
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/beaglebone')
-rw-r--r--arch/arm/boards/beaglebone/Makefile1
-rw-r--r--arch/arm/boards/beaglebone/board.c3
-rw-r--r--arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd (renamed from arch/arm/boards/beaglebone/env/boot/sd)0
-rw-r--r--arch/arm/boards/beaglebone/defaultenv-beaglebone/config (renamed from arch/arm/boards/beaglebone/env/config)0
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boards/beaglebone/Makefile b/arch/arm/boards/beaglebone/Makefile
index 092c31d6b2..21a1a29d0b 100644
--- a/arch/arm/boards/beaglebone/Makefile
+++ b/arch/arm/boards/beaglebone/Makefile
@@ -1,2 +1,3 @@
lwl-y += lowlevel.o
obj-y += board.o
+bbenv-y += defaultenv-beaglebone
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index ad0d3b3070..993d05bfef 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -29,6 +29,7 @@
#include <globalvar.h>
#include <sizes.h>
#include <net.h>
+#include <envfs.h>
#include <bootsource.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
@@ -66,6 +67,8 @@ static int beaglebone_devices_init(void)
black = is_beaglebone_black();
+ defaultenv_append_directory(defaultenv_beaglebone);
+
globalvar_add_simple("board.variant", black ? "boneblack" : "bone");
printf("detected 'BeagleBone %s'\n", black ? "Black" : "White");
diff --git a/arch/arm/boards/beaglebone/env/boot/sd b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
index dce060542a..dce060542a 100644
--- a/arch/arm/boards/beaglebone/env/boot/sd
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
diff --git a/arch/arm/boards/beaglebone/env/config b/arch/arm/boards/beaglebone/defaultenv-beaglebone/config
index fbfa7d5174..fbfa7d5174 100644
--- a/arch/arm/boards/beaglebone/env/config
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/config