From af3c63dad2631ee55f51244704c646da34475ad9 Mon Sep 17 00:00:00 2001 From: Sai Sree Kartheek Adivi Date: Tue, 12 Dec 2023 20:31:25 +0530 Subject: [PATCH 1/3] AM62SIP: Fix u-boot build for AM62SIP AM62SIP uboot requires a config fragment along with the base defconfig. The current implementation is not able to handle space separated string which results in build without the config fragment. So handle the fragments properly. Signed-off-by: Sai Sree Kartheek Adivi --- configs/machines.toml | 2 +- scripts/build_bsp.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/machines.toml b/configs/machines.toml index b11c1a8..e7cfd7d 100644 --- a/configs/machines.toml +++ b/configs/machines.toml @@ -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] diff --git a/scripts/build_bsp.sh b/scripts/build_bsp.sh index 7986d98..acb74a2 100755 --- a/scripts/build_bsp.sh +++ b/scripts/build_bsp.sh @@ -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)) From 85f1eff9e8aed231db49d75d9cb475911938c1f1 Mon Sep 17 00:00:00 2001 From: Sai Sree Kartheek Adivi Date: Tue, 12 Dec 2023 20:38:25 +0530 Subject: [PATCH 2/3] AM62SIP: Use AM62 bdebstrap config for AM62SIP as well Both AM62 and AM62SIP configs are almost identical and the only difference is starting weston on startup. Weston works well on boot on AM62SIP so enable it by default. Signed-off-by: Sai Sree Kartheek Adivi --- builds.toml | 2 +- .../bdebstrap_configs/am62sip-bookworm.yaml | 104 ------------------ 2 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 configs/bdebstrap_configs/am62sip-bookworm.yaml diff --git a/builds.toml b/builds.toml index 9a1377a..5ca8355 100644 --- a/builds.toml +++ b/builds.toml @@ -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" diff --git a/configs/bdebstrap_configs/am62sip-bookworm.yaml b/configs/bdebstrap_configs/am62sip-bookworm.yaml deleted file mode 100644 index e28d808..0000000 --- a/configs/bdebstrap_configs/am62sip-bookworm.yaml +++ /dev/null @@ -1,104 +0,0 @@ ---- -mmdebstrap: - architectures: - - arm64 - mode: auto - keyrings: - - /usr/share/keyrings/debian-archive-keyring.gpg - suite: bookworm - variant: standard - components: - - main - - contrib - - non-free-firmware - packages: - - build-essential - - gpg - - curl - - firmware-ti-connectivity - - init - - iproute2 - - less - - libdrm-dev - - libpam-systemd - - locales - - neofetch - - network-manager - - net-tools - - openssh-server - - sudo - - vim - - k3conf - - weston - - alsa-utils - - libasound2-plugins - - gstreamer1.0-tools - - gstreamer1.0-plugins-base - - gstreamer1.0-plugins-good - - gstreamer1.0-plugins-bad - - i2c-tools - - linux-image-6.1.46-k3 - - linux-headers-6.1.46-k3 - - linux-libc-dev - - cryptodev-linux-dkms - - ti-img-rogue-driver-am62-dkms - - ti-img-rogue-firmware-am62 - - ti-img-rogue-tools-am62 - - ti-img-rogue-umlibs-am62 - - firmware-ti-ipc-am62 - - firmware-cnm-wave - - libti-rpmsg-char - - libti-rpmsg-char-dev - - libd3dadapter9-mesa-dev - - libd3dadapter9-mesa - - libegl-mesa0 - - libegl1-mesa - - libgbm1 - - libgl1-mesa-dri - - libgl1-mesa-glx - - libglapi-mesa - - libgles2-mesa - - libglx-mesa0 - - libosmesa6 - - libwayland-egl1-mesa - - mesa-opencl-icd - - mesa-va-drivers - - mesa-vdpau-drivers - - mesa-vulkan-drivers - mirrors: - - http://deb.debian.org/debian - setup-hooks: - # Setup TI Debian Package Repository - - 'mkdir -p $1/etc/apt/sources.list.d/' - - 'wget https://raw.githubusercontent.com/TexasInstruments/ti-debpkgs/main/ti-debpkgs.sources -P $1/etc/apt/sources.list.d/' - # Setup Apt repository preferences - - 'mkdir -p $1/etc/apt/preferences.d/' - - 'printf "Package: *\nPin: origin TexasInstruments.github.io\nPin-Priority: 1001" >> $1/etc/apt/preferences.d/ti-debpkgs' - # Setup Kernel post-install scripts - - 'mkdir -p $1/etc/kernel/postinst.d/' - - 'echo "PWD = $PWD"' - - 'upload target/kernel/postinst.d/cp-kernel-and-overlays /etc/kernel/postinst.d/cp-kernel-and-overlays' - - 'chmod a+x $1/etc/kernel/postinst.d/cp-kernel-and-overlays' - essential-hooks: - # FIXME: Find a better workaround instead of sleep - - 'sleep 10' # workaround for /proc resource busy unable to umount issue - customize-hooks: - # Remove passwd for root user - - 'chroot "$1" passwd --delete root' - # Fix apt install mandb permission issue - - 'chroot "$1" chown -R man: /var/cache/man/' - - 'chroot "$1" chmod -R 755 /var/cache/man/' - # update packages to avoid mandatory update after first boot - - 'chroot "$1" apt-get update' - # Setup .bashrc for clean command-line experience - - 'chroot "$1" cp /etc/skel/.bashrc ~/.bashrc' - # Weston Service and Config Files - - 'chroot "$1" mkdir -p /etc/systemd/system/' - - 'upload target/weston/weston.service /etc/systemd/system/weston.service' - - 'upload target/weston/weston.socket /etc/systemd/system/weston.socket' - - 'chroot "$1" mkdir -p /etc/default/' - - 'upload target/weston/weston /etc/default/weston' - # 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' - From 54f458ccc47ec0b07eef971223ab163989d0e7cd Mon Sep 17 00:00:00 2001 From: Sai Sree Kartheek Adivi Date: Tue, 12 Dec 2023 20:43:35 +0530 Subject: [PATCH 3/3] AM62* bdebstrap_configs: set WAYLAND_DISPLAY by default WAYLAND_DISPLAY has to be explicitly set for applications to be able to launch when run from UART Console or SSH console. Signed-off-by: Sai Sree Kartheek Adivi --- configs/bdebstrap_configs/am62-bookworm.yaml | 1 + configs/bdebstrap_configs/am62p-bookworm.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/bdebstrap_configs/am62-bookworm.yaml b/configs/bdebstrap_configs/am62-bookworm.yaml index 14b0f85..795164c 100644 --- a/configs/bdebstrap_configs/am62-bookworm.yaml +++ b/configs/bdebstrap_configs/am62-bookworm.yaml @@ -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' diff --git a/configs/bdebstrap_configs/am62p-bookworm.yaml b/configs/bdebstrap_configs/am62p-bookworm.yaml index 72dd9fa..e585072 100644 --- a/configs/bdebstrap_configs/am62p-bookworm.yaml +++ b/configs/bdebstrap_configs/am62p-bookworm.yaml @@ -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'