rockchip: add boot-mode support for rk3288, rk3036

[oweals/u-boot.git] / board / rockchip / kylin_rk3036 / kylin_rk3036.c

diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c
index 848f23d1a6a3e16cacb559c9e7a136d4838b8fe7..7e2edf4a566a3f3dd4a7b6d275cb65551982e3ca 100644 (file)
--- a/board/rockchip/kylin_rk3036/kylin_rk3036.c
+++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c
@@ -8,14 +8,11 @@
 #include <dm.h>
 #include <asm/io.h>
 #include <asm/arch/uart.h>
-#include <asm/arch-rockchip/grf_rk3036.h>
 #include <asm/arch/sdram_rk3036.h>
 #include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define GRF_BASE       0x20008000
-
 void get_ddr_config(struct rk3036_ddr_config *config)
 {
        /* K4B4G1646Q config */
@@ -43,16 +40,9 @@ int fastboot_key_pressed(void)
 
 #define ROCKCHIP_BOOT_MODE_FASTBOOT    0x5242C309
 
-int board_late_init(void)
+int rk_board_late_init(void)
 {
-       struct rk3036_grf * const grf = (void *)GRF_BASE;
-       int boot_mode = readl(&grf->os_reg[4]);
-
-       /* Clear boot mode */
-       writel(0, &grf->os_reg[4]);
-
-       if (boot_mode == ROCKCHIP_BOOT_MODE_FASTBOOT ||
-           fastboot_key_pressed()) {
+       if (fastboot_key_pressed()) {
                printf("enter fastboot!\n");
                setenv("preboot", "setenv preboot; fastboot usb0");
        }