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 dad3661..87d9353 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -29,16 +29,16 @@
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 738a20d..13f7513 100644
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -1,51 +1,5 @@
if ROCKCHIP_RK3288
-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_EVB_RK3288
- bool "Evb-RK3288"
- select BOARD_LATE_INIT
- help
- EVB-RK3288 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 2GB of SDRAM. Expansion connectors
- provide access to display pins, I2C, SPI, UART and GPIOs.
-
-config TARGET_FENNEC_RK3288
- bool "Fennec-RK3288"
- select BOARD_LATE_INIT
- help
- Fennec is a RK3288-based development board with 2 USB ports,
- HDMI, micro-SD card, audio, WiFi and Gigabit Ethernet. It also
- includes on-board eMMC and 2GB 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
- help
- PopMetal is a RK3288-based development board with 3 USB host ports,
- 1 micro USB OTG port, HDMI, VGA, micro-SD card, audio, WiFi, Gigabit
- Ethernet and lots of sensors. It also includes on-board 8 GeMMC and
- 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
@@ -76,6 +30,43 @@
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"
+ select BOARD_LATE_INIT
+ help
+ EVB-RK3288 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 2GB of SDRAM. Expansion connectors
+ provide access to display pins, I2C, SPI, UART and GPIOs.
+
+config TARGET_FENNEC_RK3288
+ bool "Fennec-RK3288"
+ select BOARD_LATE_INIT
+ help
+ Fennec is a RK3288-based development board with 2 USB ports,
+ HDMI, micro-SD card, audio, WiFi and Gigabit Ethernet. It also
+ 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
+ help
+ PopMetal is a RK3288-based development board with 3 USB host ports,
+ 1 micro USB OTG port, HDMI, VGA, micro-SD card, audio, WiFi, Gigabit
+ Ethernet and lots of sensors. It also includes on-board 8 GeMMC and
+ 2GB DDR3. Expansion connectors provide access to I2C, SPI, UART,
+ GPIOs and display interface.
+
config TARGET_ROCK2
bool "Radxa Rock 2"
select BOARD_LATE_INIT
@@ -85,6 +76,15 @@
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 cb81efd..97c62f1 100644
--- a/doc/README.rockchip
+++ b/doc/README.rockchip
@@ -42,9 +42,9 @@
- 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: