Skip to contentSkip to conversation

rockchip: add common header boot0.h and gpio.h for soc

PATCH New Kever Yang 2 participants 3 messages May 6, 2019 Arm (32-bit)

lore
Share & tools
lore

Kever Yang

author
#0 lore raw

PATCH v3 1/2 rockchip: add common header boot0.h and gpio.h for soc

boot0.h and gpio.h will be used by system and include by 'asm/arch/', each of them need of a copy from 'asm/arch-rockchip'.

---

 arch/arm/include/asm/arch-rk3036/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3036/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk3128/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3128/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk3188/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3188/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk322x/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk322x/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk3288/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3288/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk3328/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3328/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk3368/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3368/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rk3399/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rk3399/gpio.h  | 11 +++++++++++
 arch/arm/include/asm/arch-rv1108/boot0.h | 11 +++++++++++
 arch/arm/include/asm/arch-rv1108/gpio.h  | 11 +++++++++++
 18 files changed, 198 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rk3036/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3036/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3128/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3128/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3188/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3188/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk322x/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk322x/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3288/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3288/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3328/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3328/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3368/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3368/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3399/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3399/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rv1108/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rv1108/gpio.h
arch/arm/include/asm/arch-rk3036/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3036/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3128/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3128/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3188/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3188/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk322x/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk322x/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3288/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3288/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3328/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3328/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3368/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3368/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3399/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3399/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rv1108/boot0.h new file +11 -0
new file mode 100644
index 0000000000..2e78b074ad
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rv1108/gpio.h new file +11 -0
new file mode 100644
index 0000000000..eca79d5159
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2019 Rockchip Electronics Co., Ltd
+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v3 2/2 arm: remove ARCH_ROCKCHIP macro in common code

This is fix to:
e2a12f590d rockchip: use 'arch-rockchip' as header file path

The V2 of origin patch set has fix this, but we merge V1 by mistake, so lets correct it.

---

 arch/arm/cpu/armv8/start.S | 4 ----
 arch/arm/lib/vectors.S     | 4 ----
 2 files changed, 8 deletions(-)
arch/arm/cpu/armv8/start.S +0 -4
index ecee9e37a5..fe52166e28 100644
@@ -26,11 +26,7 @@ _start:
  * order to boot, allow them to set that in their boot0.h file and then
  * use it here.
  */
-#ifdef CONFIG_ARCH_ROCKCHIP
-#include <asm/arch-rockchip/boot0.h>
-#else
 #include <asm/arch/boot0.h>
-#endif
 #else
 	b	reset
 #endif
arch/arm/lib/vectors.S +0 -4
index 20f485142e..56f3681558 100644
@@ -67,11 +67,7 @@
  *   (1) defines '_start:' as appropriate
  *   (2) inserts the vector table using ARM_VECTORS as appropriate
  */
-#ifdef CONFIG_ARCH_ROCKCHIP
-#include <asm/arch-rockchip/boot0.h>
-#else
 #include <asm/arch/boot0.h>
-#endif
 #else
 
 /*
Signature · 1 line
2.20.1
#2 lore raw

PATCH v3 1/2 rockchip: add common header boot0.h and gpio.h for soc

In reply to Kever Yang
Quoted 7 lines · Kever Yang

boot0.h and gpio.h will be used by system and include by 'asm/arch/', each of them need of a copy from 'asm/arch-rockchip'.

---

What is v3 changes here? I'm trying to test this along with other changes on u-boot-rockchip/master (which I suppose to have rockchip changes are ready to merge on master), but this is already applied.