summaryrefslogtreecommitdiff
path: root/include/configs/omap3_beagle.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-08 13:15:45 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-08 13:15:45 +0100
commit79f38777947ac7685e2cef8bd977f954ab198c0e (patch)
tree6fe053ef751b1c424ec50be338844197b6421d74 /include/configs/omap3_beagle.h
parent96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff)
parent9bd5c1ad0db802c9f8d49d72b443f03431cf6a89 (diff)
downloadu-boot-imx-79f38777947ac7685e2cef8bd977f954ab198c0e.zip
u-boot-imx-79f38777947ac7685e2cef8bd977f954ab198c0e.tar.gz
u-boot-imx-79f38777947ac7685e2cef8bd977f954ab198c0e.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
This required manual merging drivers/mtd/nand/Makefile and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
Diffstat (limited to 'include/configs/omap3_beagle.h')
-rw-r--r--include/configs/omap3_beagle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 12d65f2..d0daa45 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -285,7 +285,7 @@
"else run userbutton_nonxm; fi;\0" \
"userbutton_xm=gpio input 4;\0" \
"userbutton_nonxm=gpio input 7;\0"
-/* "run userbutton" will return 1 (false) if is pressed and 0 (false) if not */
+/* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"if run userbutton; then " \