Skip to contentSkip to conversation

arch: arm: rockchip: order the rk3399 entries alphabetically

PATCH New Peter Robinson 4 participants 7 messages Jan 8, 2020 – Mar 5, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch: arm: rockchip: order the rk3399 entries alphabetically

Put the target entries for rk3399 devices in alphabetical order.

---
 arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/mach-rockchip/rk3399/Kconfig +11 -11
index 868e85fc2a..176707e816 100644
@@ -3,6 +3,15 @@ if ROCKCHIP_RK3399
 choice
 	prompt "RK3399 board select"
 
+config TARGET_CHROMEBOOK_BOB
+	bool "Asus Flip C101PA Chromebook (RK3399)"
+	help
+	  Bob is a small RK3299-based device similar in apperance to Minnie.
+	  It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
+	  1280x800 display. It uses its USB ports for both power and external
+	  display. It includes a Chrome OS EC (Cortex-M3) to provide access to
+	  the keyboard and battery functions.
+
 config TARGET_EVB_RK3399
 	bool "RK3399 evaluation board"
 	help
@@ -53,15 +62,6 @@ config TARGET_ROCK960_RK3399
 	   * 2x USB 3.0 type A, 2x USB 2.0 type A (host mode only),
 	     1x USB 3.0 type C OTG
 
-config TARGET_CHROMEBOOK_BOB
-	bool "Asus Flip C101PA Chromebook (RK3399)"
-	help
-	  Bob is a small RK3299-based device similar in apperance to Minnie.
-	  It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
-	  1280x800 display. It uses its USB ports for both power and external
-	  display. It includes a Chrome OS EC (Cortex-M3) to provide access to
-	  the keyboard and battery functions.
-
 config TARGET_ROCKPRO64_RK3399
 	bool "Pine64 Rockpro64 board"
 	help
@@ -113,10 +113,10 @@ config TPL_TEXT_BASE
 config SPL_STACK_R_ADDR
 	default 0x04000000
 
+source "board/google/gru/Kconfig"
+source "board/pine64/rockpro64_rk3399/Kconfig"
 source "board/rockchip/evb_rk3399/Kconfig"
 source "board/theobroma-systems/puma_rk3399/Kconfig"
 source "board/vamrs/rock960_rk3399/Kconfig"
-source "board/google/gru/Kconfig"
-source "board/pine64/rockpro64_rk3399/Kconfig"
 
 endif
Signature · 1 line
2.24.1
#2 lore raw

PATCH 1/1 arch: arm: rockchip: order the rk3399 entries alphabetically

In reply to Peter Robinson

Hi Peter,

Quoted 3 lines · Peter Robinson

Put the target entries for rk3399 devices in alphabetical order.

Thanks,
- Kever

Quoted 53 lines
---
  arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/mach-rockchip/rk3399/Kconfig +11 -11
index 868e85fc2a..176707e816 100644
@@ -3,6 +3,15 @@ if ROCKCHIP_RK3399
  choice
  	prompt "RK3399 board select"
 
+config TARGET_CHROMEBOOK_BOB
+	bool "Asus Flip C101PA Chromebook (RK3399)"
+	help
+	  Bob is a small RK3299-based device similar in apperance to Minnie.
+	  It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
+	  1280x800 display. It uses its USB ports for both power and external
+	  display. It includes a Chrome OS EC (Cortex-M3) to provide access to
+	  the keyboard and battery functions.
+
  config TARGET_EVB_RK3399
  	bool "RK3399 evaluation board"
  	help
@@ -53,15 +62,6 @@ config TARGET_ROCK960_RK3399
  	   * 2x USB 3.0 type A, 2x USB 2.0 type A (host mode only),
  	     1x USB 3.0 type C OTG
 
-config TARGET_CHROMEBOOK_BOB
-	bool "Asus Flip C101PA Chromebook (RK3399)"
-	help
-	  Bob is a small RK3299-based device similar in apperance to Minnie.
-	  It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
-	  1280x800 display. It uses its USB ports for both power and external
-	  display. It includes a Chrome OS EC (Cortex-M3) to provide access to
-	  the keyboard and battery functions.
-
  config TARGET_ROCKPRO64_RK3399
  	bool "Pine64 Rockpro64 board"
  	help
@@ -113,10 +113,10 @@ config TPL_TEXT_BASE
  config SPL_STACK_R_ADDR
  	default 0x04000000
 
+source "board/google/gru/Kconfig"
+source "board/pine64/rockpro64_rk3399/Kconfig"
  source "board/rockchip/evb_rk3399/Kconfig"
  source "board/theobroma-systems/puma_rk3399/Kconfig"
  source "board/vamrs/rock960_rk3399/Kconfig"
-source "board/google/gru/Kconfig"
-source "board/pine64/rockpro64_rk3399/Kconfig"
 
  endif
#3 lore raw

PATCH 1/1 arch: arm: rockchip: order the rk3399 entries alphabetically

Quoted 8 lines · Kever Yang

Hi Peter,

Quoted 3 lines · Peter Robinson

Put the target entries for rk3399 devices in alphabetical order.

Any reason this didn't make the latest rockchip MR?

Quoted 57 lines

Thanks,
- Kever

Quoted 53 lines
---
  arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/mach-rockchip/rk3399/Kconfig +11 -11
index 868e85fc2a..176707e816 100644
@@ -3,6 +3,15 @@ if ROCKCHIP_RK3399
  choice
      prompt "RK3399 board select"
 
+config TARGET_CHROMEBOOK_BOB
+     bool "Asus Flip C101PA Chromebook (RK3399)"
+     help
+       Bob is a small RK3299-based device similar in apperance to Minnie.
+       It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
+       1280x800 display. It uses its USB ports for both power and external
+       display. It includes a Chrome OS EC (Cortex-M3) to provide access to
+       the keyboard and battery functions.
+
  config TARGET_EVB_RK3399
      bool "RK3399 evaluation board"
      help
@@ -53,15 +62,6 @@ config TARGET_ROCK960_RK3399
         * 2x USB 3.0 type A, 2x USB 2.0 type A (host mode only),
           1x USB 3.0 type C OTG
 
-config TARGET_CHROMEBOOK_BOB
-     bool "Asus Flip C101PA Chromebook (RK3399)"
-     help
-       Bob is a small RK3299-based device similar in apperance to Minnie.
-       It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
-       1280x800 display. It uses its USB ports for both power and external
-       display. It includes a Chrome OS EC (Cortex-M3) to provide access to
-       the keyboard and battery functions.
-
  config TARGET_ROCKPRO64_RK3399
      bool "Pine64 Rockpro64 board"
      help
@@ -113,10 +113,10 @@ config TPL_TEXT_BASE
  config SPL_STACK_R_ADDR
      default 0x04000000
 
+source "board/google/gru/Kconfig"
+source "board/pine64/rockpro64_rk3399/Kconfig"
  source "board/rockchip/evb_rk3399/Kconfig"
  source "board/theobroma-systems/puma_rk3399/Kconfig"
  source "board/vamrs/rock960_rk3399/Kconfig"
-source "board/google/gru/Kconfig"
-source "board/pine64/rockpro64_rk3399/Kconfig"
 
  endif
#4 lore raw

PATCH 1/1 arch: arm: rockchip: order the rk3399 entries alphabetically

Hi Peter,

Quoted 9 lines · Peter Robinson
Quoted 7 lines · Kever Yang

Hi Peter,

Quoted 3 lines · Peter Robinson

Put the target entries for rk3399 devices in alphabetical order.

Any reason this didn't make the latest rockchip MR?

This patch break the build for rk3399 boards other than chromebook_bob,

and I have to leave it until other boards add CONFIG_TARGET_* to pass the build.

Thanks,

- Kever

Quoted 58 lines
Quoted 57 lines

Thanks,
- Kever

Quoted 53 lines
---
   arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++-----------
   1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/mach-rockchip/rk3399/Kconfig +11 -11
index 868e85fc2a..176707e816 100644
@@ -3,6 +3,15 @@ if ROCKCHIP_RK3399
   choice
       prompt "RK3399 board select"
 
+config TARGET_CHROMEBOOK_BOB
+     bool "Asus Flip C101PA Chromebook (RK3399)"
+     help
+       Bob is a small RK3299-based device similar in apperance to Minnie.
+       It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
+       1280x800 display. It uses its USB ports for both power and external
+       display. It includes a Chrome OS EC (Cortex-M3) to provide access to
+       the keyboard and battery functions.
+
   config TARGET_EVB_RK3399
       bool "RK3399 evaluation board"
       help
@@ -53,15 +62,6 @@ config TARGET_ROCK960_RK3399
          * 2x USB 3.0 type A, 2x USB 2.0 type A (host mode only),
            1x USB 3.0 type C OTG
 
-config TARGET_CHROMEBOOK_BOB
-     bool "Asus Flip C101PA Chromebook (RK3399)"
-     help
-       Bob is a small RK3299-based device similar in apperance to Minnie.
-       It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a 10.1",
-       1280x800 display. It uses its USB ports for both power and external
-       display. It includes a Chrome OS EC (Cortex-M3) to provide access to
-       the keyboard and battery functions.
-
   config TARGET_ROCKPRO64_RK3399
       bool "Pine64 Rockpro64 board"
       help
@@ -113,10 +113,10 @@ config TPL_TEXT_BASE
   config SPL_STACK_R_ADDR
       default 0x04000000
 
+source "board/google/gru/Kconfig"
+source "board/pine64/rockpro64_rk3399/Kconfig"
   source "board/rockchip/evb_rk3399/Kconfig"
   source "board/theobroma-systems/puma_rk3399/Kconfig"
   source "board/vamrs/rock960_rk3399/Kconfig"
-source "board/google/gru/Kconfig"
-source "board/pine64/rockpro64_rk3399/Kconfig"
 
   endif
#5 lore raw

PATCH 1/1 arch: arm: rockchip: order the rk3399 entries alphabetically

Quoted 10 lines · On Mon, 20 Jan 2020, 10:08 Kever Yang, <[email protected]> wrote:

Hi Peter,

Quoted 1 line · Peter Robinson

On Mon, Jan 13, 2020 at 7:03 AM Kever Yang <[email protected]>

Quoted 5 lines · wrote:
Quoted 5 lines

Hi Peter,

Quoted 2 lines · Peter Robinson

Put the target entries for rk3399 devices in alphabetical order.

Quoted 9 lines
Quoted 3 lines
Quoted 2 lines
Quoted 1 line

Any reason this didn't make the latest rockchip MR?

This patch break the build for rk3399 boards other than chromebook_bob,

and I have to leave it until other boards add CONFIG_TARGET_* to pass the build.

How would it do that by simply reordering a kconfig file? I've tested it with at least building evm, rock960, rockpro64 and firefly 3399 builds with out issues.

Peter

Thanks,

Quoted 73 lines

- Kever

Quoted 8 lines
Quoted 8 lines

Thanks,
- Kever

Review

Quoted 5 lines
---
   arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++-----------
   1 file changed, 11 insertions(+), 11 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-rockchip/rk3399/Kconfig

Quoted 11 lines
Quoted 11 lines

arch/arm/mach-rockchip/rk3399/Kconfig if ROCKCHIP_RK3399 · line 9

Quoted 11 lines

index 868e85fc2a..176707e816 100644

arch/arm/mach-rockchip/rk3399/Kconfig +4 -0
@@ -3,6 +3,15 @@ if ROCKCHIP_RK3399
   choice
       prompt "RK3399 board select"
 
+config TARGET_CHROMEBOOK_BOB
+     bool "Asus Flip C101PA Chromebook (RK3399)"
+     help
+       Bob is a small RK3299-based device similar in apperance to

Minnie.

Quoted 1 line
Quoted 1 line

arch/arm/mach-rockchip/rk3399/Kconfig if ROCKCHIP_RK3399 · line 10

Quoted 1 line
arch/arm/mach-rockchip/rk3399/Kconfig +1 -0
+       It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a

10.1",

Quoted 1 line
Quoted 1 line

arch/arm/mach-rockchip/rk3399/Kconfig if ROCKCHIP_RK3399 · line 11

Quoted 1 line
arch/arm/mach-rockchip/rk3399/Kconfig +1 -0
+       1280x800 display. It uses its USB ports for both power and

external

Quoted 1 line
Quoted 1 line

arch/arm/mach-rockchip/rk3399/Kconfig if ROCKCHIP_RK3399 · line 12

Quoted 1 line
arch/arm/mach-rockchip/rk3399/Kconfig +1 -0
+       display. It includes a Chrome OS EC (Cortex-M3) to provide

access to

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
arch/arm/mach-rockchip/rk3399/Kconfig +2 -0
+       the keyboard and battery functions.
+
   config TARGET_EVB_RK3399
       bool "RK3399 evaluation board"
       help
@@ -53,15 +62,6 @@ config TARGET_ROCK960_RK3399
          * 2x USB 3.0 type A, 2x USB 2.0 type A (host mode only),
            1x USB 3.0 type C OTG
 
Quoted 4 lines
Quoted 4 lines

arch/arm/mach-rockchip/rk3399/Kconfig config TARGET_ROCK960_RK3399

Quoted 4 lines
arch/arm/mach-rockchip/rk3399/Kconfig +0 -4
-config TARGET_CHROMEBOOK_BOB
-     bool "Asus Flip C101PA Chromebook (RK3399)"
-     help
-       Bob is a small RK3299-based device similar in apperance to

Minnie.

Quoted 1 line
Quoted 1 line

arch/arm/mach-rockchip/rk3399/Kconfig config TARGET_ROCK960_RK3399 · line 60

Quoted 1 line
arch/arm/mach-rockchip/rk3399/Kconfig +0 -1
-       It has two USB 3.0 type-C ports, 4GB of SDRAM, WiFi and a

10.1",

Quoted 1 line
Quoted 1 line

arch/arm/mach-rockchip/rk3399/Kconfig config TARGET_ROCK960_RK3399 · line 61

Quoted 1 line
arch/arm/mach-rockchip/rk3399/Kconfig +0 -1
-       1280x800 display. It uses its USB ports for both power and

external

Quoted 1 line
Quoted 1 line

arch/arm/mach-rockchip/rk3399/Kconfig config TARGET_ROCK960_RK3399 · line 62

Quoted 1 line
arch/arm/mach-rockchip/rk3399/Kconfig +0 -1
-       display. It includes a Chrome OS EC (Cortex-M3) to provide

access to

Quoted 20 lines
Quoted 19 lines
Quoted 18 lines
arch/arm/mach-rockchip/rk3399/Kconfig +2 -4
-       the keyboard and battery functions.
-
   config TARGET_ROCKPRO64_RK3399
       bool "Pine64 Rockpro64 board"
       help
@@ -113,10 +113,10 @@ config TPL_TEXT_BASE
   config SPL_STACK_R_ADDR
       default 0x04000000
 
+source "board/google/gru/Kconfig"
+source "board/pine64/rockpro64_rk3399/Kconfig"
   source "board/rockchip/evb_rk3399/Kconfig"
   source "board/theobroma-systems/puma_rk3399/Kconfig"
   source "board/vamrs/rock960_rk3399/Kconfig"
-source "board/google/gru/Kconfig"
-source "board/pine64/rockpro64_rk3399/Kconfig"
 
   endif
#6 lore raw

PATCH 1/1 arch: arm: rockchip: order the rk3399 entries alphabetically

Quoted 19 lines · Peter Robinson
Quoted 16 lines · On Mon, 20 Jan 2020, 10:08 Kever Yang, <[email protected]> wrote:

Hi Peter,

Quoted 1 line · Peter Robinson

On Mon, Jan 13, 2020 at 7:03 AM Kever Yang <[email protected]>

Quoted 8 lines · wrote:
Quoted 7 lines

Hi Peter,

Quoted 3 lines · Peter Robinson

Put the target entries for rk3399 devices in alphabetical order.

Any reason this didn't make the latest rockchip MR?

This patch break the build for rk3399 boards other than chromebook_bob,

Quoted 7 lines
Quoted 3 lines

and I have to leave it until other boards add CONFIG_TARGET_* to pass the build.

How would it do that by simply reordering a kconfig file? I've tested it with at least building evm, rock960, rockpro64 and firefly 3399 builds with out issues.

AFAICT if the defconfig has no preferred setting, then the first entry is used. The targets you tested likely all had a preferred setting, but other ones such as the NanoPi M4 did not, and was counting on the EVB target being the default.

ChenYu