diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:05:50 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:05:50 +0200 |
commit | 2274c6ea774aa167005fa4fe43419c5a18b531c8 (patch) | |
tree | b3562085fa7efb2cf8274e735027bd380cf769f4 /defaultenv | |
parent | d27b97820cffe2607ef5057df7897ce9aaee9099 (diff) | |
parent | 3781d93b06fddd9a5522e7ea7412e17693ece45c (diff) | |
download | barebox-2274c6ea774aa167005fa4fe43419c5a18b531c8.tar.gz barebox-2274c6ea774aa167005fa4fe43419c5a18b531c8.tar.xz |
Merge branch 'for-next/env'
Diffstat (limited to 'defaultenv')
-rw-r--r-- | defaultenv/defaultenv-1/bin/init | 1 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/bin/mtdparts-add | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/defaultenv/defaultenv-1/bin/init b/defaultenv/defaultenv-1/bin/init index adb3c43a66..4781b5a963 100644 --- a/defaultenv/defaultenv-1/bin/init +++ b/defaultenv/defaultenv-1/bin/init @@ -16,7 +16,6 @@ fi if [ -e /dev/nand0 -a -n "$nand_parts" ]; then addpart /dev/nand0 $nand_parts - nand -a /dev/nand0.* fi if [ -f /env/bin/init_board ]; then diff --git a/defaultenv/defaultenv-2-base/bin/mtdparts-add b/defaultenv/defaultenv-2-base/bin/mtdparts-add index 58c9fa7a21..05ab638bfc 100644 --- a/defaultenv/defaultenv-2-base/bin/mtdparts-add +++ b/defaultenv/defaultenv-2-base/bin/mtdparts-add @@ -39,10 +39,6 @@ fi addpart -n /dev/${device} "$parts" || exit mkdir -p /tmp/mtdparts/${device} -if [ -n "${bbdev}" ]; then - nand -a /dev/${device}.* -fi - if [ -n ${kernelname} ]; then global linux.mtdparts.${device} global.linux.mtdparts.${device}="${kernelname}:${parts}" |