diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2015-07-20 15:17:12 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-12 20:47:37 -0400 |
| commit | 957efd4b5766e5ab68b032615c1a99f89ad01d86 (patch) | |
| tree | eea0947e6dc653e2e2721d3aa48636f26e235493 | |
| parent | 0257930ba039e3074eb7975685beb1c482a61080 (diff) | |
| download | u-boot-imx-957efd4b5766e5ab68b032615c1a99f89ad01d86.zip u-boot-imx-957efd4b5766e5ab68b032615c1a99f89ad01d86.tar.gz u-boot-imx-957efd4b5766e5ab68b032615c1a99f89ad01d86.tar.bz2 | |
sniper: OMAP3 reboot mode support
This adds support for the omap3 reboot mode mechanism and exports the reboot
mode via an environment variable, that is used in the boot command to make it
possible to boot from the recovery partition.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | board/lge/sniper/sniper.c | 18 | ||||
| -rw-r--r-- | include/configs/sniper.h | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/board/lge/sniper/sniper.c b/board/lge/sniper/sniper.c index d5318c4..44d422d 100644 --- a/board/lge/sniper/sniper.c +++ b/board/lge/sniper/sniper.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <dm.h> +#include <linux/ctype.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mem.h> @@ -67,6 +68,23 @@ int board_init(void) return 0; } +int misc_init_r(void) +{ + char reboot_mode[2] = { 0 }; + + /* Reboot mode */ + + reboot_mode[0] = omap_reboot_mode(); + if (reboot_mode[0] > 0 && isascii(reboot_mode[0])) { + if (!getenv("reboot-mode")) + setenv("reboot-mode", (char *)reboot_mode); + + omap_reboot_mode_clear(); + } + + return 0; +} + void set_muxconf_regs(void) { MUX_SNIPER(); diff --git a/include/configs/sniper.h b/include/configs/sniper.h index bf788ba..2ac9291 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -35,6 +35,7 @@ */ #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_MISC_INIT_R /* * Clocks @@ -251,6 +252,8 @@ #define CONFIG_BOOTCOMMAND \ "setenv boot_mmc_part ${kernel_mmc_part}; " \ + "if test reboot-${reboot-mode} = reboot-r; then " \ + "echo recovery; setenv boot_mmc_part ${recovery_mmc_part}; fi; " \ "part start mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_start; " \ "part size mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_size; " \ "mmc dev ${boot_mmc_dev}; " \ |