Skip to contentSkip to conversation

board: move all the rockchip board in one folder

PATCH New Kever Yang 4 participants 7 messages Jul 8, 2016 – Jul 11, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Rockchip
lore
Share & tools
lore

Kever Yang

author
#0 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
---
 arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
 board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
 board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
 board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
 board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
 board/kylin/kylin_rk3036/Kconfig           | 15 ------
 board/kylin/kylin_rk3036/MAINTAINERS       |  0
 board/kylin/kylin_rk3036/Makefile          |  7 ---
 board/kylin/kylin_rk3036/kylin_rk3036.c    | 81 ------------------------------
 board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
 board/rockchip/evb_rk3036/MAINTAINERS      |  0
 board/rockchip/evb_rk3036/Makefile         |  7 +++
 board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
 board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
 board/rockchip/kylin_rk3036/MAINTAINERS    |  0
 board/rockchip/kylin_rk3036/Makefile       |  7 +++
 board/rockchip/kylin_rk3036/kylin_rk3036.c | 81 ++++++++++++++++++++++++++++++
 17 files changed, 176 insertions(+), 176 deletions(-)
 delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig
 delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS
 delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile
 delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c
 delete mode 100644 board/kylin/kylin_rk3036/Kconfig
 delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS
 delete mode 100644 board/kylin/kylin_rk3036/Makefile
 delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c
 create mode 100644 board/rockchip/evb_rk3036/Kconfig
 create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/evb_rk3036/Makefile
 create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c
 create mode 100644 board/rockchip/kylin_rk3036/Kconfig
 create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/kylin_rk3036/Makefile
 create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c
arch/arm/mach-rockchip/rk3036/Kconfig +2 -2
index cc03808..f7562bd 100644
@@ -15,7 +15,7 @@ config SYS_MALLOC_F_LEN
 config ROCKCHIP_COMMON
 	bool "Support rk common fuction"
 
-source "board/evb_rk3036/evb_rk3036/Kconfig"
-source "board/kylin/kylin_rk3036/Kconfig"
+source "board/rockchip/evb_rk3036/Kconfig"
+source "board/rockchip/kylin_rk3036/Kconfig"
 
 endif
board/evb_rk3036/evb_rk3036/Kconfig deleted +0 -15
deleted file mode 100644
index ae2a9eb..0000000
@@ -1,15 +0,0 @@
-if TARGET_EVB_RK3036
-
-config SYS_BOARD
-	default "evb_rk3036"
-
-config SYS_VENDOR
-	default "evb_rk3036"
-
-config SYS_CONFIG_NAME
-	default "evb_rk3036"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
-
-endif
board/evb_rk3036/evb_rk3036/MAINTAINERS deleted +0 -0
deleted file mode 100644
index e69de29..0000000
board/evb_rk3036/evb_rk3036/Makefile deleted +0 -7
deleted file mode 100644
index 0403836..0000000
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y	+= evb_rk3036.o
board/evb_rk3036/evb_rk3036/evb_rk3036.c deleted +0 -49

49 lines not on this page · raw message

board/kylin/kylin_rk3036/Kconfig deleted +0 -15
deleted file mode 100644
index 5d75c1f..0000000
@@ -1,15 +0,0 @@
-if TARGET_KYLIN_RK3036
-
-config SYS_BOARD
-	default "kylin_rk3036"
-
-config SYS_VENDOR
-	default "kylin"
-
-config SYS_CONFIG_NAME
-	default "kylin_rk3036"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
-
-endif
board/kylin/kylin_rk3036/MAINTAINERS deleted +0 -0
deleted file mode 100644
index e69de29..0000000
board/kylin/kylin_rk3036/Makefile deleted +0 -7
deleted file mode 100644
index 0663270..0000000
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y	+= kylin_rk3036.o
board/kylin/kylin_rk3036/kylin_rk3036.c deleted +0 -81

81 lines not on this page · raw message

board/rockchip/evb_rk3036/Kconfig new file +15 -0
new file mode 100644
index 0000000..ef45f62
@@ -0,0 +1,15 @@
+if TARGET_EVB_RK3036
+
+config SYS_BOARD
+	default "evb_rk3036"
+
+config SYS_VENDOR
+	default "rockchip"
+
+config SYS_CONFIG_NAME
+	default "evb_rk3036"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
board/rockchip/evb_rk3036/MAINTAINERS new file +0 -0
new file mode 100644
index 0000000..e69de29
board/rockchip/evb_rk3036/Makefile new file +7 -0
new file mode 100644
index 0000000..0403836
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y	+= evb_rk3036.o
board/rockchip/evb_rk3036/evb_rk3036.c new file +49 -0

49 lines not on this page · raw message

board/rockchip/kylin_rk3036/Kconfig new file +15 -0
new file mode 100644
index 0000000..8d35b4e
@@ -0,0 +1,15 @@
+if TARGET_KYLIN_RK3036
+
+config SYS_BOARD
+	default "kylin_rk3036"
+
+config SYS_VENDOR
+	default "rockchip"
+
+config SYS_CONFIG_NAME
+	default "kylin_rk3036"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
board/rockchip/kylin_rk3036/MAINTAINERS new file +0 -0
new file mode 100644
index 0000000..e69de29
board/rockchip/kylin_rk3036/Makefile new file +7 -0
new file mode 100644
index 0000000..0663270
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y	+= kylin_rk3036.o
board/rockchip/kylin_rk3036/kylin_rk3036.c new file +81 -0

81 lines not on this page · raw message

Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

2016-07-08 11:30 GMT+08:00 Kever Yang <[email protected]>:

Quoted 7 lines

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
Reviewed-by Eddie Cai <[email protected]>
Quoted 490 lines
---
 arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
 board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
 board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
 board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
 board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
 board/kylin/kylin_rk3036/Kconfig           | 15 ------
 board/kylin/kylin_rk3036/MAINTAINERS       |  0
 board/kylin/kylin_rk3036/Makefile          |  7 ---
 board/kylin/kylin_rk3036/kylin_rk3036.c    | 81 ------------------------------
 board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
 board/rockchip/evb_rk3036/MAINTAINERS      |  0
 board/rockchip/evb_rk3036/Makefile         |  7 +++
 board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
 board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
 board/rockchip/kylin_rk3036/MAINTAINERS    |  0
 board/rockchip/kylin_rk3036/Makefile       |  7 +++
 board/rockchip/kylin_rk3036/kylin_rk3036.c | 81 ++++++++++++++++++++++++++++++
 17 files changed, 176 insertions(+), 176 deletions(-)
 delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig
 delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS
 delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile
 delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c
 delete mode 100644 board/kylin/kylin_rk3036/Kconfig
 delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS
 delete mode 100644 board/kylin/kylin_rk3036/Makefile
 delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c
 create mode 100644 board/rockchip/evb_rk3036/Kconfig
 create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/evb_rk3036/Makefile
 create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c
 create mode 100644 board/rockchip/kylin_rk3036/Kconfig
 create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/kylin_rk3036/Makefile
 create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c
arch/arm/mach-rockchip/rk3036/Kconfig +2 -2
index cc03808..f7562bd 100644
@@ -15,7 +15,7 @@ config SYS_MALLOC_F_LEN
 config ROCKCHIP_COMMON
        bool "Support rk common fuction"
 
-source "board/evb_rk3036/evb_rk3036/Kconfig"
-source "board/kylin/kylin_rk3036/Kconfig"
+source "board/rockchip/evb_rk3036/Kconfig"
+source "board/rockchip/kylin_rk3036/Kconfig"
 
 endif
board/evb_rk3036/evb_rk3036/Kconfig deleted +0 -15
deleted file mode 100644
index ae2a9eb..0000000
@@ -1,15 +0,0 @@
-if TARGET_EVB_RK3036
-
-config SYS_BOARD
-       default "evb_rk3036"
-
-config SYS_VENDOR
-       default "evb_rk3036"
-
-config SYS_CONFIG_NAME
-       default "evb_rk3036"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-       def_bool y
-
-endif
board/evb_rk3036/evb_rk3036/MAINTAINERS deleted +0 -0
deleted file mode 100644
index e69de29..0000000
board/evb_rk3036/evb_rk3036/Makefile deleted +0 -7
deleted file mode 100644
index 0403836..0000000
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  += evb_rk3036.o
board/evb_rk3036/evb_rk3036/evb_rk3036.c deleted +0 -49
deleted file mode 100644
index f5758b1..0000000
@@ -1,49 +0,0 @@
-/*
- * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <asm/io.h>
-#include <asm/arch/uart.h>
-#include <asm/arch/sdram_rk3036.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void get_ddr_config(struct rk3036_ddr_config *config)
-{
-       /* K4B4G1646Q config */
-       config->ddr_type = 3;
-       config->rank = 2;
-       config->cs0_row = 15;
-       config->cs1_row = 15;
-
-       /* 8bank */
-       config->bank = 3;
-       config->col = 10;
-
-       /* 16bit bw */
-       config->bw = 1;
-}
-
-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
board/kylin/kylin_rk3036/Kconfig deleted +0 -15
deleted file mode 100644
index 5d75c1f..0000000
@@ -1,15 +0,0 @@
-if TARGET_KYLIN_RK3036
-
-config SYS_BOARD
-       default "kylin_rk3036"
-
-config SYS_VENDOR
-       default "kylin"
-
-config SYS_CONFIG_NAME
-       default "kylin_rk3036"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-       def_bool y
-
-endif
board/kylin/kylin_rk3036/MAINTAINERS deleted +0 -0
deleted file mode 100644
index e69de29..0000000
board/kylin/kylin_rk3036/Makefile deleted +0 -7
deleted file mode 100644
index 0663270..0000000
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  += kylin_rk3036.o
board/kylin/kylin_rk3036/kylin_rk3036.c deleted +0 -81
deleted file mode 100644
index 2a25871..0000000
@@ -1,81 +0,0 @@
-/*
- * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#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 */
-       config->ddr_type = 3;
-       config->rank = 1;
-       config->cs0_row = 15;
-       config->cs1_row = 15;
-
-       /* 8bank */
-       config->bank = 3;
-       config->col = 10;
-
-       /* 16bit bw */
-       config->bw = 1;
-}
-
-#define FASTBOOT_KEY_GPIO 93
-
-int fastboot_key_pressed(void)
-{
-       gpio_request(FASTBOOT_KEY_GPIO, "fastboot_key");
-       gpio_direction_input(FASTBOOT_KEY_GPIO);
-       return !gpio_get_value(FASTBOOT_KEY_GPIO);
-}
-
-#define ROCKCHIP_BOOT_MODE_FASTBOOT    0x5242C309
-
-int 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()) {
-               printf("enter fastboot!\n");
-               setenv("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
board/rockchip/evb_rk3036/Kconfig new file +15 -0
new file mode 100644
index 0000000..ef45f62
@@ -0,0 +1,15 @@
+if TARGET_EVB_RK3036
+
+config SYS_BOARD
+       default "evb_rk3036"
+
+config SYS_VENDOR
+       default "rockchip"
+
+config SYS_CONFIG_NAME
+       default "evb_rk3036"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+       def_bool y
+
+endif
board/rockchip/evb_rk3036/MAINTAINERS new file +0 -0
new file mode 100644
index 0000000..e69de29
board/rockchip/evb_rk3036/Makefile new file +7 -0
new file mode 100644
index 0000000..0403836
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y  += evb_rk3036.o
board/rockchip/evb_rk3036/evb_rk3036.c new file +49 -0
new file mode 100644
index 0000000..f5758b1
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2015 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <asm/io.h>
+#include <asm/arch/uart.h>
+#include <asm/arch/sdram_rk3036.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void get_ddr_config(struct rk3036_ddr_config *config)
+{
+       /* K4B4G1646Q config */
+       config->ddr_type = 3;
+       config->rank = 2;
+       config->cs0_row = 15;
+       config->cs1_row = 15;
+
+       /* 8bank */
+       config->bank = 3;
+       config->col = 10;
+
+       /* 16bit bw */
+       config->bw = 1;
+}
+
+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
board/rockchip/kylin_rk3036/Kconfig new file +15 -0
new file mode 100644
index 0000000..8d35b4e
@@ -0,0 +1,15 @@
+if TARGET_KYLIN_RK3036
+
+config SYS_BOARD
+       default "kylin_rk3036"
+
+config SYS_VENDOR
+       default "rockchip"
+
+config SYS_CONFIG_NAME
+       default "kylin_rk3036"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+       def_bool y
+
+endif
board/rockchip/kylin_rk3036/MAINTAINERS new file +0 -0
new file mode 100644
index 0000000..e69de29
board/rockchip/kylin_rk3036/Makefile new file +7 -0
new file mode 100644
index 0000000..0663270
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y  += kylin_rk3036.o
board/rockchip/kylin_rk3036/kylin_rk3036.c new file +81 -1
new file mode 100644
index 0000000..2a25871
@@ -0,0 +1,81 @@
+/*
+ * (C) Copyright 2015 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#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 */
+       config->ddr_type = 3;
+       config->rank = 1;
+       config->cs0_row = 15;
+       config->cs1_row = 15;
+
+       /* 8bank */
+       config->bank = 3;
+       config->col = 10;
+
+       /* 16bit bw */
+       config->bw = 1;
+}
+
+#define FASTBOOT_KEY_GPIO 93
+
+int fastboot_key_pressed(void)
+{
+       gpio_request(FASTBOOT_KEY_GPIO, "fastboot_key");
+       gpio_direction_input(FASTBOOT_KEY_GPIO);
+       return !gpio_get_value(FASTBOOT_KEY_GPIO);
+}
+
+#define ROCKCHIP_BOOT_MODE_FASTBOOT    0x5242C309
+
+int 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()) {
+               printf("enter fastboot!\n");
+               setenv("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
--

1.9.1

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#2 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

Hi Kevin,

Quoted 44 lines · Eddie Cai

2016-07-08 11:30 GMT+08:00 Kever Yang <[email protected]>:

Quoted 7 lines

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
Reviewed-by Eddie Cai <[email protected]>
Quoted 35 lines
---
 arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
 board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
 board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
 board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
 board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
 board/kylin/kylin_rk3036/Kconfig           | 15 ------
 board/kylin/kylin_rk3036/MAINTAINERS       |  0
 board/kylin/kylin_rk3036/Makefile          |  7 ---
 board/kylin/kylin_rk3036/kylin_rk3036.c    | 81 ------------------------------
 board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
 board/rockchip/evb_rk3036/MAINTAINERS      |  0
 board/rockchip/evb_rk3036/Makefile         |  7 +++
 board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
 board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
 board/rockchip/kylin_rk3036/MAINTAINERS    |  0
 board/rockchip/kylin_rk3036/Makefile       |  7 +++
 board/rockchip/kylin_rk3036/kylin_rk3036.c | 81 ++++++++++++++++++++++++++++++
 17 files changed, 176 insertions(+), 176 deletions(-)
 delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig
 delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS
 delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile
 delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c
 delete mode 100644 board/kylin/kylin_rk3036/Kconfig
 delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS
 delete mode 100644 board/kylin/kylin_rk3036/Makefile
 delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c
 create mode 100644 board/rockchip/evb_rk3036/Kconfig
 create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/evb_rk3036/Makefile
 create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c
 create mode 100644 board/rockchip/kylin_rk3036/Kconfig
 create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/kylin_rk3036/Makefile
 create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c

Did you use patman for these? I think it should show these as renames rather than delete/add deltas.

Regards,
Simon

author
#3 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

Hi Simon,

Quoted 47 lines · Simon Glass

Hi Kevin,

Quoted 44 lines · Eddie Cai

2016-07-08 11:30 GMT+08:00 Kever Yang <[email protected]>:

Quoted 7 lines

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
Reviewed-by Eddie Cai <[email protected]>
Quoted 35 lines
---
  arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
  board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
  board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
  board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
  board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
  board/kylin/kylin_rk3036/Kconfig           | 15 ------
  board/kylin/kylin_rk3036/MAINTAINERS       |  0
  board/kylin/kylin_rk3036/Makefile          |  7 ---
  board/kylin/kylin_rk3036/kylin_rk3036.c    | 81 ------------------------------
  board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
  board/rockchip/evb_rk3036/MAINTAINERS      |  0
  board/rockchip/evb_rk3036/Makefile         |  7 +++
  board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
  board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
  board/rockchip/kylin_rk3036/MAINTAINERS    |  0
  board/rockchip/kylin_rk3036/Makefile       |  7 +++
  board/rockchip/kylin_rk3036/kylin_rk3036.c | 81 ++++++++++++++++++++++++++++++
  17 files changed, 176 insertions(+), 176 deletions(-)

delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c delete mode 100644 board/kylin/kylin_rk3036/Kconfig delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS delete mode 100644 board/kylin/kylin_rk3036/Makefile delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c create mode 100644 board/rockchip/evb_rk3036/Kconfig create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS create mode 100644 board/rockchip/evb_rk3036/Makefile create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c create mode 100644 board/rockchip/kylin_rk3036/Kconfig create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS create mode 100644 board/rockchip/kylin_rk3036/Makefile create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c

Quoted 2 lines

Did you use patman for these? I think it should show these as renames rather than delete/add deltas.

Sorry, I didn't use the patman, I use git format-patch and get send-email instead,
I will re-send this patch again with patman.

BTW, I get below error when I use patman, I have no idea about where I need to define the 'board' node.

Cleaned 1 patches
Traceback (most recent call last):
File "./tools/patman/patman", line 159, in <module>
options.add_maintainers)
File "u-boot/tools/patman/series.py", line 225, in MakeCcFile
raise_on_error=raise_on_error)
File "u-boot/tools/patman/gitutil.py", line 326, in BuildEmailList

     raw += LookupEmail(item, alias, raise_on_error=raise_on_error)

File "u-boot/tools/patman/gitutil.py", line 500, in LookupEmail
raise ValueError, msg
ValueError: Alias 'board' not found

Thanks,
- Kever

Quoted 6 lines

Regards,
Simon

#4 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

Hi Kever,

Quoted 76 lines · Kever Yang

Hi Simon,

On 07/09/2016 10:38 PM, Simon Glass wrote:

Hi Kevin,

On 7 July 2016 at 21:49, Eddie Cai <[email protected]> wrote:

2016-07-08 11:30 GMT+08:00 Kever Yang <[email protected]>:

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
Reviewed-by Eddie Cai <[email protected]>
---
 arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
 board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
 board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
 board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
 board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
 board/kylin/kylin_rk3036/Kconfig           | 15 ------
 board/kylin/kylin_rk3036/MAINTAINERS       |  0
 board/kylin/kylin_rk3036/Makefile          |  7 ---
 board/kylin/kylin_rk3036/kylin_rk3036.c    | 81
------------------------------
 board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
 board/rockchip/evb_rk3036/MAINTAINERS      |  0
 board/rockchip/evb_rk3036/Makefile         |  7 +++
 board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
 board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
 board/rockchip/kylin_rk3036/MAINTAINERS    |  0
 board/rockchip/kylin_rk3036/Makefile       |  7 +++
 board/rockchip/kylin_rk3036/kylin_rk3036.c | 81
++++++++++++++++++++++++++++++
 17 files changed, 176 insertions(+), 176 deletions(-)
 delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig
 delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS
 delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile
 delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c
 delete mode 100644 board/kylin/kylin_rk3036/Kconfig
 delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS
 delete mode 100644 board/kylin/kylin_rk3036/Makefile
 delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c
 create mode 100644 board/rockchip/evb_rk3036/Kconfig
 create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/evb_rk3036/Makefile
 create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c
 create mode 100644 board/rockchip/kylin_rk3036/Kconfig
 create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS
 create mode 100644 board/rockchip/kylin_rk3036/Makefile
 create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c

Did you use patman for these? I think it should show these as renames rather than delete/add deltas.

Sorry, I didn't use the patman, I use git format-patch and get send-email instead,
I will re-send this patch again with patman.

BTW, I get below error when I use patman, I have no idea about where I need to define the 'board' node.

Cleaned 1 patches
Traceback (most recent call last):
File "./tools/patman/patman", line 159, in <module>
options.add_maintainers)
File "u-boot/tools/patman/series.py", line 225, in MakeCcFile
raise_on_error=raise_on_error)
File "u-boot/tools/patman/gitutil.py", line 326, in BuildEmailList

Quoted 4 lines
    raw += LookupEmail(item, alias, raise_on_error=raise_on_error)

File "u-boot/tools/patman/gitutil.py", line 500, in LookupEmail
raise ValueError, msg
ValueError: Alias 'board' not found

Please see 'Where Patches Are Sent' are sent in the README which talks about tags. If you want to skip this error, please add the -t flag.

You are providing a 'board:' tag and there is no such alias.

Regards,
Simon

#5 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

In reply to Kever Yang

board/rockchip/evb_rk3036/MAINTAINERS

Quoted 296 lines · Kever Yang

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
---
  arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
  board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
  board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
  board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
  board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
  board/kylin/kylin_rk3036/Kconfig           | 15 ------
  board/kylin/kylin_rk3036/MAINTAINERS       |  0
  board/kylin/kylin_rk3036/Makefile          |  7 ---
  board/kylin/kylin_rk3036/kylin_rk3036.c    | 81 ------------------------------
  board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
  board/rockchip/evb_rk3036/MAINTAINERS      |  0
  board/rockchip/evb_rk3036/Makefile         |  7 +++
  board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
  board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
  board/rockchip/kylin_rk3036/MAINTAINERS    |  0
  board/rockchip/kylin_rk3036/Makefile       |  7 +++
  board/rockchip/kylin_rk3036/kylin_rk3036.c | 81 ++++++++++++++++++++++++++++++
  17 files changed, 176 insertions(+), 176 deletions(-)

delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c delete mode 100644 board/kylin/kylin_rk3036/Kconfig delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS delete mode 100644 board/kylin/kylin_rk3036/Makefile delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c create mode 100644 board/rockchip/evb_rk3036/Kconfig create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS create mode 100644 board/rockchip/evb_rk3036/Makefile create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c create mode 100644 board/rockchip/kylin_rk3036/Kconfig create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS create mode 100644 board/rockchip/kylin_rk3036/Makefile create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c

arch/arm/mach-rockchip/rk3036/Kconfig +2 -2
index cc03808..f7562bd 100644
@@ -15,7 +15,7 @@ config SYS_MALLOC_F_LEN
  config ROCKCHIP_COMMON
  	bool "Support rk common fuction"
 
-source "board/evb_rk3036/evb_rk3036/Kconfig"
-source "board/kylin/kylin_rk3036/Kconfig"
+source "board/rockchip/evb_rk3036/Kconfig"
+source "board/rockchip/kylin_rk3036/Kconfig"
 
  endif
board/evb_rk3036/evb_rk3036/Kconfig deleted +0 -15
deleted file mode 100644
index ae2a9eb..0000000
@@ -1,15 +0,0 @@
-if TARGET_EVB_RK3036
-
-config SYS_BOARD
-	default "evb_rk3036"
-
-config SYS_VENDOR
-	default "evb_rk3036"
-
-config SYS_CONFIG_NAME
-	default "evb_rk3036"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
-
-endif
board/evb_rk3036/evb_rk3036/MAINTAINERS deleted +0 -0
deleted file mode 100644
index e69de29..0000000
board/evb_rk3036/evb_rk3036/Makefile deleted +0 -7
deleted file mode 100644
index 0403836..0000000
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y	+= evb_rk3036.o
board/evb_rk3036/evb_rk3036/evb_rk3036.c deleted +0 -49
deleted file mode 100644
index f5758b1..0000000
@@ -1,49 +0,0 @@
-/*
- * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <asm/io.h>
-#include <asm/arch/uart.h>
-#include <asm/arch/sdram_rk3036.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void get_ddr_config(struct rk3036_ddr_config *config)
-{
-	/* K4B4G1646Q config */
-	config->ddr_type = 3;
-	config->rank = 2;
-	config->cs0_row = 15;
-	config->cs1_row = 15;
-
-	/* 8bank */
-	config->bank = 3;
-	config->col = 10;
-
-	/* 16bit bw */
-	config->bw = 1;
-}
-
-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
board/kylin/kylin_rk3036/Kconfig deleted +0 -15
deleted file mode 100644
index 5d75c1f..0000000
@@ -1,15 +0,0 @@
-if TARGET_KYLIN_RK3036
-
-config SYS_BOARD
-	default "kylin_rk3036"
-
-config SYS_VENDOR
-	default "kylin"
-
-config SYS_CONFIG_NAME
-	default "kylin_rk3036"
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
-
-endif
board/kylin/kylin_rk3036/MAINTAINERS deleted +0 -0
deleted file mode 100644
index e69de29..0000000
board/kylin/kylin_rk3036/Makefile deleted +0 -7
deleted file mode 100644
index 0663270..0000000
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y	+= kylin_rk3036.o
board/kylin/kylin_rk3036/kylin_rk3036.c deleted +0 -81
deleted file mode 100644
index 2a25871..0000000
@@ -1,81 +0,0 @@
-/*
- * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#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 */
-	config->ddr_type = 3;
-	config->rank = 1;
-	config->cs0_row = 15;
-	config->cs1_row = 15;
-
-	/* 8bank */
-	config->bank = 3;
-	config->col = 10;
-
-	/* 16bit bw */
-	config->bw = 1;
-}
-
-#define FASTBOOT_KEY_GPIO 93
-
-int fastboot_key_pressed(void)
-{
-	gpio_request(FASTBOOT_KEY_GPIO, "fastboot_key");
-	gpio_direction_input(FASTBOOT_KEY_GPIO);
-	return !gpio_get_value(FASTBOOT_KEY_GPIO);
-}
-
-#define ROCKCHIP_BOOT_MODE_FASTBOOT	0x5242C309
-
-int 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()) {
-		printf("enter fastboot!\n");
-		setenv("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
board/rockchip/evb_rk3036/Kconfig new file +15 -0
new file mode 100644
index 0000000..ef45f62
@@ -0,0 +1,15 @@
+if TARGET_EVB_RK3036
+
+config SYS_BOARD
+	default "evb_rk3036"
+
+config SYS_VENDOR
+	default "rockchip"
+
+config SYS_CONFIG_NAME
+	default "evb_rk3036"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
board/rockchip/evb_rk3036/MAINTAINERS new file +0 -0
new file mode 100644

Also merge Simon's commit https://patchwork.ozlabs.org/patch/634321/ ?

Quoted 194 lines

index 0000000..e69de29

board/rockchip/evb_rk3036/Makefile new file +7 -0
new file mode 100644
index 0000000..0403836
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y	+= evb_rk3036.o
board/rockchip/evb_rk3036/evb_rk3036.c new file +49 -0
new file mode 100644
index 0000000..f5758b1
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2015 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <asm/io.h>
+#include <asm/arch/uart.h>
+#include <asm/arch/sdram_rk3036.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void get_ddr_config(struct rk3036_ddr_config *config)
+{
+	/* K4B4G1646Q config */
+	config->ddr_type = 3;
+	config->rank = 2;
+	config->cs0_row = 15;
+	config->cs1_row = 15;
+
+	/* 8bank */
+	config->bank = 3;
+	config->col = 10;
+
+	/* 16bit bw */
+	config->bw = 1;
+}
+
+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
board/rockchip/kylin_rk3036/Kconfig new file +15 -0
new file mode 100644
index 0000000..8d35b4e
@@ -0,0 +1,15 @@
+if TARGET_KYLIN_RK3036
+
+config SYS_BOARD
+	default "kylin_rk3036"
+
+config SYS_VENDOR
+	default "rockchip"
+
+config SYS_CONFIG_NAME
+	default "kylin_rk3036"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
board/rockchip/kylin_rk3036/MAINTAINERS new file +0 -0
new file mode 100644

index 0000000..e69de29

board/rockchip/kylin_rk3036/Makefile new file +7 -0
new file mode 100644
index 0000000..0663270
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y	+= kylin_rk3036.o
board/rockchip/kylin_rk3036/kylin_rk3036.c new file +81 -0
new file mode 100644
index 0000000..2a25871
@@ -0,0 +1,81 @@
+/*
+ * (C) Copyright 2015 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#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 */
+	config->ddr_type = 3;
+	config->rank = 1;
+	config->cs0_row = 15;
+	config->cs1_row = 15;
+
+	/* 8bank */
+	config->bank = 3;
+	config->col = 10;
+
+	/* 16bit bw */
+	config->bw = 1;
+}
+
+#define FASTBOOT_KEY_GPIO 93
+
+int fastboot_key_pressed(void)
+{
+	gpio_request(FASTBOOT_KEY_GPIO, "fastboot_key");
+	gpio_direction_input(FASTBOOT_KEY_GPIO);
+	return !gpio_get_value(FASTBOOT_KEY_GPIO);
+}
+
+#define ROCKCHIP_BOOT_MODE_FASTBOOT	0x5242C309
+
+int 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()) {
+		printf("enter fastboot!\n");
+		setenv("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
#6 lore raw

PATCH 1/1 board: move all the rockchip board in one folder

Quoted 49 lines · Ziyuan Xu
Quoted 46 lines · Kever Yang

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them to 'rockchip' which is a real _vendor_ name, and meet the architecure 'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by Kever Yang <[email protected]>
---
  arch/arm/mach-rockchip/rk3036/Kconfig      |  4 +-
  board/evb_rk3036/evb_rk3036/Kconfig        | 15 ------
  board/evb_rk3036/evb_rk3036/MAINTAINERS    |  0
  board/evb_rk3036/evb_rk3036/Makefile       |  7 ---
  board/evb_rk3036/evb_rk3036/evb_rk3036.c   | 49 ------------------
  board/kylin/kylin_rk3036/Kconfig           | 15 ------
  board/kylin/kylin_rk3036/MAINTAINERS       |  0
  board/kylin/kylin_rk3036/Makefile          |  7 ---
  board/kylin/kylin_rk3036/kylin_rk3036.c    | 81
------------------------------
  board/rockchip/evb_rk3036/Kconfig          | 15 ++++++
  board/rockchip/evb_rk3036/MAINTAINERS      |  0
  board/rockchip/evb_rk3036/Makefile         |  7 +++
  board/rockchip/evb_rk3036/evb_rk3036.c     | 49 ++++++++++++++++++
  board/rockchip/kylin_rk3036/Kconfig        | 15 ++++++
  board/rockchip/kylin_rk3036/MAINTAINERS    |  0
  board/rockchip/kylin_rk3036/Makefile       |  7 +++
  board/rockchip/kylin_rk3036/kylin_rk3036.c | 81
++++++++++++++++++++++++++++++
  17 files changed, 176 insertions(+), 176 deletions(-)

delete mode 100644 board/evb_rk3036/evb_rk3036/Kconfig delete mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS delete mode 100644 board/evb_rk3036/evb_rk3036/Makefile delete mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c delete mode 100644 board/kylin/kylin_rk3036/Kconfig delete mode 100644 board/kylin/kylin_rk3036/MAINTAINERS delete mode 100644 board/kylin/kylin_rk3036/Makefile delete mode 100644 board/kylin/kylin_rk3036/kylin_rk3036.c create mode 100644 board/rockchip/evb_rk3036/Kconfig create mode 100644 board/rockchip/evb_rk3036/MAINTAINERS create mode 100644 board/rockchip/evb_rk3036/Makefile create mode 100644 board/rockchip/evb_rk3036/evb_rk3036.c create mode 100644 board/rockchip/kylin_rk3036/Kconfig create mode 100644 board/rockchip/kylin_rk3036/MAINTAINERS create mode 100644 board/rockchip/kylin_rk3036/Makefile create mode 100644 board/rockchip/kylin_rk3036/kylin_rk3036.c

[snip]

Quoted 6 lines

board/rockchip/evb_rk3036/MAINTAINERS

Quoted 3 lines
board/rockchip/evb_rk3036/MAINTAINERS new file +0 -0
new file mode 100644

Also merge Simon's commit https://patchwork.ozlabs.org/patch/634321/ ?

Better as a separate patch I think. I can apply them in the right order / fix things up.

[snip]