[meta-rockchip][PATCH] tinker board: refactor machine config


Trevor Woerner
 

Create a common conf/machine/include/tinker.inc and re-spin
- conf/machine/tinker-board.conf
- conf/machine-tinker-board-s.conf
to just contain the differences.

Signed-off-by: Trevor Woerner <twoerner@...>
---
conf/machine/include/tinker.inc | 15 +++++++++++++++
conf/machine/tinker-board-s.conf | 16 +---------------
conf/machine/tinker-board.conf | 16 +---------------
3 files changed, 17 insertions(+), 30 deletions(-)
create mode 100644 conf/machine/include/tinker.inc

diff --git a/conf/machine/include/tinker.inc b/conf/machine/include/tinker.inc
new file mode 100644
index 0000000..e851b59
--- /dev/null
+++ b/conf/machine/include/tinker.inc
@@ -0,0 +1,15 @@
+require conf/machine/include/rk3288.inc
+
+WKS_FILE ?= "tinker-board.wks"
+IMAGE_FSTYPES += "wic wic.bmap"
+
+WKS_FILE_DEPENDS ?= " \
+ mtools-native \
+ dosfstools-native \
+ virtual/bootloader \
+ virtual/kernel \
+ "
+IMAGE_BOOT_FILES ?= "\
+ ${KERNEL_IMAGETYPE} \
+ ${KERNEL_DEVICETREE} \
+ "
diff --git a/conf/machine/tinker-board-s.conf b/conf/machine/tinker-board-s.conf
index f7b17e4..9f44f2f 100644
--- a/conf/machine/tinker-board-s.conf
+++ b/conf/machine/tinker-board-s.conf
@@ -5,23 +5,9 @@
#@NAME: Tinker-S RK3288
#@DESCRIPTION: ASUS Tinker Board is a Raspberry Pi 3 Alternative based on Rockchip RK3288 Processor.

-require conf/machine/include/rk3288.inc
+require conf/machine/include/tinker.inc

KERNEL_DEVICETREE = "rk3288-tinker-s.dtb"
UBOOT_MACHINE = "tinker-s-rk3288_defconfig"

RK_BOOT_DEVICE ?= "mmcblk1"
-
-WKS_FILE ?= "tinker-board.wks"
-IMAGE_FSTYPES += "wic wic.bmap"
-
-WKS_FILE_DEPENDS ?= " \
- mtools-native \
- dosfstools-native \
- virtual/bootloader \
- virtual/kernel \
- "
-IMAGE_BOOT_FILES ?= "\
- ${KERNEL_IMAGETYPE} \
- ${KERNEL_DEVICETREE} \
- "
diff --git a/conf/machine/tinker-board.conf b/conf/machine/tinker-board.conf
index 1c3c08a..8fe5f63 100644
--- a/conf/machine/tinker-board.conf
+++ b/conf/machine/tinker-board.conf
@@ -5,21 +5,7 @@
#@NAME: Tinker RK3288
#@DESCRIPTION: ASUS Tinker Board is a Raspberry Pi 3 Alternative based on Rockchip RK3288 Processor.

-require conf/machine/include/rk3288.inc
+require conf/machine/include/tinker.inc

KERNEL_DEVICETREE = "rk3288-tinker.dtb"
UBOOT_MACHINE = "tinker-rk3288_defconfig"
-
-WKS_FILE ?= "tinker-board.wks"
-IMAGE_FSTYPES += "wic wic.bmap"
-
-WKS_FILE_DEPENDS ?= " \
- mtools-native \
- dosfstools-native \
- virtual/bootloader \
- virtual/kernel \
- "
-IMAGE_BOOT_FILES ?= "\
- ${KERNEL_IMAGETYPE} \
- ${KERNEL_DEVICETREE} \
- "
--
2.30.0.rc0

Join yocto@lists.yoctoproject.org to automatically receive all group messages.