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.

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

62sip fix #32

Merged
merged 3 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 builds.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ builds = [
[am62sip-bookworm-09.01.00.008]
machine = "am62xxsip-evm"
bsp_version = "09.01.00.008"
distro_variant = "am62sip-bookworm"
distro_variant = "am62-bookworm"

[am64-bookworm-09.01.00.008]
machine = "am64xx-evm"
Expand Down
1 change: 1 addition & 0 deletions configs/bdebstrap_configs/am62-bookworm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ mmdebstrap:
- 'chroot "$1" mkdir -p /etc/default/'
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
1 change: 1 addition & 0 deletions configs/bdebstrap_configs/am62p-bookworm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ mmdebstrap:
- 'chroot "$1" mkdir -p /etc/default/'
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
104 changes: 0 additions & 104 deletions configs/bdebstrap_configs/am62sip-bookworm.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion configs/machines.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
optee_make_args = "."
sysfw_soc = "am62x"
dmfw_machine = "am62xx"
uboot_r5_defconfig = "am62x_evm_r5_defconfig am62xsip_sk_r5.config"
uboot_r5_defconfig = "am62x_evm_r5_defconfig,am62xsip_sk_r5.config"
uboot_a53_defconfig = "am62x_evm_a53_defconfig"

[am64xx-evm]
Expand Down
1 change: 1 addition & 0 deletions scripts/build_bsp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ function build_uboot() {
machine=$1

uboot_r5_defconfig=($(read_machine_config ${machine} uboot_r5_defconfig))
uboot_r5_defconfig=`echo $uboot_r5_defconfig | tr ',' ' '`
uboot_a53_defconfig=($(read_machine_config ${machine} uboot_a53_defconfig))
sysfw_soc=($(read_machine_config ${machine} sysfw_soc))

Expand Down