remove unused boot-menu-add-entry ...

The boot-menu-add-entry script no longer exists. Remove it from
boot scripts.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/ifup'

mtd: nand: create bb devices automatically ...

When a mtd device can have bad blocks we want to create a
bb device, so do this automatically. This allows us to
drop bb device creation from the environment.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

default environment: force a specific return value ...

Since commit a162dfe the ifup command runs
this file as a script. Due to a hush misbehave it could happen it returns
an error code by accident.

For example if the last instructions in this file are:

 if [ false ]; then
    echo "friesel"
 fi

the hush returns 1 after running this script instead of 0 and in this case
the ifup command fails.

I know, the correct fix would be to fix the hush, because it is a generic
issue...but how?

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/nfs' ...

Conflicts:
	defaultenv/defaultenv-2-base/bin/ifup

move defaultenv-2 to defaultenv/defaultenv-2-* ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>