diff options
Diffstat (limited to 'arch')
48 files changed, 22 insertions, 234 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/beaglebone/defaultenv-beaglebone/config b/arch/arm/boards/beaglebone/defaultenv-beaglebone/config deleted file mode 100644 index fbfa7d5174..0000000000 --- a/arch/arm/boards/beaglebone/defaultenv-beaglebone/config +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# change network settings in /env/network/eth0 -# change mtd partition settings and automountpoints in /env/init/* - -# set to false if you do not want to have colors -global.allow_color=true - -# user (used for network filenames) -global.user=none - -# timeout in seconds before the default boot entry is started -global.autoboot_timeout=3 - -# default boot entry (one of /env/boot/*) -global.boot.default=sd - -# base bootargs -global.linux.bootargs.base="console=ttyO0,115200n8" diff --git a/arch/arm/boards/beaglebone/defaultenv-beaglebone/init/usb-limit-1300 b/arch/arm/boards/beaglebone/defaultenv-beaglebone/init/usb-limit-1300 new file mode 100644 index 0000000000..56313bfdfb --- /dev/null +++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/init/usb-limit-1300 @@ -0,0 +1,5 @@ +#!/bin/sh + +echo -n "changing USB current limit to 1300 mA... " +i2c_write -b 0 -a 0x24 -r 0x01 0x3e +echo "done" 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/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c index 9f13fac6dd..6348692cb1 100644 --- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c +++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c @@ -70,7 +70,7 @@ mem_initcall(mx23_evk_mem_init); * If this SD card is also the boot media, we can use the second partition * for our environment purpose (if present!). */ -static int register_persistant_environment(void) +static int register_persistent_environment(void) { struct cdev *cdev; @@ -116,9 +116,9 @@ static int mx23_evk_devices_init(void) add_generic_device("mxs_mci", DEVICE_ID_DYNAMIC, NULL, IMX_SSP1_BASE, 0x8000, IORESOURCE_MEM, &mci_pdata); - rc = register_persistant_environment(); + rc = register_persistent_environment(); if (rc != 0) - printf("Cannot create the 'env0' persistant " + printf("Cannot create the 'env0' persistent " "environment storage (%d)\n", rc); #ifdef CONFIG_USB_GADGET_DRIVER_ARC 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/defaultenv-pcm038/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nand-ubi index 67b0cb4afe..d555a538d1 100644 --- a/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nand-ubi +++ b/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/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/arch/ppc/mach-mpc5xxx/include/mach/sdma.h b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h index 5e7ff5fffa..6a25d79fb6 100644 --- a/arch/ppc/mach-mpc5xxx/include/mach/sdma.h +++ b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h @@ -82,11 +82,11 @@ ALL PARAMETERS ARE ALL LONGWORDS (FOUR BYTES EACH). sdma->IntPend = (1 << tasknum); \ } -/* get interupt pending bit of a task */ +/* get interrupt pending bit of a task */ #define SDMA_GET_PENDINGBIT(tasknum) \ ((*(vu_long *)(MPC5XXX_SDMA + 0x14)) & (1<<(tasknum))) -/* get interupt mask bit of a task */ +/* get interrupt mask bit of a task */ #define SDMA_GET_MASKBIT(tasknum) \ ((*(vu_long *)(MPC5XXX_SDMA + 0x18)) & (1<<(tasknum))) diff --git a/arch/sandbox/include/asm/bitops.h b/arch/sandbox/include/asm/bitops.h index 94646d4d0d..447023da63 100644 --- a/arch/sandbox/include/asm/bitops.h +++ b/arch/sandbox/include/asm/bitops.h @@ -12,4 +12,11 @@ #include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/ops.h> +#define set_bit(x, y) __set_bit(x, y) +#define clear_bit(x, y) __clear_bit(x, y) +#define change_bit(x, y) __change_bit(x, y) +#define test_and_set_bit(x, y) __test_and_set_bit(x, y) +#define test_and_clear_bit(x, y) __test_and_clear_bit(x, y) +#define test_and_change_bit(x, y) __test_and_change_bit(x, y) + #endif diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S index 05d0f778e5..6cf6b10d1b 100644 --- a/arch/x86/lib/barebox.lds.S +++ b/arch/x86/lib/barebox.lds.S @@ -85,7 +85,7 @@ SECTIONS boot_disk = .; BYTE(0x00); /* boot disk number (provided by the BIOS) - /* information about the persistant environment storage */ + /* information about the persistent environment storage */ . = PATCH_AREA + PATCH_AREA_PERS_START; pers_env_storage = .; LONG(0x00000000); /* LBA start lower */ diff --git a/arch/x86/mach-i386/include/mach/barebox.lds.h b/arch/x86/mach-i386/include/mach/barebox.lds.h index 12eeeacd63..f6f6346398 100644 --- a/arch/x86/mach-i386/include/mach/barebox.lds.h +++ b/arch/x86/mach-i386/include/mach/barebox.lds.h @@ -31,27 +31,27 @@ #define PATCH_AREA_BOOT_DEV 16 /** - * Offset where to store information about the persistant environment storage + * Offset where to store information about the persistent environment storage * It points to an LBA number (8 bytes) and defines the first sector of this * storage on disk. */ #define PATCH_AREA_PERS_START 20 /** - * Offset where to store information about the persistant environment storage + * Offset where to store information about the persistent environment storage * It points to a short number (2 bytes) and defines the sector count of this * storage on disk. */ #define PATCH_AREA_PERS_SIZE 28 /** - * Offset where to store information about the persistant environment storage + * Offset where to store information about the persistent environment storage * drive number (BIOS number, 1 byte) */ #define PATCH_AREA_PERS_DRIVE 30 /** - * Mark the persistant environment as not used + * Mark the persistent environment as not used */ #define PATCH_AREA_PERS_SIZE_UNUSED 0x000 |