From b3a667cd841802074f5d97453c4ba6364c706c27 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 19 Jun 2014 11:57:45 +0200 Subject: [PATCH] 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 --- arch/arm/boards/archosg9/env/boot/sd-card-android | 5 ----- arch/arm/boards/archosg9/env/boot/sd-card-linux | 5 ----- arch/arm/boards/archosg9/env/boot/usb-android | 5 ----- arch/arm/boards/archosg9/env/boot/usb-linux | 5 ----- arch/arm/boards/at91sam9m10ihd/env/boot/android | 5 ----- arch/arm/boards/at91sam9m10ihd/env/boot/mmc | 5 ----- arch/arm/boards/at91sam9m10ihd/env/boot/net | 5 ----- arch/arm/boards/at91sam9m10ihd/env/boot/net-usb | 5 ----- arch/arm/boards/beagle/env/boot/mmc | 5 ----- arch/arm/boards/beagle/env/boot/nand-ubi | 5 ----- arch/arm/boards/beagle/env/boot/nand-ubi-dt | 5 ----- arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd | 5 ----- arch/arm/boards/ccxmx51/env/boot/nand | 5 ----- arch/arm/boards/clep7212/env/boot/nor | 5 ----- arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 | 5 ----- arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc | 5 ----- arch/arm/boards/delphi-poc20/env/boot/mmc | 5 ----- arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal | 5 ----- arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left | 5 ----- arch/arm/boards/friendlyarm-mini2440/env/boot/nand | 5 ----- arch/arm/boards/guf-vincell/env/boot/nand-ubi | 5 ----- arch/arm/boards/highbank/env/boot/ahci | 5 ----- arch/arm/boards/highbank/env/boot/ahci-boot | 5 ----- arch/arm/boards/highbank/env/boot/mmc | 5 ----- arch/arm/boards/highbank/env/boot/mmc-boot | 5 ----- arch/arm/boards/highbank/env/boot/net | 5 ----- arch/arm/boards/highbank/env/boot/net-eth1 | 5 ----- arch/arm/boards/karo-tx25/env/boot/nand-ubi | 5 ----- arch/arm/boards/mx31moboard/env/boot/nor | 5 ----- arch/arm/boards/mx31moboard/env/boot/sd | 5 ----- arch/arm/boards/mx31moboard/env/boot/usbmsd | 5 ----- arch/arm/boards/panda/env/boot/mmc | 5 ----- arch/arm/boards/phytec-phycard-imx6/env/boot/nand | 5 ----- arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3 | 5 ----- .../phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc | 5 ----- .../defaultenv-phycore-am335x/boot/nand | 5 ----- .../phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi | 5 ----- arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi | 5 ----- arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi | 5 ----- arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi | 5 ----- arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi | 5 ----- defaultenv/defaultenv-2-base/boot/net | 5 ----- defaultenv/defaultenv-2-base/data/boot-template | 5 ----- defaultenv/defaultenv-2-dfu/boot/dfu | 5 ----- 44 files changed, 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 a10a763af..bc2df696a 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 2ba9b9e1c..b3eaa2437 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 a7ddabe49..e97e0ade6 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 12ae6381b..a257138d4 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 e440f1806..8492e41f7 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 89c66ee8f..8aeace4b9 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 cdb2520d3..7acc83122 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 6e341a011..7b791a957 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 58bd55742..db638f8cf 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 3037fd4ca..e0ef90443 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 b7a1f192c..5fc0a6c53 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 dce060542..aa94b2fa2 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= diff --git a/arch/arm/boards/ccxmx51/env/boot/nand b/arch/arm/boards/ccxmx51/env/boot/nand index bb114659e..d53f07ec5 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 df8c98388..d53f07ec5 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 4d830edc6..e71ad19bf 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 e311763c4..d5e202f39 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 e311763c4..d5e202f39 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 ccd0f69bb..2233f1426 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 21935c6ff..da7bc0398 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 3037fd4ca..e0ef90443 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 a3f748e74..510ac119b 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 3bdb80993..46a8c1b32 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 0064a46fc..919eac54a 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 43a04b5d6..0fff5b4a8 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 93cd99b68..f3ae301e1 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 80862cdac..6a700087f 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 d9e9804a0..1c70bdf3f 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 67b0cb4af..d555a538d 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 e36655c68..f584307d7 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 16e734d80..a0c4da9e7 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 6a16d3ecb..208921da2 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 58bd55742..db638f8cf 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 a51da9e34..cf3b25c11 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 fa1e9d68c..443563390 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 93a235744..32854d12e 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 22d657ed9..cdfd93dce 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 2d1018423..7a53d8481 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 67b0cb4af..d555a538d 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 67b0cb4af..d555a538d 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 67b0cb4af..d555a538d 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 1987492df..da7cbddaa 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 05bb728fa..ced2fadba 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 929749903..689d98e1e 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" "" - exit -fi - global.bootm.image= #global.bootm.oftree= #global.bootm.initrd= diff --git a/defaultenv/defaultenv-2-dfu/boot/dfu b/defaultenv/defaultenv-2-dfu/boot/dfu index c9463b667..682091141 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