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

Add board config for MXQ TV box #7501

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
19 changes: 19 additions & 0 deletions config/boards/aml-s805-mxq.tvb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# MXQ TV box based on Amlogic S805 quad core 1GB RAM SoC GBE
BOARD_NAME="MXQ"
BOARDFAMILY="meson8b"
BOARD_MAINTAINER=""
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
BOOTCONFIG="none"
BOOTSCRIPT="boot-aml-s805-mxq.cmd:boot.cmd"
# The preinstalled U-BOOT looks for this script
BOOTSCRIPT_OUTPUT="s805_autoscript"
BOOTENV_FILE="aml-s805-mxq.txt"

BOOTSIZE="200"
BOOTFS_TYPE="fat"
BOOT_LOGO=desktop

family_tweaks() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename to:
function post_family_tweaks__aml_s805_logo() {

And does logo shows?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't recall seeing the logo. I don't install the image to builtin memory. I rely on the factory intalled u-boot to load armbian from SD card. That's why some content of the boot partition are unused, at least for now. This fragment is left over after starting from other board's config.
I will remove it.

I am away from home and have no access to the test device. I will update and test, but it will be sometime in January.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will remove it.

OK, it probably doesn't work.

but it will be sometime in January.

No worries.

cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
}
3 changes: 3 additions & 0 deletions config/bootenv/aml-s805-mxq.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dtb_file=/dtb/meson8b-mxq.dtb

# The following contents are auto-generated.
45 changes: 45 additions & 0 deletions config/bootscripts/boot-aml-s805-mxq.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# DO NOT EDIT THIS FILE
#
# Please edit /boot/armbianEnv.txt to set supported parameters
#

setenv rootdev "LABEL=armbi_root"
setenv rootfstype "ext4"

# Default Console Device Setting
setenv console "both"
setenv verbosity "1"

# Enable/Disable USB autosuspend (seems broken on current (6.x) kernels)
# 0 = disabled
# 1 = enabled
setenv usb_autosuspend "0"

# Find the bootdev
# Same order is followed as in factory U-BOOT, when searching for this script,
# so same device should be found.
# We can't use `test -z` due to the bug: https://lists.denx.de/pipermail/u-boot/2005-August/011447.html
env set bootdev ""
if test -n "${bootdev}"; test $? != 0; then if fatload usb 0 11000000 s805_autoscript; then env set bootdev "usb 0"; fi; fi;
if test -n "${bootdev}"; test $? != 0; then if fatload usb 1 11000000 s805_autoscript; then env set bootdev "usb 1"; fi; fi;
if test -n "${bootdev}"; test $? != 0; then if fatload usb 2 11000000 s805_autoscript; then env set bootdev "usb 2"; fi; fi;
if test -n "${bootdev}"; test $? != 0; then if fatload usb 3 11000000 s805_autoscript; then env set bootdev "usb 3"; fi; fi;
if test -n "${bootdev}"; test $? != 0; then if fatload mmc 0 11000000 s805_autoscript; then env set bootdev "mmc 0"; fi; fi;

fatload ${bootdev} 0x20800000 /armbianEnv.txt && env import -t 0x20800000 ${filesize}

###########################################
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyAML0,115200n8 ${consoleargs}"; fi
setenv consoleargs "${consoleargs} no_console_suspend consoleblank=0"
if test "${usb_autosuspend}" = "0"; then setenv extraargs "usbcore.autosuspend=-1"; fi

# Boot Arguments
setenv bootargs "root=${rootdev} rootwait rw ${consoleargs} rootfstype=${rootfstype} loglevel=${verbosity} ${extraargs}"

# Booting
fatload "${bootdev}" 0x20800000 /uImage
fatload "${bootdev}" 0x22000000 /uInitrd
fatload "${bootdev}" 0x21800000 "${dtb_file}"

bootm 0x20800000 0x22000000 0x21800000
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
From 0a16d190127f66d1955482d7f896f2f8fc637218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Tue, 29 Oct 2024 19:31:00 +0100
Subject: meson8b-mxq: add HDMI support

Copied from 0066-ARM-dts-meson8b-odroid-c1-enable-HDMI-for-the-Odroid.patch

---
arch/arm/boot/dts/amlogic/meson8b-mxq.dts | 60 +++++++++++++++++++++++
1 file changed, 60 insertions(+)

diff --git a/arch/arm/boot/dts/amlogic/meson8b-mxq.dts b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts
index 7adedd3258c3..43e9ea14da2f 100644
--- a/arch/arm/boot/dts/amlogic/meson8b-mxq.dts
+++ b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts
@@ -27,6 +27,50 @@ memory {
reg = <0x40000000 0x40000000>;
};

+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_connector_in: endpoint {
+ remote-endpoint = <&hdmi_tx_tmds_out>;
+ };
+ };
+ };
+
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "ODROID-C1";
+
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-rates = <294912000>,
+ <270950400>;
+
+ dai-link-0 {
+ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
+ };
+
+ dai-link-1 {
+ sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
+ dai-format = "i2s";
+ mclk-fs = <256>;
+
+ codec-0 {
+ sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
+ };
+ };
+
+ dai-link-2 {
+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
+
+ codec-0 {
+ sound-dai = <&hdmi_tx 0>;
+ };
+ };
+ };
+
vcck: regulator-vcck {
compatible = "pwm-regulator";

@@ -91,6 +135,22 @@ vddee: regulator-vddee {
};
};

+&aiu {
+ status = "okay";
+};
+
+&hdmi_tx {
+ status = "okay";
+ pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+ pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+ hdmi_tx_tmds_out: endpoint {
+ remote-endpoint = <&hdmi_connector_in>;
+ };
+};
+
&cpu0 {
cpu-supply = <&vcck>;
};
--
2.39.5