mxs: prefix register structs with 'mxs' prefix

[u-boot] / board / highbank / highbank.c

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 5f34fec45019cb4d2e0879b6a3aa6194168b45b2..f41bf05a518c1da4b2134639b67f2cfb1e33c72f 100644 (file)
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -21,6 +21,14 @@
 #include <scsi.h>
 
 #include <asm/sizes.h>
+#include <asm/io.h>
+
+#define HB_SREG_A9_PWR_REQ             0xfff3cf00
+#define HB_SREG_A9_BOOT_SRC_STAT       0xfff3cf04
+#define HB_PWR_SUSPEND                 0
+#define HB_PWR_SOFT_RESET              1
+#define HB_PWR_HARD_RESET              2
+#define HB_PWR_SHUTDOWN                        3
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -48,8 +56,20 @@ int board_eth_init(bd_t *bis)
 
 int misc_init_r(void)
 {
+       char envbuffer[16];
+       u32 boot_choice;
+
        ahci_init(0xffe08000);
        scsi_scan(1);
+
+       boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
+       sprintf(envbuffer, "bootcmd%d", boot_choice);
+       if (getenv(envbuffer)) {
+               sprintf(envbuffer, "run bootcmd%d", boot_choice);
+               setenv("bootcmd", envbuffer);
+       } else
+               setenv("bootcmd", "");
+
        return 0;
 }
 
@@ -67,4 +87,6 @@ void dram_init_banksize(void)
 
 void reset_cpu(ulong addr)
 {
+       writel(HB_PWR_HARD_RESET, HB_SREG_A9_PWR_REQ);
+       asm("   wfi");
 }