Skip to content

Commit

Permalink
Merge branch 'MichaIng:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniszewski
daniszewski authored Nov 13, 2024
2 parents 0839b36 + 5f69eeb commit 6a2cd12
Show file tree
Hide file tree
Showing 58 changed files with 3,958 additions and 2,062 deletions.
87 changes: 19 additions & 68 deletions .build/images/OdroidXU4/boot.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@ ODROIDXU-UBOOT-CONFIG
setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff"

# MAC address configuration
setenv macaddr "00:1e:06:61:7a:72"

# Kernel command-line parameters
setenv bootrootfs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait ro console=ttySAC2,115200n8 console=tty1 consoleblank=0 net.ifnames=0"

# HDMI/DVI selection: "hdmi" or "dvi"
# - DVI mode disables HDMI sound
setenv vout "hdmi"

# HDMI Hot Plug Detect
# - "false" disables auto-detection and forces HDMI output.
# - "true" enables HDMI detection based on cable connection.
setenv HPD "true"

# HDMI CEC: "false" or "true", defaults to "true"
#setenv cecenable "true"

# Disable ODROID-VU7 touchscreen support: "false" or "true", defaults to "true"
#setenv disable_vu7 "true"

# ODROID CloudShell 2 TFT LCD and FAN control via I2C bus: "false" or "true", defaults to "false"
#setenv cs2enable "false"

# Device tree overlays
# - See /boot/dtb/overlays or /boot/dtb for available overlays (*.dtbo files): defaults to empty string ""
#setenv overlays "i2c0"

# DDR frequency [MHz]: "633", "728", "825" or "933", defaults to "825"
#setenv ddr_freq "825"

# HDMI resolution
# - Uncomment only ONE line! Leave all commented for automatic selection.
# - Uncomment only the setenv line!
Expand Down Expand Up @@ -123,71 +124,21 @@ setenv HPD "true"
#setenv videoconfig "drm_kms_helper.edid_firmware=edid/480x800.bin"
# -----------------------------------------------

# Disable ODROID-VU7 touchscreen support: "false" or "true", defaults to "true"
#setenv disable_vu7 "true"

# ODROID CloudShell 2 TFT LCD and FAN control via I2C bus: "false" or "true", defaults to "false"
#setenv cs2enable "false"

# Device tree overlays
# - See /boot/dtb/overlays for available overlays: defaults to empty string ""
#setenv overlays "i2c0"

# CPU governor
# - DietPi will override this setting to user configured in dietpi-config > Performance Options > CPU governor
setenv governor "performance"

# DDR frequency [MHz]: "633", "728", "825" or "933", defaults to "825"
#setenv ddr_freq "825"

# TMDS data amplitude control.
# - 1LSB corresponds to 20 mVdiff amplitude level
# - tx_amp_lvl : 0 = 760 mVdiff(Min), 31 = 1380 mVdiff(Max)
# - Hardkernel default: hdmi_tx_amp_lvl = 31(1380 mVdiff)
setenv hdmi_tx_amp_lvl "31"

# TMDS data amplitude fine control for each channel
# - 1LSB corresponds to 20 mVdiff amplitude level
# - tx_lvl : 0 = 0 mVdiff(Min), 3 = 60 mVdiff(Max)
# - Hardkernel default: hdmi_tx_lvl_ch0=hdmi_tx_lvl_ch1=hdmi_tx_lvl_ch2 = 3
setenv hdmi_tx_lvl_ch0 "3"
setenv hdmi_tx_lvl_ch1 "3"
setenv hdmi_tx_lvl_ch2 "3"

# TMDS data pre-emphasis level control
# - 1LSB corresponds to -0.45dB emphasis level except for 1
# - tx_emp_lvl : 0 = 0 db(Min), 1 = -0.25 db, 2 = 0.7 db, 15 = -7.45 db(Max)
# - Hardkernel default: hdmi_tx_emp_lvl = 6 (-2.50 db)
setenv hdmi_tx_emp_lvl "6"

# TMDS clock amplitude control
# - 1LSB corresponds to 20 mVdiff amplitude level.
# - clk_amp_lvl : 0 = 790 mVdiff(Min), 31 = 1410 mVdiff(Max)
# - Hardkernel default hdmi_clk_amp_lvl = 31 (1410 mVdiff)
setenv hdmi_clk_amp_lvl "31"

# TMDS data source termination resistor control
# - tx_res : 0 = Source Termination OFF(Min), 1 = 200 ohm, 2 = 300 ohm, 3 = 120 ohm(Max)
# - Hardkernel default hdmi_tx_res = 0 (Source Termination OFF)
setenv hdmi_tx_res "0"

### DO NOT EDIT ANYTHING BELOW THIS LINE ###

setenv hdmi_phy_control "hdmi_tx_amp_lvl=${hdmi_tx_amp_lvl} hdmi_tx_lvl_ch0=${hdmi_tx_lvl_ch0} hdmi_tx_lvl_ch1=${hdmi_tx_lvl_ch1} hdmi_tx_lvl_ch2=${hdmi_tx_lvl_ch2} hdmi_tx_emp_lvl=${hdmi_tx_emp_lvl} hdmi_clk_amp_lvl=${hdmi_clk_amp_lvl} hdmi_tx_res=${hdmi_tx_res} HPD=${HPD} vout=${vout}"

# Load kernel, initrd and dtb in that sequence
ext4load mmc 0:1 0x40008000 /boot/zImage || fatload mmc 0:1 0x40008000 zImage || ext4load mmc 0:1 0x40008000 zImage
ext4load mmc 0:1 0x42000000 /boot/uInitrd || fatload mmc 0:1 0x42000000 uInitrd || ext4load mmc 0:1 0x42000000 uInitrd
load mmc 0:1 0x40008000 /boot/zImage || load mmc 0:1 0x40008000 zImage
load mmc 0:1 0x42000000 /boot/uInitrd || load mmc 0:1 0x42000000 uInitrd
if test "${board_name}" = "xu4"; then setenv fdtfile "exynos5422-odroidxu4.dtb"; fi
if test "${board_name}" = "xu3"; then setenv fdtfile "exynos5422-odroidxu3.dtb"; fi
if test "${board_name}" = "xu3l"; then setenv fdtfile "exynos5422-odroidxu3-lite.dtb"; fi
if test "${board_name}" = "hc1"; then setenv fdtfile "exynos5422-odroidhc1.dtb"; fi
ext4load mmc 0:1 0x44000000 /boot/dtb/${fdtfile} || fatload mmc 0:1 0x44000000 dtb/${fdtfile} || ext4load mmc 0:1 0x44000000 dtb/${fdtfile}
load mmc 0:1 0x44000000 /boot/dtb/${fdtfile} || load mmc 0:1 0x44000000 dtb/${fdtfile}

# Set FDT address
fdt addr 0x44000000

if test "${cecenable}" = "false"; then fdt rm /cec@101B0000; fi
if test "${cecenable}" = "false"; then fdt rm /soc/cec@101b0000; fi
if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi

# Add overlays for CloudShell
Expand All @@ -205,7 +156,7 @@ fi
if test "x${overlays}" != "x"; then
fdt resize 8192
for overlay in ${overlays}; do
ext4load mmc 0:1 0x60000000 /boot/dtb/overlays/${overlay}.dtbo || fatload mmc 0:1 0x60000000 dtb/overlays/${overlay}.dtbo || ext4load mmc 0:1 0x60000000 dtb/overlays/${overlay}.dtbo
load mmc 0:1 0x60000000 /boot/dtb/${overlay}.dtbo || load mmc 0:1 0x60000000 /boot/dtb/overlays/${overlay}.dtbo || load mmc 0:1 0x60000000 dtb/${overlay}.dtbo || load mmc 0:1 0x60000000 dtb/overlays/${overlay}.dtbo
fdt apply 0x60000000
done
fi
Expand All @@ -214,7 +165,7 @@ fi
if test "x${ddr_freq}" != "x"; then dmc "${ddr_freq}"; fi

# Final boot args (DRM debugging: drm.debug=0xff)
setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control} ${hid_quirks}"
setenv bootargs "${bootrootfs} ${videoconfig} ${hid_quirks}"

# Boot the board
bootz 0x40008000 0x42000000 0x44000000
5 changes: 5 additions & 0 deletions .build/images/Quartz64/quartz64_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
CONFIG_CRYPTO_SHA3_ARM64=m
CONFIG_CRYPTO_SHA512_ARM64_CE=m
CONFIG_CRYPTO_SM3_ARM64_CE=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CUSE=m
CONFIG_DEBUG_FS=y
Expand All @@ -158,6 +159,7 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DMADEVICES=y
CONFIG_DMA_CMA=y
CONFIG_DM_CRYPT=m
CONFIG_DM_MIRROR=m
CONFIG_DM_ZERO=m
CONFIG_DRM=y
Expand Down Expand Up @@ -208,6 +210,7 @@ CONFIG_ENERGY_MODEL=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXTCON_ADC_JACK=y
CONFIG_EXTCON_GPIO=y
CONFIG_EXTCON_USB_GPIO=y
Expand Down Expand Up @@ -543,6 +546,7 @@ CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_GATE=m
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_BPF=m
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_DSA=m
Expand Down Expand Up @@ -842,6 +846,7 @@ CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_SATA_MV=y
CONFIG_SATA_SIL24=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_AUTOGROUP=y
# CONFIG_SCHED_DEBUG is not set
CONFIG_SCHED_MC=y
Expand Down
Loading

0 comments on commit 6a2cd12

Please sign in to comment.