On Mon 2021-06-28 @ 11:15:41 AM, Trevor Woerner wrote: > By exporting a couple more variables the wks file for every rockchip device > can be built from one template instead of having separate wks files for each > board and platform. > > The following BSP variables were checked before and after this change to make > sure they remained valid/sensible: > - WKS_FILE > - UBOOT_SUFFIX > - SPL_BINARY > - IMAGE_FSTYPES > > Built-tested for every MACHINE in this BSP. > > Run-tested on the following devices to ensure they continue to boot correctly > to a cmdline (core-image-base): > - tinker-board > - rock-pi-e > - rock-pi-4b > - rock64 > - nanopi-m4-2gb > > Signed-off-by: Trevor Woerner <twoer...@gmail.com> > --- > conf/machine/firefly-rk3288.conf | 2 -- > conf/machine/include/nanopi-m4.inc | 1 - > conf/machine/include/rk3288.inc | 3 +-- > conf/machine/include/rk3328.inc | 1 - > conf/machine/include/rk3399.inc | 2 -- > conf/machine/include/rock-pi-4.inc | 1 - > conf/machine/include/rockchip-wic.inc | 5 +++++ > conf/machine/include/tinker.inc | 2 -- > conf/machine/rock-pi-e.conf | 2 -- > conf/machine/rock64.conf | 2 -- > conf/machine/vyasa-rk3288.conf | 1 - > wic/firefly-rk3288.wks | 7 ------- > wic/rk3288-boot.wks | 24 ------------------------ > wic/rk3399-boot.wks | 24 ------------------------ > wic/rock-pi-4.wks | 7 ------- > wic/rock-pi-e.wks | 4 ---- > wic/{rk3328-boot.wks => rockchip.wks} | 9 ++++++--- > wic/tinker-board.wks | 8 -------- > wic/vyasa-rk3288.wks | 8 -------- > 19 files changed, 12 insertions(+), 101 deletions(-) > delete mode 100644 wic/firefly-rk3288.wks > delete mode 100644 wic/rk3288-boot.wks > delete mode 100644 wic/rk3399-boot.wks > delete mode 100644 wic/rock-pi-4.wks > delete mode 100644 wic/rock-pi-e.wks > rename wic/{rk3328-boot.wks => rockchip.wks} (64%) > delete mode 100644 wic/tinker-board.wks > delete mode 100644 wic/vyasa-rk3288.wks > > diff --git a/conf/machine/firefly-rk3288.conf > b/conf/machine/firefly-rk3288.conf > index 138e840..3270bb9 100644
Applied to meta-rockchip master.
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#54026): https://lists.yoctoproject.org/g/yocto/message/54026 Mute This Topic: https://lists.yoctoproject.org/mt/83847095/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-