BeagleBoard: Remove userbutton command and use gpio command instead

Remove userbutton command and do the detection in board config file using the gpio command

Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
Signed-off-by: Jason Kridner <jkridner@beagleboard.org>

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 8b07eef551ff52ec713e3f804310304b1d35b2bc..e26b38793474bf073c455d472eabf26c22a67c9f 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -507,58 +507,3 @@ int ehci_hcd_stop(void)
 }
 
 #endif /* CONFIG_USB_EHCI */
-
-#ifndef CONFIG_SPL_BUILD
-/*
- * This command returns the status of the user button on beagle xM
- * Input - none
- * Returns -   1 if button is held down
- *             0 if button is not held down
- */
-int do_userbutton(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       int     button = 0;
-       int     gpio;
-
-       /*
-        * pass address parameter as argv[0] (aka command name),
-        * and all remaining args
-        */
-       switch (get_board_revision()) {
-       case REVISION_AXBX:
-       case REVISION_CX:
-       case REVISION_C4:
-               gpio = 7;
-               break;
-       case REVISION_XM_A:
-       case REVISION_XM_B:
-       case REVISION_XM_C:
-       default:
-               gpio = 4;
-               break;
-       }
-       gpio_request(gpio, "");
-       gpio_direction_input(gpio);
-       printf("The user button is currently ");
-       if (gpio_get_value(gpio))
-       {
-               button = 1;
-               printf("PRESSED.\n");
-       }
-       else
-       {
-               button = 0;
-               printf("NOT pressed.\n");
-       }
-
-       return !button;
-}
-
-/* -------------------------------------------------------------------- */
-
-U_BOOT_CMD(
-       userbutton, CONFIG_SYS_MAXARGS, 1,      do_userbutton,
-       "Return the status of the BeagleBoard USER button",
-       ""
-);
-#endif

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index d3a0122a09a6a613604434a4f137a21e44d0621a..ddeb4146f756cc096432efe75a7c7501d7177eec 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -167,6 +167,7 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SETEXPR     /* Evaluate expressions         */
+#define CONFIG_CMD_GPIO     /* Enable gpio command */
 
 #undef CONFIG_CMD_FLASH                /* flinfo, erase, protect       */
 #undef CONFIG_CMD_FPGA         /* FPGA configuration Support   */
@@ -280,10 +281,16 @@
        "ramboot=echo Booting from ramdisk ...; " \
                "run ramargs; " \
                "bootm ${loadaddr}\0" \
-
+       "userbutton=if gpio input 173; then run userbutton_xm; " \
+               "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 */
 #define CONFIG_BOOTCOMMAND \
        "if mmc rescan ${mmcdev}; then " \
-               "if userbutton; then " \
+               "if run userbutton; then " \
+                       "setenv bootenv uEnv.txt;" \
+               "else " \
                        "setenv bootenv user.txt;" \
                "fi;" \
                "echo SD/MMC found on device ${mmcdev};" \