diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
| commit | efa4d684d8927428d333f841e37adeedcfe61cfb (patch) | |
| tree | 5c780a94fdfa9557da018a485d7fe884244aaf48 /arch/arm/boards/phytec-phycard-imx6 | |
| parent | 45d593bc5ec78e26e3a967517ed7a51f27c8b91f (diff) | |
| parent | 10d63913999fbd5c02a2a8daecf877c24663bdca (diff) | |
| download | barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.gz barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
arch/arm/boards/chumby_falconwing/falconwing.c
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
arch/x86/mach-x86.dox
scripts/setupmbr/setupmbr.c
Diffstat (limited to 'arch/arm/boards/phytec-phycard-imx6')
| -rw-r--r-- | arch/arm/boards/phytec-phycard-imx6/env/boot/nand | 5 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3 | 5 |
2 files changed, 0 insertions, 10 deletions
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 |