rockchip: cosmetic: Sort RK3288 boards

Sort rk3288 boards in alphabetical order.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Eddie Cai <eddie.cai.linux@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index dad3661b78fab7aa65c5ef82b34b18bb8b8582ce..87d9353de4790017041dd834a9c06db8fd288bd3 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -29,16 +29,16 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
 dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3036-sdk.dtb \
-       rk3188-radxarock.dtb \
+       rk3288-evb.dtb \
+       rk3288-fennec.dtb \
        rk3288-firefly.dtb \
+       rk3288-popmetal.dtb \
+       rk3188-radxarock.dtb \
+       rk3288-rock2-square.dtb \
+       rk3288-tinker.dtb \
        rk3288-veyron-jerry.dtb \
        rk3288-veyron-mickey.dtb \
        rk3288-veyron-minnie.dtb \
-       rk3288-rock2-square.dtb \
-       rk3288-evb.dtb \
-       rk3288-fennec.dtb \
-       rk3288-tinker.dtb \
-       rk3288-popmetal.dtb \
        rk3328-evb.dtb \
        rk3399-evb.dtb \
        rk3399-puma.dtb

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index 738a20d07c1a774e3565ab91793d9d1c9f723d38..13f7513813e4a271599cb2a9caa768c25fc238a2 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -1,13 +1,34 @@
 if ROCKCHIP_RK3288
 
-config TARGET_FIREFLY_RK3288
-       bool "Firefly-RK3288"
+config TARGET_CHROMEBOOK_JERRY
+       bool "Google/Rockchip Veyron-Jerry Chromebook"
        select BOARD_LATE_INIT
        help
-         Firefly is a RK3288-based development board with 2 USB ports,
-         HDMI, VGA, micro-SD card, audio, WiFi  and Gigabit Ethernet, It
-         also includes on-board eMMC and 1GB of SDRAM. Expansion connectors
-         provide access to display pins, I2C, SPI, UART and GPIOs.
+         Jerry is a RK3288-based clamshell device with 2 USB 3.0 ports,
+         HDMI, an 11.9 inch EDP display, micro-SD card, touchpad and
+         WiFi. It includes a Chrome OS EC (Cortex-M3) to provide access to
+         the keyboard and battery functions.
+
+config TARGET_CHROMEBIT_MICKEY
+       bool "Google/Rockchip Veyron-Mickey Chromebit"
+       select BOARD_LATE_INIT
+       help
+         Mickey is a small RK3288-based device with one USB 3.0 port, HDMI
+         and WiFi. It has a separate power port and is designed to connect
+         to the HDMI input of a monitor or TV. It has no internal battery.
+         Typically a USB hub or wireless keyboard/touchpad is used to get
+         keyboard and mouse access.
+
+config TARGET_CHROMEBOOK_MINNIE
+       bool "Google/Rockchip Veyron-Minnie Chromebook"
+       select BOARD_LATE_INIT
+       help
+         Minnie is a RK3288-based convertible clamshell device with 2 USB 3.0
+         ports, micro HDMI, a 10.1-inch 1280x800 EDP display, micro-SD card,
+         HD camera, touchpad, WiFi and Bluetooth. It includes a Chrome OS
+         EC (Cortex-M3) to provide access to the keyboard and battery
+         functions. It includes 2 or 4GB of SDRAM and 16 or 32GB of
+         internal MMC. The product name is ASUS Chromebook Flip.
 
 config TARGET_EVB_RK3288
        bool "Evb-RK3288"
@@ -27,6 +48,15 @@ config TARGET_FENNEC_RK3288
          includes on-board eMMC and 2GB of SDRAM. Expansion connectors
          provide access to display pins, I2C, SPI, UART and GPIOs.
 
+config TARGET_FIREFLY_RK3288
+       bool "Firefly-RK3288"
+       select BOARD_LATE_INIT
+       help
+         Firefly is a RK3288-based development board with 2 USB ports,
+         HDMI, VGA, micro-SD card, audio, WiFi  and Gigabit Ethernet, It
+         also includes on-board eMMC and 1GB of SDRAM. Expansion connectors
+         provide access to display pins, I2C, SPI, UART and GPIOs.
+
 config TARGET_POPMETAL_RK3288
        bool "PopMetal-RK3288"
        select BOARD_LATE_INIT
@@ -37,45 +67,6 @@ config TARGET_POPMETAL_RK3288
          2GB DDR3. Expansion connectors provide access to I2C, SPI, UART,
          GPIOs and display interface.
 
-config TARGET_TINKER_RK3288
-       bool "Tinker-RK3288"
-        select BOARD_LATE_INIT
-       help
-         Tinker is a RK3288-based development board with 2 USB ports, HDMI,
-         micro-SD card, audio, Gigabit Ethernet. It also includes on-board
-         8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to
-         I2C, SPI, UART, GPIOs.
-
-config TARGET_CHROMEBOOK_JERRY
-       bool "Google/Rockchip Veyron-Jerry Chromebook"
-       select BOARD_LATE_INIT
-       help
-         Jerry is a RK3288-based clamshell device with 2 USB 3.0 ports,
-         HDMI, an 11.9 inch EDP display, micro-SD card, touchpad and
-         WiFi. It includes a Chrome OS EC (Cortex-M3) to provide access to
-         the keyboard and battery functions.
-
-config TARGET_CHROMEBIT_MICKEY
-       bool "Google/Rockchip Veyron-Mickey Chromebit"
-       select BOARD_LATE_INIT
-       help
-         Mickey is a small RK3288-based device with one USB 3.0 port, HDMI
-         and WiFi. It has a separate power port and is designed to connect
-         to the HDMI input of a monitor or TV. It has no internal battery.
-         Typically a USB hub or wireless keyboard/touchpad is used to get
-         keyboard and mouse access.
-
-config TARGET_CHROMEBOOK_MINNIE
-       bool "Google/Rockchip Veyron-Minnie Chromebook"
-       select BOARD_LATE_INIT
-       help
-         Minnie is a RK3288-based convertible clamshell device with 2 USB 3.0
-         ports, micro HDMI, a 10.1-inch 1280x800 EDP display, micro-SD card,
-         HD camera, touchpad, WiFi and Bluetooth. It includes a Chrome OS
-         EC (Cortex-M3) to provide access to the keyboard and battery
-         functions. It includes 2 or 4GB of SDRAM and 16 or 32GB of
-         internal MMC. The product name is ASUS Chromebook Flip.
-
 config TARGET_ROCK2
        bool "Radxa Rock 2"
        select BOARD_LATE_INIT
@@ -85,6 +76,15 @@ config TARGET_ROCK2
          space for a real-time-clock battery. There is also an expansion
          interface which provides access to many pins.
 
+config TARGET_TINKER_RK3288
+       bool "Tinker-RK3288"
+        select BOARD_LATE_INIT
+       help
+         Tinker is a RK3288-based development board with 2 USB ports, HDMI,
+         micro-SD card, audio, Gigabit Ethernet. It also includes on-board
+         8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to
+         I2C, SPI, UART, GPIOs.
+
 config ROCKCHIP_FAST_SPL
        bool "Change the CPU to full speed in SPL"
        depends on TARGET_CHROMEBOOK_JERRY

diff --git a/doc/README.rockchip b/doc/README.rockchip
index cb81efd4bff478f27c27e81e1fe034e992692ab0..97c62f1733e32c5a5916296f132c417517285032 100644 (file)
--- a/doc/README.rockchip
+++ b/doc/README.rockchip
@@ -42,9 +42,9 @@ At present seven RK3288 boards are supported:
    - Fennec RK3288 - use fennec-rk3288 configuration
    - Firefly RK3288 - use firefly-rk3288 configuration
    - Hisense Chromebook - use chromebook_jerry configuration
-   - Tinker RK3288 - use tinker-rk3288 configuration
    - PopMetal RK3288 - use popmetal-rk3288 configuration
    - Radxa Rock 2 - use rock2 configuration
+   - Tinker RK3288 - use tinker-rk3288 configuration
 
 Two RK3036 board are supported: