diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
| commit | 497d1c49f4b75a6827bb400513d53a39dc8bb57c (patch) | |
| tree | 3227133463cb942c4d5be45108aab82e79daa98c /common/oftree.c | |
| parent | 94418c2d0d3d7dbaa6995fb53f00a5d5fc9f4028 (diff) | |
| parent | 4024d9ca11295b63dd2b9b795a8f1019b9bba64a (diff) | |
| download | barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.gz barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'common/oftree.c')
| -rw-r--r-- | common/oftree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/oftree.c b/common/oftree.c index a657d3166..49758a9dd 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -11,6 +11,7 @@ #include <errno.h> #include <getopt.h> #include <init.h> +#include <boot.h> #define MAX_LEVEL 32 /* how deeply nested we will go */ @@ -257,7 +258,7 @@ static int of_fixup_bootargs(struct fdt_header *fdt) if (nodeoffset < 0) return nodeoffset; - str = getenv("bootargs"); + str = linux_bootargs_get(); if (str) { err = fdt_setprop(fdt, nodeoffset, "bootargs", str, strlen(str)+1); |