| Message ID | 20200108035611.660644-1-pbrobinson@gmail.com |
|---|---|
| State | Accepted |
| Commit | f9561d8e3671415c7780df4b5e70f0f1e2d2bf57 |
| Headers | show |
| Series | arch: arm: rockchip: order the rk3399 entries alphabetically | expand |
On Wed, 8 Jan 2020 at 16:57, Peter Robinson <pbrobinson at gmail.com> wrote: > > Put the target entries for rk3399 devices in alphabetical order. > > Signed-off-by: Peter Robinson <pbrobinson at gmail.com> > --- > arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) Reviewed-by: Simon Glass <sjg at chromium.org>
Hi Peter, On 2020/1/8 上午11:56, Peter Robinson wrote: > Put the target entries for rk3399 devices in alphabetical order. > > Signed-off-by: Peter Robinson <pbrobinson at gmail.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig > index 868e85fc2a..176707e816 100644 > --- a/arch/arm/mach-rockchip/rk3399/Kconfig > +++ b/arch/arm/mach-rockchip/rk3399/Kconfig > @@ -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
On Mon, Jan 13, 2020 at 7:03 AM Kever Yang <kever.yang at rock-chips.com> wrote: > > Hi Peter, > > On 2020/1/8 上午11:56, Peter Robinson wrote: > > Put the target entries for rk3399 devices in alphabetical order. > > > > Signed-off-by: Peter Robinson <pbrobinson at gmail.com> > Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Any reason this didn't make the latest rockchip MR? > Thanks, > - Kever > > --- > > arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++----------- > > 1 file changed, 11 insertions(+), 11 deletions(-) > > > > diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig > > index 868e85fc2a..176707e816 100644 > > --- a/arch/arm/mach-rockchip/rk3399/Kconfig > > +++ b/arch/arm/mach-rockchip/rk3399/Kconfig > > @@ -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 > >
Hi Peter, On 2020/1/20 下午5:22, Peter Robinson wrote: > On Mon, Jan 13, 2020 at 7:03 AM Kever Yang <kever.yang at rock-chips.com> wrote: >> Hi Peter, >> >> On 2020/1/8 上午11:56, Peter Robinson wrote: >>> Put the target entries for rk3399 devices in alphabetical order. >>> >>> Signed-off-by: Peter Robinson <pbrobinson at gmail.com> >> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> > 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 > >> Thanks, >> - Kever >>> --- >>> arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++----------- >>> 1 file changed, 11 insertions(+), 11 deletions(-) >>> >>> diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig >>> index 868e85fc2a..176707e816 100644 >>> --- a/arch/arm/mach-rockchip/rk3399/Kconfig >>> +++ b/arch/arm/mach-rockchip/rk3399/Kconfig >>> @@ -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 >> >
On Mon, 20 Jan 2020, 10:08 Kever Yang, <kever.yang at rock-chips.com> wrote: > Hi Peter, > > On 2020/1/20 下午5:22, Peter Robinson wrote: > > On Mon, Jan 13, 2020 at 7:03 AM Kever Yang <kever.yang at rock-chips.com> > wrote: > >> Hi Peter, > >> > >> On 2020/1/8 上午11:56, Peter Robinson wrote: > >>> Put the target entries for rk3399 devices in alphabetical order. > >>> > >>> Signed-off-by: Peter Robinson <pbrobinson at gmail.com> > >> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> > > 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, > > - Kever > > > > >> Thanks, > >> - Kever > >>> --- > >>> arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++----------- > >>> 1 file changed, 11 insertions(+), 11 deletions(-) > >>> > >>> diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig > b/arch/arm/mach-rockchip/rk3399/Kconfig > >>> index 868e85fc2a..176707e816 100644 > >>> --- a/arch/arm/mach-rockchip/rk3399/Kconfig > >>> +++ b/arch/arm/mach-rockchip/rk3399/Kconfig > >>> @@ -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 > >> > > > > >
On Mon, Jan 20, 2020 at 7:06 PM Peter Robinson <pbrobinson at gmail.com> wrote: > > On Mon, 20 Jan 2020, 10:08 Kever Yang, <kever.yang at rock-chips.com> wrote: > > > Hi Peter, > > > > On 2020/1/20 ??5:22, Peter Robinson wrote: > > > On Mon, Jan 13, 2020 at 7:03 AM Kever Yang <kever.yang at rock-chips.com> > > wrote: > > >> Hi Peter, > > >> > > >> On 2020/1/8 ??11:56, Peter Robinson wrote: > > >>> Put the target entries for rk3399 devices in alphabetical order. > > >>> > > >>> Signed-off-by: Peter Robinson <pbrobinson at gmail.com> > > >> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> > > > 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. 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
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 868e85fc2a..176707e816 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -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
Put the target entries for rk3399 devices in alphabetical order. Signed-off-by: Peter Robinson <pbrobinson at gmail.com> --- arch/arm/mach-rockchip/rk3399/Kconfig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)