summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/amazon/kc1/kc1.c18
-rw-r--r--board/amazon/kc1/kc1.h2
2 files changed, 20 insertions, 0 deletions
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 29d9c648c7..d526695b7c 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -85,6 +85,19 @@ int board_init(void)
int misc_init_r(void)
{
+ char reboot_mode[2] = { 0 };
+
+ /* Reboot mode */
+
+ omap_reboot_mode(reboot_mode, sizeof(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();
+ }
+
/* Serial number */
omap_die_id_serial();
@@ -123,6 +136,11 @@ void get_board_serial(struct tag_serialnr *serialnr)
omap_die_id_get_board_serial(serialnr);
}
+int fb_set_reboot_flag(void)
+{
+ return omap_reboot_mode_store("b");
+}
+
#ifndef CONFIG_SPL_BUILD
int board_mmc_init(bd_t *bis)
{
diff --git a/board/amazon/kc1/kc1.h b/board/amazon/kc1/kc1.h
index 67d008f05d..14737d7403 100644
--- a/board/amazon/kc1/kc1.h
+++ b/board/amazon/kc1/kc1.h
@@ -11,6 +11,7 @@
#include <asm/arch/mux_omap4.h>
+#define KC1_GPIO_USB_ID 52
#define KC1_GPIO_MBID1 173
#define KC1_GPIO_MBID0 174
#define KC1_GPIO_MBID3 177
@@ -28,6 +29,7 @@ const struct pad_conf_entry core_padconf_array[] = {
{ GPMC_AD7, (IEN | PTU | M1) }, /* sdmmc2_dat7 */
{ GPMC_NOE, (IEN | PTU | M1) }, /* sdmmc2_clk */
{ GPMC_NWE, (IEN | PTU | M1) }, /* sdmmc2_cmd */
+ { GPMC_NCS2, (IEN | PTD | M3) }, /* gpio_52 */
/* CAM */
{ CAM_SHUTTER, (IDIS | DIS | M7) }, /* safe_mode */
{ CAM_STROBE, (IDIS | DIS | M7) }, /* safe_mode */
OpenPOWER on IntegriCloud