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/efika-mx-smartbook | |
| 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/efika-mx-smartbook')
| -rw-r--r-- | arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal | 5 | ||||
| -rw-r--r-- | arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left | 5 |
2 files changed, 0 insertions, 10 deletions
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" |