command: Remove the cmd_tbl_t typedef

[platform/kernel/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 2a25871..0ca91cd 100644 (file)
--- a/board/rockchip/kylin_rk3036/kylin_rk3036.c
+++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c
@@ -1,21 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
+#include <env.h>
+#include <init.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/arch-rockchip/uart.h>
+#include <asm/arch-rockchip/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,39 +39,12 @@ 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");
+               env_set("preboot", "setenv preboot; fastboot usb0");
        }
 
        return 0;
 }
-
-int board_init(void)
-{
-       return 0;
-}
-
-int dram_init(void)
-{
-       gd->ram_size = sdram_size();
-
-       return 0;
-}
-
-#ifndef CONFIG_SYS_DCACHE_OFF
-void enable_caches(void)
-{
-       /* Enable D-cache. I-cache is already enabled in start.S */
-       dcache_enable();
-}
-#endif