diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-28 15:12:03 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 15:12:03 (GMT) |
| commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
| tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /board/freescale/mx6sabresd/mx6sabresd.c | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
| download | u-boot-fsl-qoriq-4f892924d238cc415891dbea336a0fdaff2f853b.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to 'board/freescale/mx6sabresd/mx6sabresd.c')
| -rw-r--r-- | board/freescale/mx6sabresd/mx6sabresd.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index e58c03c..2b6d7be 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -57,6 +57,8 @@ DECLARE_GLOBAL_DATA_PTR; #define DISP0_PWR_EN IMX_GPIO_NR(1, 21) +#define KEY_VOL_UP IMX_GPIO_NR(1, 4) + int dram_init(void) { gd->ram_size = imx_ddr_size(); @@ -682,6 +684,16 @@ int checkboard(void) #include <spl.h> #include <libfdt.h> +#ifdef CONFIG_SPL_OS_BOOT +int spl_start_uboot(void) +{ + gpio_direction_input(KEY_VOL_UP); + + /* Only enter in Falcon mode if KEY_VOL_UP is pressed */ + return gpio_get_value(KEY_VOL_UP); +} +#endif + static void ccgr_init(void) { struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; |