Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lec-px3: Port changes #24

Merged
12 commits merged into from
Jan 19, 2021
Merged

lec-px3: Port changes #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e43a1f3
conf/layer: Mask u-boot in meta-nano-pc4
acostach Jan 14, 2021
9ef19c5
conf/samples: Add lec-px30 machine
acostach Jan 14, 2021
17b0d61
lec-px30: Add coffee file
acostach Jan 14, 2021
0f067d0
u-boot: Changes for lec-px30
acostach Jan 14, 2021
10378c6
conf/machine: Add lec-px30
acostach Jan 14, 2021
3ca1acd
rkbin: Add lec-px30 configuration support
acostach Jan 14, 2021
f62f5e2
linux-rockchip: Add lec-px30 support patches
acostach Jan 14, 2021
c82ee7c
layers/meta-balena: Update to v2.67.3
acostach Jan 15, 2021
79ed331
lec-px30: Re-use nanopc svg for now
acostach Jan 18, 2021
91350f9
lec-px30: Remove coffee file and icon
acostach Jan 19, 2021
46846f4
smarc-px30: Add coffee and svg files for this device type
acostach Jan 19, 2021
281552f
smarc-px30: Add yocto machine
acostach Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layers/meta-balena
Open in desktop
Submodule meta-balena updated 273 files
2 changes: 2 additions & 0 deletions layers/meta-balena-nanopc-t4/conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ BBFILE_COLLECTIONS += "balena-nanopc-t4"
BBFILE_PATTERN_balena-nanopc-t4 := "^${LAYERDIR}/"
BBFILE_PRIORITY_balena-nanopc-t4 = "1337"

BBMASK += "/meta-nanopc-t4/recipes-bsp/u-boot/u-boot-rockchip.bb"

LAYERSERIES_COMPAT_balena-nanopc-t4 = "thud"
24 changes: 24 additions & 0 deletions layers/meta-balena-nanopc-t4/conf/machine/lec-px30.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#@TYPE: Machine
#@NAME: ADLINK LEC-PX30
#@SOC: Rockchip PX30
#@DESCRIPTION: Machine configuration for ADLINK LEC-PX30

require conf/machine/include/arm/arch-armv8.inc
require conf/machine/include/soc-family.inc
# require conf/machine/include/px30.inc

PREFERRED_PROVIDER_virtual/bootloader = "u-boot-rockchip"
PREFERRED_PROVIDER_virtual/kernel = "linux-rockchip"
PREFERRED_VERSION_linux-rockchip = "4.4.185%"

UBOOT_MACHINE = "evb-px30_defconfig"

KERNEL_IMAGETYPE = "Image"

SERIAL_CONSOLES = "1500000;ttyFIQ0"

#KBUILD_DEFCONFIG = "lec-px30_config"

KERNEL_DEVICETREE = "rockchip/px30-evb-ddr3-v10-linux.dtb"

MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree rkbin-wifi"
6 changes: 6 additions & 0 deletions layers/meta-balena-nanopc-t4/conf/machine/smarc-px30.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#@TYPE: Machine
##@NAME: smarc-px30
##@DESCRIPTION: Machine configuration for the I-Pi SMARC PX30

MACHINEOVERRIDES = "lec-px30:${MACHINE}"
include conf/machine/lec-px30.conf
2 changes: 1 addition & 1 deletion layers/meta-balena-nanopc-t4/conf/samples/local.conf.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Supported machines
#MACHINE ?= "nanopc-t4"

#MACHINE ?= "lec-px30"
BALENA_STORAGE = "overlay2"

# More info meta-resin/README.md
Expand Down
15 changes: 15 additions & 0 deletions layers/meta-balena-nanopc-t4/recipes-bsp/rkbin/files/PX30TRUST.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[VERSION]
MAJOR=1
MINOR=0
[BL30_OPTION]
SEC=0
[BL31_OPTION]
SEC=1
PATH=rk33/px30_bl31_v1.14.elf
ADDR=0x00040000
[BL32_OPTION]
SEC=0
[BL33_OPTION]
SEC=0
[OUTPUT]
PATH=trust.img
15 changes: 15 additions & 0 deletions layers/meta-balena-nanopc-t4/recipes-bsp/rkbin/rkbin_git.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FILESEXTRAPATHS_append := ":${THISDIR}/files"

SRC_URI_append_lec-px30 = " \
file://PX30TRUST.ini \
"

do_compile_lec-px30() {
cp ${WORKDIR}/PX30TRUST.ini .
tools/trust_merger PX30TRUST.ini
}

do_deploy_append_lec-px30 () {
install -m 755 ${S}/rk33/px30_ddr_333MHz_v1.10.bin ${DEPLOYDIR}/rkbin
install -m 755 ${S}/rk33/px30_miniloader_v1.15.bin ${DEPLOYDIR}/rkbin
}
Loading