summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boards/archosg9/env/boot/sd-card-android5
-rw-r--r--arch/arm/boards/archosg9/env/boot/sd-card-linux5
-rw-r--r--arch/arm/boards/archosg9/env/boot/usb-android5
-rw-r--r--arch/arm/boards/archosg9/env/boot/usb-linux5
-rw-r--r--arch/arm/boards/at91sam9m10ihd/env/boot/android5
-rw-r--r--arch/arm/boards/at91sam9m10ihd/env/boot/mmc5
-rw-r--r--arch/arm/boards/at91sam9m10ihd/env/boot/net5
-rw-r--r--arch/arm/boards/at91sam9m10ihd/env/boot/net-usb5
-rw-r--r--arch/arm/boards/beagle/env/boot/mmc5
-rw-r--r--arch/arm/boards/beagle/env/boot/nand-ubi5
-rw-r--r--arch/arm/boards/beagle/env/boot/nand-ubi-dt5
-rw-r--r--arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd5
-rw-r--r--arch/arm/boards/ccxmx51/env/boot/nand5
-rw-r--r--arch/arm/boards/clep7212/env/boot/nor5
-rw-r--r--arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext35
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc5
-rw-r--r--arch/arm/boards/delphi-poc20/env/boot/mmc5
-rw-r--r--arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal5
-rw-r--r--arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left5
-rw-r--r--arch/arm/boards/friendlyarm-mini2440/env/boot/nand5
-rw-r--r--arch/arm/boards/guf-vincell/env/boot/nand-ubi5
-rw-r--r--arch/arm/boards/highbank/env/boot/ahci5
-rw-r--r--arch/arm/boards/highbank/env/boot/ahci-boot5
-rw-r--r--arch/arm/boards/highbank/env/boot/mmc5
-rw-r--r--arch/arm/boards/highbank/env/boot/mmc-boot5
-rw-r--r--arch/arm/boards/highbank/env/boot/net5
-rw-r--r--arch/arm/boards/highbank/env/boot/net-eth15
-rw-r--r--arch/arm/boards/karo-tx25/env/boot/nand-ubi5
-rw-r--r--arch/arm/boards/mx31moboard/env/boot/nor5
-rw-r--r--arch/arm/boards/mx31moboard/env/boot/sd5
-rw-r--r--arch/arm/boards/mx31moboard/env/boot/usbmsd5
-rw-r--r--arch/arm/boards/panda/env/boot/mmc5
-rw-r--r--arch/arm/boards/phytec-phycard-imx6/env/boot/nand5
-rw-r--r--arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext35
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc5
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand5
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi5
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi5
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi5
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi5
-rw-r--r--arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi5
-rw-r--r--defaultenv/defaultenv-2-base/boot/net5
-rw-r--r--defaultenv/defaultenv-2-base/data/boot-template5
-rw-r--r--defaultenv/defaultenv-2-dfu/boot/dfu5
44 files changed, 0 insertions, 220 deletions
diff --git a/arch/arm/boards/archosg9/env/boot/sd-card-android b/arch/arm/boards/archosg9/env/boot/sd-card-android
index a10a763af1..bc2df696a2 100644
--- a/arch/arm/boards/archosg9/env/boot/sd-card-android
+++ b/arch/arm/boards/archosg9/env/boot/sd-card-android
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "Android from SD card"
- exit
-fi
-
path=/mnt/sd
global.bootm.image=${path}/android
global.bootm.initrd=${path}/initramfs.cpio.lzo
diff --git a/arch/arm/boards/archosg9/env/boot/sd-card-linux b/arch/arm/boards/archosg9/env/boot/sd-card-linux
index 2ba9b9e1c2..b3eaa2437d 100644
--- a/arch/arm/boards/archosg9/env/boot/sd-card-linux
+++ b/arch/arm/boards/archosg9/env/boot/sd-card-linux
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "Linux from SD card"
- exit
-fi
-
path=/mnt/sd
global.bootm.image=${path}/zImage
initrd=${path}/initrd
diff --git a/arch/arm/boards/archosg9/env/boot/usb-android b/arch/arm/boards/archosg9/env/boot/usb-android
index a7ddabe49e..e97e0ade60 100644
--- a/arch/arm/boards/archosg9/env/boot/usb-android
+++ b/arch/arm/boards/archosg9/env/boot/usb-android
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "Android over usb"
- exit
-fi
-
path=/mnt/usb
global.bootm.image=${path}/android
global.bootm.initrd=${path}/initramfs.cpio.lzo
diff --git a/arch/arm/boards/archosg9/env/boot/usb-linux b/arch/arm/boards/archosg9/env/boot/usb-linux
index 12ae6381b2..a257138d45 100644
--- a/arch/arm/boards/archosg9/env/boot/usb-linux
+++ b/arch/arm/boards/archosg9/env/boot/usb-linux
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "Linux over usb"
- exit
-fi
-
path=/mnt/usb
global.bootm.image=${path}/zImage
initrd=${path}/initrd
diff --git a/arch/arm/boards/at91sam9m10ihd/env/boot/android b/arch/arm/boards/at91sam9m10ihd/env/boot/android
index e440f18068..8492e41f7f 100644
--- a/arch/arm/boards/at91sam9m10ihd/env/boot/android
+++ b/arch/arm/boards/at91sam9m10ihd/env/boot/android
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "android (nand)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
global.linux.bootargs.dyn.root="root=/dev/mtdblock1 rootfstype=jffs2 rw init=/init rootdelay=1"
# clean the mtdparts otherwise android does not boot
diff --git a/arch/arm/boards/at91sam9m10ihd/env/boot/mmc b/arch/arm/boards/at91sam9m10ihd/env/boot/mmc
index 89c66ee8fc..8aeace4b9e 100644
--- a/arch/arm/boards/at91sam9m10ihd/env/boot/mmc
+++ b/arch/arm/boards/at91sam9m10ihd/env/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC slot"
- exit
-fi
-
path="/mnt/mmc"
global.bootm.image="${path}/zimage"
diff --git a/arch/arm/boards/at91sam9m10ihd/env/boot/net b/arch/arm/boards/at91sam9m10ihd/env/boot/net
index cdb2520d39..7acc83122d 100644
--- a/arch/arm/boards/at91sam9m10ihd/env/boot/net
+++ b/arch/arm/boards/at91sam9m10ihd/env/boot/net
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "network (tftp, nfs) (macb)"
- exit
-fi
-
ethact eth0
path="/mnt/tftp"
diff --git a/arch/arm/boards/at91sam9m10ihd/env/boot/net-usb b/arch/arm/boards/at91sam9m10ihd/env/boot/net-usb
index 6e341a0114..7b791a9575 100644
--- a/arch/arm/boards/at91sam9m10ihd/env/boot/net-usb
+++ b/arch/arm/boards/at91sam9m10ihd/env/boot/net-usb
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "network (tftp, nfs) (usb ethernet)"
- exit
-fi
-
usb -f
ethact eth1
diff --git a/arch/arm/boards/beagle/env/boot/mmc b/arch/arm/boards/beagle/env/boot/mmc
index 58bd55742c..db638f8cf8 100644
--- a/arch/arm/boards/beagle/env/boot/mmc
+++ b/arch/arm/boards/beagle/env/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC (ext3)"
- exit
-fi
-
global.bootm.image="/boot/zImage"
#global.bootm.oftree="/boot/oftree"
global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/beagle/env/boot/nand-ubi b/arch/arm/boards/beagle/env/boot/nand-ubi
index 3037fd4ca9..e0ef904432 100644
--- a/arch/arm/boards/beagle/env/boot/nand-ubi
+++ b/arch/arm/boards/beagle/env/boot/nand-ubi
@@ -1,9 +1,4 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/beagle/env/boot/nand-ubi-dt b/arch/arm/boards/beagle/env/boot/nand-ubi-dt
index b7a1f192c1..5fc0a6c53a 100644
--- a/arch/arm/boards/beagle/env/boot/nand-ubi-dt
+++ b/arch/arm/boards/beagle/env/boot/nand-ubi-dt
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
global.bootm.oftree="/dev/nand0.oftree.bb"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
index dce060542a..aa94b2fa2e 100644
--- a/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "kernel & rootfs on SD card"
- exit
-fi
-
global.bootm.image=/boot/uImage
global.bootm.oftree=/boot/oftree
#global.bootm.initrd=<path to initrd>
diff --git a/arch/arm/boards/ccxmx51/env/boot/nand b/arch/arm/boards/ccxmx51/env/boot/nand
index bb114659ee..d53f07ec5d 100644
--- a/arch/arm/boards/ccxmx51/env/boot/nand
+++ b/arch/arm/boards/ccxmx51/env/boot/nand
@@ -1,9 +1,4 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "NAND Flash"
- exit
-fi
-
global.bootm.image="/dev/kernel"
global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro"
diff --git a/arch/arm/boards/clep7212/env/boot/nor b/arch/arm/boards/clep7212/env/boot/nor
index df8c983884..d53f07ec5d 100644
--- a/arch/arm/boards/clep7212/env/boot/nor
+++ b/arch/arm/boards/clep7212/env/boot/nor
@@ -1,9 +1,4 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "NOR Flash"
- exit
-fi
-
global.bootm.image="/dev/kernel"
global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro"
diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 b/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
index 4d830edc69..e71ad19bf7 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
+++ b/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC (ext)"
- exit
-fi
-
global.bootm.image="/mnt/disk0.2/boot/zImage-${global.hostname}"
global.bootm.oftree="/mnt/disk0.2/boot/oftree-${global.board.variant}"
global.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc b/arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc
index e311763c48..d5e202f395 100644
--- a/arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc
+++ b/arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC"
- exit
-fi
-
global.bootm.image="/mnt/mmc/zImage"
global.bootm.oftree="/mnt/mmc/oftree"
global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/delphi-poc20/env/boot/mmc b/arch/arm/boards/delphi-poc20/env/boot/mmc
index e311763c48..d5e202f395 100644
--- a/arch/arm/boards/delphi-poc20/env/boot/mmc
+++ b/arch/arm/boards/delphi-poc20/env/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC"
- exit
-fi
-
global.bootm.image="/mnt/mmc/zImage"
global.bootm.oftree="/mnt/mmc/oftree"
global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal b/arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal
index ccd0f69bb4..2233f14269 100644
--- a/arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal
+++ b/arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "internal harddisk"
- exit
-fi
-
path="/mnt/internal-hd0.0"
global.bootm.image="${path}/linuximage"
diff --git a/arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left b/arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left
index 21935c6fff..da7bc0398a 100644
--- a/arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left
+++ b/arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "left MMC slot"
- exit
-fi
-
path="/mnt/mmc-left.0"
global.bootm.image="${path}/linuximage"
diff --git a/arch/arm/boards/friendlyarm-mini2440/env/boot/nand b/arch/arm/boards/friendlyarm-mini2440/env/boot/nand
index 3037fd4ca9..e0ef904432 100644
--- a/arch/arm/boards/friendlyarm-mini2440/env/boot/nand
+++ b/arch/arm/boards/friendlyarm-mini2440/env/boot/nand
@@ -1,9 +1,4 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/guf-vincell/env/boot/nand-ubi b/arch/arm/boards/guf-vincell/env/boot/nand-ubi
index a3f748e746..510ac119b4 100644
--- a/arch/arm/boards/guf-vincell/env/boot/nand-ubi
+++ b/arch/arm/boards/guf-vincell/env/boot/nand-ubi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
bootargs-root-ubi -r root -m nand0.root
diff --git a/arch/arm/boards/highbank/env/boot/ahci b/arch/arm/boards/highbank/env/boot/ahci
index 3bdb809932..46a8c1b321 100644
--- a/arch/arm/boards/highbank/env/boot/ahci
+++ b/arch/arm/boards/highbank/env/boot/ahci
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "AHCI"
- exit
-fi
-
path="/mnt/ahci"
global.bootm.image="${path}/zImage"
diff --git a/arch/arm/boards/highbank/env/boot/ahci-boot b/arch/arm/boards/highbank/env/boot/ahci-boot
index 0064a46fcc..919eac54a7 100644
--- a/arch/arm/boards/highbank/env/boot/ahci-boot
+++ b/arch/arm/boards/highbank/env/boot/ahci-boot
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "AHCI (UEFI boot partiton)"
- exit
-fi
-
path="/mnt/ahci-boot"
global.bootm.image="${path}/zImage"
diff --git a/arch/arm/boards/highbank/env/boot/mmc b/arch/arm/boards/highbank/env/boot/mmc
index 43a04b5d6b..0fff5b4a81 100644
--- a/arch/arm/boards/highbank/env/boot/mmc
+++ b/arch/arm/boards/highbank/env/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC slot"
- exit
-fi
-
path="/mnt/mmc"
global.bootm.image="${path}/zimage"
diff --git a/arch/arm/boards/highbank/env/boot/mmc-boot b/arch/arm/boards/highbank/env/boot/mmc-boot
index 93cd99b684..f3ae301e1b 100644
--- a/arch/arm/boards/highbank/env/boot/mmc-boot
+++ b/arch/arm/boards/highbank/env/boot/mmc-boot
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC slot (UEFI boot partiton)"
- exit
-fi
-
path="/mnt/mmc-boot"
global.bootm.image="${path}/zimage"
diff --git a/arch/arm/boards/highbank/env/boot/net b/arch/arm/boards/highbank/env/boot/net
index 80862cdac1..6a700087fb 100644
--- a/arch/arm/boards/highbank/env/boot/net
+++ b/arch/arm/boards/highbank/env/boot/net
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "network (tftp, nfs) (eth0)"
- exit
-fi
-
ethact eth0
path="/mnt/tftp"
diff --git a/arch/arm/boards/highbank/env/boot/net-eth1 b/arch/arm/boards/highbank/env/boot/net-eth1
index d9e9804a02..1c70bdf3f0 100644
--- a/arch/arm/boards/highbank/env/boot/net-eth1
+++ b/arch/arm/boards/highbank/env/boot/net-eth1
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "network (tftp, nfs) (eth1)"
- exit
-fi
-
ethact eth1
path="/mnt/tftp"
diff --git a/arch/arm/boards/karo-tx25/env/boot/nand-ubi b/arch/arm/boards/karo-tx25/env/boot/nand-ubi
index 67b0cb4afe..d555a538d1 100644
--- a/arch/arm/boards/karo-tx25/env/boot/nand-ubi
+++ b/arch/arm/boards/karo-tx25/env/boot/nand-ubi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/mx31moboard/env/boot/nor b/arch/arm/boards/mx31moboard/env/boot/nor
index e36655c689..f584307d7a 100644
--- a/arch/arm/boards/mx31moboard/env/boot/nor
+++ b/arch/arm/boards/mx31moboard/env/boot/nor
@@ -1,9 +1,4 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "NOR Flash"
- exit
-fi
-
global.bootm.image="/dev/nor0.kernel"
global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro"
diff --git a/arch/arm/boards/mx31moboard/env/boot/sd b/arch/arm/boards/mx31moboard/env/boot/sd
index 16e734d807..a0c4da9e78 100644
--- a/arch/arm/boards/mx31moboard/env/boot/sd
+++ b/arch/arm/boards/mx31moboard/env/boot/sd
@@ -1,8 +1,3 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "SD Boot"
- exit
-fi
-
boot mci0
diff --git a/arch/arm/boards/mx31moboard/env/boot/usbmsd b/arch/arm/boards/mx31moboard/env/boot/usbmsd
index 6a16d3ecbf..208921da26 100644
--- a/arch/arm/boards/mx31moboard/env/boot/usbmsd
+++ b/arch/arm/boards/mx31moboard/env/boot/usbmsd
@@ -1,8 +1,3 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "USB Boot"
- exit
-fi
-
boot ehci0
diff --git a/arch/arm/boards/panda/env/boot/mmc b/arch/arm/boards/panda/env/boot/mmc
index 58bd55742c..db638f8cf8 100644
--- a/arch/arm/boards/panda/env/boot/mmc
+++ b/arch/arm/boards/panda/env/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC (ext3)"
- exit
-fi
-
global.bootm.image="/boot/zImage"
#global.bootm.oftree="/boot/oftree"
global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/phytec-phycard-imx6/env/boot/nand b/arch/arm/boards/phytec-phycard-imx6/env/boot/nand
index a51da9e340..cf3b25c11d 100644
--- a/arch/arm/boards/phytec-phycard-imx6/env/boot/nand
+++ b/arch/arm/boards/phytec-phycard-imx6/env/boot/nand
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "Kernel:nand;rootfs:nand"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
bootargs-ip
diff --git a/arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3 b/arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3
index fa1e9d68c9..443563390c 100644
--- a/arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3
+++ b/arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "MMC (ext3)"
- exit
-fi
-
global.bootm.image="/mnt/kernel/linuximage"
#global.bootm.oftree="/boot/oftree"
bootargs-ip
diff --git a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc
index 93a2357448..32854d12e5 100644
--- a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc
+++ b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "kernel & rootfs on SD card"
- exit
-fi
-
global.bootm.image=/boot/uImage
#global.bootm.oftree=/boot/oftree
global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand
index 22d657ed9d..cdfd93dce9 100644
--- a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand
+++ b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs"
diff --git a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi
index 2d10184236..7a53d84817 100644
--- a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi
+++ b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "SPI NOR Flash"
- exit
-fi
-
global.bootm.image="/dev/m25p0.kernel"
# Use rootfs form NAND for now as rootfs partition < 4MB
diff --git a/arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi
index 67b0cb4afe..d555a538d1 100644
--- a/arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi
+++ b/arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi
index 67b0cb4afe..d555a538d1 100644
--- a/arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi
+++ b/arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi
index 67b0cb4afe..d555a538d1 100644
--- a/arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi
+++ b/arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
diff --git a/arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi b/arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi
index 1987492df7..da7cbddaa7 100644
--- a/arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi
+++ b/arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "nand (UBI)"
- exit
-fi
-
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
global.linux.bootargs.dyn.root="root=ubi0:rootfs ubi.mtd=nand0.rootfs rootfstype=ubifs"
diff --git a/defaultenv/defaultenv-2-base/boot/net b/defaultenv/defaultenv-2-base/boot/net
index 05bb728fa1..ced2fadba2 100644
--- a/defaultenv/defaultenv-2-base/boot/net
+++ b/defaultenv/defaultenv-2-base/boot/net
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "network (tftp, nfs)"
- exit
-fi
-
path="/mnt/tftp"
global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
diff --git a/defaultenv/defaultenv-2-base/data/boot-template b/defaultenv/defaultenv-2-base/data/boot-template
index 9297499036..689d98e1e9 100644
--- a/defaultenv/defaultenv-2-base/data/boot-template
+++ b/defaultenv/defaultenv-2-base/data/boot-template
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "<menu text here>"
- exit
-fi
-
global.bootm.image=<path to image>
#global.bootm.oftree=<path to oftree>
#global.bootm.initrd=<path to initrd>
diff --git a/defaultenv/defaultenv-2-dfu/boot/dfu b/defaultenv/defaultenv-2-dfu/boot/dfu
index c9463b667e..682091141e 100644
--- a/defaultenv/defaultenv-2-dfu/boot/dfu
+++ b/defaultenv/defaultenv-2-dfu/boot/dfu
@@ -1,10 +1,5 @@
#!/bin/sh
-if [ "$1" = menu ]; then
- boot-menu-add-entry "$0" "Device Firmware upgrade (DFU)"
- exit
-fi
-
if [ -d /dfutmp ]; then
rm -r /dfutmp
fi