machine: cleanup

Create a conf/machine/include/rockchip-defaults.inc that includes
rockchip-wide defaults, then organize the conf/machine/include/rk*.inc and
individual machine files accordingly.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
This commit is contained in:
Trevor Woerner 2018-04-25 19:48:20 -04:00
parent 1ffcfc9ff2
commit 02f601cfee
10 changed files with 34 additions and 44 deletions

View File

@ -6,6 +6,7 @@
#@DESCRIPTION: Firefly-RK3288 is a high-performance platform, with strong computing power, graphic processing and video decoding ability.
#http://www.t-firefly.com/en/
include conf/machine/include/rk3288.inc
require conf/machine/include/rk3288.inc
KERNEL_DEVICETREE = "rk3288-firefly.dtb"
UBOOT_MACHINE = "firefly-rk3288_defconfig"

View File

@ -5,19 +5,4 @@ SOC_FAMILY = "rk3066"
require conf/machine/include/tune-cortexa9.inc
require conf/machine/include/soc-family.inc
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = "xserver-xorg \
xf86-video-fbturbo \
xf86-input-evdev \
xf86-input-mouse \
xf86-input-keyboard"
KERNEL_IMAGETYPE = "zImage"
IMAGE_FSTYPES += "ext4"
SERIAL_CONSOLES ?= "115200;ttyFIQ0"
KBUILD_DEFCONFIG = "multi_v7_defconfig"
require conf/machine/include/rockchip-defaults.inc

View File

@ -5,17 +5,4 @@ SOC_FAMILY = "rk3188"
require conf/machine/include/tune-cortexa9.inc
require conf/machine/include/soc-family.inc
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = "xserver-xorg \
xf86-video-fbturbo \
xf86-input-evdev \
xf86-input-mouse \
xf86-input-keyboard"
KERNEL_IMAGETYPE = "zImage"
IMAGE_FSTYPES += "ext4"
SERIAL_CONSOLES ?= "115200;ttyFIQ0"
KBUILD_DEFCONFIG = "multi_v7_defconfig"
require conf/machine/include/rockchip-defaults.inc

View File

@ -5,14 +5,12 @@ SOC_FAMILY = "rk3288"
require conf/machine/include/tune-cortexa17.inc
require conf/machine/include/soc-family.inc
require conf/machine/include/rockchip-defaults.inc
PREFERRED_PROVIDER_virtual/kernel ?= "linux"
SERIAL_CONSOLES = "115200;ttyS2"
KERNEL_IMAGETYPE = "zImage"
KBUILD_DEFCONFIG = "multi_v7_defconfig"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-rockchip"
SPL_BINARY ?= "u-boot-spl-dtb.bin"
IMAGE_FSTYPES = "ext4 rockchip-gpt-img"
IMAGE_FSTYPES = "rockchip-gpt-img"
IMAGE_CLASSES += "rockchip-gpt-img"

View File

@ -0,0 +1,20 @@
# meta-rockchip default settings
# kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux"
LINUX_VERSION_EXTENSION ?= "-rockchip"
KBUILD_DEFCONFIG = "multi_v7_defconfig"
KERNEL_IMAGETYPE = "zImage"
# xserver
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = " \
xserver-xorg \
xf86-video-fbturbo \
xf86-input-evdev \
xf86-input-mouse \
xf86-input-keyboard \
"
# misc
IMAGE_FSTYPES += "ext4"

View File

@ -8,6 +8,5 @@
require conf/machine/include/rk3066.inc
PREFERRED_PROVIDER_virtual/kernel = "linux"
SERIAL_CONSOLES = "115200;ttyS2"
KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"

View File

@ -9,7 +9,5 @@
require conf/machine/include/rk3188.inc
PREFERRED_PROVIDER_virtual/kernel = "linux"
SERIAL_CONSOLES ?= "115200;ttyFIQ0"
KERNEL_DEVICETREE ?= "rk3188-radxarock.dtb"
OLDEST_KERNEL ?= "3.0"
SERIAL_CONSOLES = "115200;ttyFIQ0"
KERNEL_DEVICETREE = "rk3188-radxarock.dtb"

View File

@ -6,7 +6,7 @@
#@DESCRIPTION: Radxa Rock2 is a series of the second single board computer from Radxa. This is the square baseboard.
#http://radxa.com/Rock2
include conf/machine/include/rk3288.inc
require conf/machine/include/rk3288.inc
KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
UBOOT_MACHINE = "rock2_defconfig"

View File

@ -5,6 +5,7 @@
#@NAME: Tinker RK3288
#@DESCRIPTION: ASUS Tinker Board is a Raspberry Pi 3 Alternative based on Rockchip RK3288 Processor.
include conf/machine/include/rk3288.inc
require conf/machine/include/rk3288.inc
KERNEL_DEVICETREE = "rk3288-tinker.dtb"
UBOOT_MACHINE = "tinker-rk3288_defconfig"

View File

@ -6,7 +6,8 @@
#@DESCRIPTION: Google Veyron Speedy Rev 1+ board (formally known as Chromebook Asus C201)
#https://www.google.com/chromebook/find/#?device=asus-chromebook-c201
include conf/machine/include/rk3288.inc
require conf/machine/include/rk3288.inc
KERNEL_DEVICETREE = "rk3288-speedy.dtb"
MACHINE_EXTRA_RDEPENDS = "linux-firmware-bcm4354 linux-firmware-bcm-veyron kernel-module-brcmfmac kernel-module-cros-ec-accel kernel-module-btbcm kernel-module-hci-uart"
PREFERRED_PROVIDER_virtual/kernel = "linux-veyron"