mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-08-07 20:27:41 +00:00
Compare commits
No commits in common. "dev" and "2.3" have entirely different histories.
@ -1,3 +1,7 @@
|
|||||||
# Ignore everything except what we really need
|
# We don't need this folder because we map the hole folder
|
||||||
*
|
buildroot/
|
||||||
!scripts/
|
buildroot-external/
|
||||||
|
buildroot-patches/
|
||||||
|
|
||||||
|
# Ignore too
|
||||||
|
release/
|
||||||
|
|||||||
126
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
126
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -1,126 +0,0 @@
|
|||||||
name: Report an issue with Home Assistant Operating System
|
|
||||||
description: Report an issue related to the Home Assistant Operating System.
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Make sure to test with the last version of the Operating System before reporting a bug.
|
|
||||||
If the bug appears to be a regression, make sure to check if the bug indeed disappears
|
|
||||||
from the previous version. Use `ha os update --version x.y` command to downgrade.
|
|
||||||
- type: textarea
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: Describe the issue you are experiencing
|
|
||||||
description: Provide a clear and concise description of what the bug is.
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
## Environment
|
|
||||||
- type: dropdown
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: What operating system image do you use?
|
|
||||||
default: 0
|
|
||||||
options:
|
|
||||||
- generic-x86-64 (Generic UEFI capable x86-64 systems)
|
|
||||||
- generic-aarch64 (Generic UEFI capable aarch64 systems)
|
|
||||||
- khadas-vim3 (Khadas VIM3)
|
|
||||||
- odroid-c2 (Hardkernel ODROID-C2)
|
|
||||||
- odroid-c4 (Hardkernel ODROID-C4)
|
|
||||||
- odroid-m1 (Hardkernel ODROID-M1)
|
|
||||||
- odroid-m1s (Hardkernel ODROID-M1S)
|
|
||||||
- odroid-n2 (Hardkernel ODROID-N2/N2+)
|
|
||||||
- odroid-xu4 (Hardkernel ODROID-XU4)
|
|
||||||
- ova (for Virtual Machines)
|
|
||||||
- rpi2 (Raspberry Pi 2)
|
|
||||||
- rpi3 (Raspberry Pi 3 32-bit OS)
|
|
||||||
- rpi3-64 (Raspberry Pi 3 64-bit OS)
|
|
||||||
- rpi4 (Raspberry Pi 4/400 32-bit OS)
|
|
||||||
- rpi4-64 (Raspberry Pi 4/400 64-bit OS)
|
|
||||||
- rpi5-64 (Raspberry Pi 5 64-bit OS)
|
|
||||||
- tinker (ASUS Tinker Board/Tinker Board S)
|
|
||||||
- yellow (Home Assistant Yellow)
|
|
||||||
- green (Home Assistant Green)
|
|
||||||
description: >
|
|
||||||
Can be found in [Settings -> System -> Repairs -> System Information](https://my.home-assistant.io/redirect/system_health/). It is listed as the `Board` value.
|
|
||||||
|
|
||||||
[](https://my.home-assistant.io/redirect/system_health/)
|
|
||||||
- type: input
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: What version of Home Assistant Operating System is installed?
|
|
||||||
placeholder: "6.6"
|
|
||||||
description: >
|
|
||||||
Can be found in [Settings -> System -> Repairs -> System Information (top right menu)](https://my.home-assistant.io/redirect/system_health/). It is listed as the `Host Operating System` value.
|
|
||||||
- type: dropdown
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: Did the problem occur after upgrading the Operating System?
|
|
||||||
default: 0
|
|
||||||
options:
|
|
||||||
- "No"
|
|
||||||
- "Yes"
|
|
||||||
- type: textarea
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: Hardware details
|
|
||||||
description: >
|
|
||||||
Provide details about the hardware used for your install.
|
|
||||||
This is especially important for bare-metal x86 installations.
|
|
||||||
If you have any USB devices attached, please list them here.
|
|
||||||
For VMs, include the hypervisor type and version.
|
|
||||||
- type: textarea
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: Steps to reproduce the issue
|
|
||||||
description: |
|
|
||||||
Please tell us exactly how to reproduce your issue.
|
|
||||||
Provide clear and concise step by step instructions and add code snippets if needed.
|
|
||||||
value: |
|
|
||||||
1.
|
|
||||||
2.
|
|
||||||
3.
|
|
||||||
...
|
|
||||||
- type: textarea
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: Anything in the Supervisor logs that might be useful for us?
|
|
||||||
description: >
|
|
||||||
Supervisor Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/?provider=supervisor)
|
|
||||||
then choose `Supervisor` in the top right. Alternatively enter `ha supervisor logs` in the Home Assistant CLI.
|
|
||||||
|
|
||||||
[](https://my.home-assistant.io/redirect/logs/?provider=supervisor)
|
|
||||||
render: txt
|
|
||||||
- type: textarea
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
attributes:
|
|
||||||
label: Anything in the Host logs that might be useful for us?
|
|
||||||
description: >
|
|
||||||
Host Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/?provider=host)
|
|
||||||
then choose `Host` in the top right. Alternatively enter `ha host logs` in the Home Assistant CLI.
|
|
||||||
render: txt
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: System information
|
|
||||||
description: >
|
|
||||||
**Optional** Copy the full System Health in this text area.
|
|
||||||
|
|
||||||
System information can be found in [Settings -> System -> Repairs -> System Information (top right menu)](https://my.home-assistant.io/redirect/system_health/),
|
|
||||||
Click the copy button at the bottom of the pop-up and paste it here.
|
|
||||||
|
|
||||||
[](https://my.home-assistant.io/redirect/system_health/)
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Additional information
|
|
||||||
description: >
|
|
||||||
**Optional** If you have any additional information for us, use the field below.
|
|
||||||
Please note, you can attach screenshots or screen recordings here, by
|
|
||||||
dragging and dropping files in the field below.
|
|
||||||
21
.github/ISSUE_TEMPLATE/config.yml
vendored
21
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,21 +0,0 @@
|
|||||||
blank_issues_enabled: false
|
|
||||||
contact_links:
|
|
||||||
- name: Report incorrect or missing information on our documentation
|
|
||||||
url: https://github.com/home-assistant/home-assistant.io/issues
|
|
||||||
about: Our documentation has its own issue tracker. Please report issues with the website there.
|
|
||||||
|
|
||||||
- name: Report incorrect or missing information on our developer documentation
|
|
||||||
url: https://github.com/home-assistant/developers.home-assistant/issues
|
|
||||||
about: Our developer documentation has its own issue tracker. Please report issues with the website there.
|
|
||||||
|
|
||||||
- name: Request a feature for the Operating System
|
|
||||||
url: https://github.com/orgs/home-assistant/discussions
|
|
||||||
about: Request an new feature for the Operating System.
|
|
||||||
|
|
||||||
- name: I have a question or need support
|
|
||||||
url: https://www.home-assistant.io/help
|
|
||||||
about: We use GitHub for tracking bugs, check our website for resources on getting help.
|
|
||||||
|
|
||||||
- name: I'm unsure where to go?
|
|
||||||
url: https://www.home-assistant.io/join-chat
|
|
||||||
about: If you are unsure where to go, then joining our chat is recommended; Just ask!
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
name: 'Bump RPi Imager OS version'
|
|
||||||
description: 'Bump version of Home Assistant OS in RPi Imager'
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
required: true
|
|
||||||
description: "Version of Home Assistant OS to bump to."
|
|
||||||
release-date:
|
|
||||||
required: true
|
|
||||||
description: "Release date as ISO 8601 date string."
|
|
||||||
runs:
|
|
||||||
using: "composite"
|
|
||||||
steps:
|
|
||||||
- shell: bash
|
|
||||||
id: validate-input
|
|
||||||
env:
|
|
||||||
INPUTS_DATE: ${{ inputs.release-date }}
|
|
||||||
run: |
|
|
||||||
if [[ -z "$INPUTS_DATE" ]] || [[ ! "$INPUTS_DATE" =~ ^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$ ]]; then
|
|
||||||
echo "::error::Argument 'release-date' must be an ISO 8601 date string."
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
echo "date=$(date --date=${INPUTS_DATE} +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- shell: bash
|
|
||||||
run: git clone --depth 1 https://github.com/home-assistant/version.git /tmp/version
|
|
||||||
|
|
||||||
- shell: bash
|
|
||||||
env:
|
|
||||||
INPUTS_VERSION: ${{ inputs.version }}
|
|
||||||
run: |
|
|
||||||
function bump_entry() {
|
|
||||||
json=$1
|
|
||||||
version=$2
|
|
||||||
release_date=$3
|
|
||||||
image_id=$4
|
|
||||||
image_name=$5
|
|
||||||
url="https://github.com/home-assistant/operating-system/releases/download/${version}/haos_${image_id}-${version}.img.xz"
|
|
||||||
temp_image=$(mktemp --suffix=.img.xz)
|
|
||||||
temp_out=$(mktemp)
|
|
||||||
|
|
||||||
curl -fsL -o "$temp_image" "$url"
|
|
||||||
image_download_size=$(stat --printf="%s" "$temp_image")
|
|
||||||
image_download_sha256=$(sha256sum "$temp_image" | awk '{print $1}')
|
|
||||||
unxz "$temp_image"
|
|
||||||
temp_unpacked="${temp_image%.*}"
|
|
||||||
extract_size=$(stat --printf="%s" "$temp_unpacked")
|
|
||||||
extract_sha256=$(sha256sum "$temp_unpacked" | awk '{print $1}')
|
|
||||||
|
|
||||||
entry_name="Home Assistant OS ${version} (${image_name})"
|
|
||||||
|
|
||||||
jq '
|
|
||||||
. as $data
|
|
||||||
| $data
|
|
||||||
| .os_list = [
|
|
||||||
.os_list[]
|
|
||||||
| if .name | test("Home Assistant OS .* \\(" + $image_name + "\\)") then
|
|
||||||
.name = "Home Assistant OS " + $version + " (" + $image_name + ")"
|
|
||||||
| .url = $url
|
|
||||||
| .extract_size = ($extract_size | tonumber)
|
|
||||||
| .extract_sha256 = $extract_sha256
|
|
||||||
| .release_date = $release_date
|
|
||||||
| .image_download_size = ($image_download_size | tonumber)
|
|
||||||
| .image_download_sha256 = $image_download_sha256
|
|
||||||
else .
|
|
||||||
end
|
|
||||||
]' \
|
|
||||||
--arg version "$version" \
|
|
||||||
--arg image_name "$image_name" \
|
|
||||||
--arg entry_name "$entry_name" \
|
|
||||||
--arg release_date "$release_date" \
|
|
||||||
--arg url "$url" \
|
|
||||||
--arg image_download_size "$image_download_size" \
|
|
||||||
--arg image_download_sha256 "$image_download_sha256" \
|
|
||||||
--arg extract_size "$extract_size" \
|
|
||||||
--arg extract_sha256 "$extract_sha256" \
|
|
||||||
"$json" > "$temp_out"
|
|
||||||
|
|
||||||
mv "$temp_out" "$json"
|
|
||||||
rm -rf "$temp_unpacked" "$temp_out"
|
|
||||||
}
|
|
||||||
|
|
||||||
bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi3-64" "RPi 3"
|
|
||||||
bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi4-64" "RPi 4/400"
|
|
||||||
bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi5-64" "RPi 5"
|
|
||||||
bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "yellow" "Yellow"
|
|
||||||
|
|
||||||
- shell: bash
|
|
||||||
env:
|
|
||||||
INPUTS_VERSION: ${{ inputs.version }}
|
|
||||||
run: |
|
|
||||||
cd /tmp/version
|
|
||||||
git commit -am "Bump Home Assistant OS to ${INPUTS_VERSION} for RPi Imager"
|
|
||||||
git push
|
|
||||||
|
|
||||||
- shell: bash
|
|
||||||
run: rm -rf /tmp/version
|
|
||||||
22
.github/actions/haos-builder-command/action.yml
vendored
22
.github/actions/haos-builder-command/action.yml
vendored
@ -1,22 +0,0 @@
|
|||||||
name: "Run command in HAOS build container"
|
|
||||||
inputs:
|
|
||||||
image:
|
|
||||||
description: "HAOS builder image to use"
|
|
||||||
required: true
|
|
||||||
command:
|
|
||||||
description: "Command to run in the container"
|
|
||||||
required: true
|
|
||||||
runs:
|
|
||||||
using: 'composite'
|
|
||||||
steps:
|
|
||||||
- name: "Run command in HAOS build container"
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
docker run --rm --privileged \
|
|
||||||
-e BUILDER_UID="$(id -u)" \
|
|
||||||
-e BUILDER_GID="$(id -g)" \
|
|
||||||
-v "${GITHUB_WORKSPACE}:/build" \
|
|
||||||
-v "/mnt/cache:/cache" \
|
|
||||||
-v "/mnt/output:/build/output" \
|
|
||||||
${{ inputs.image }} \
|
|
||||||
${{ inputs.command }}
|
|
||||||
6
.github/dependabot.yml
vendored
6
.github/dependabot.yml
vendored
@ -1,6 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
59
.github/label-actions.yml
vendored
59
.github/label-actions.yml
vendored
@ -1,59 +0,0 @@
|
|||||||
assume-fixed:
|
|
||||||
comment: >
|
|
||||||
:wave: @{issue-author}, thanks for reporting an issue!
|
|
||||||
|
|
||||||
|
|
||||||
This issue is assumed to be fixed in the latest stable release. Please
|
|
||||||
reopen in case you can still reproduce the issue with the latest stable
|
|
||||||
release. You can find the latest stable release at
|
|
||||||
https://github.com/home-assistant/operating-system/releases/latest
|
|
||||||
close: true
|
|
||||||
close-reason: not planned
|
|
||||||
|
|
||||||
core-issue:
|
|
||||||
comment: >
|
|
||||||
:wave: @{issue-author}, thanks for reporting an issue!
|
|
||||||
|
|
||||||
|
|
||||||
It looks like this issue is related to Home Assistant Core. Please check
|
|
||||||
the [Home Assistant Core](https://github.com/home-assistant/core/issues)
|
|
||||||
repository, the issue might have been reported already. Open a new issue
|
|
||||||
in that repository if you can't find a matching issue.
|
|
||||||
close: true
|
|
||||||
close-reason: not planned
|
|
||||||
|
|
||||||
frontend-issue:
|
|
||||||
comment: >
|
|
||||||
:wave: @{issue-author}, thanks for reporting an issue!
|
|
||||||
|
|
||||||
|
|
||||||
It looks like this issue is related to Home Assistant Frontend. Please
|
|
||||||
check the [Home Assistant Frontend](https://github.com/home-assistant/frontend/issues)
|
|
||||||
repository, the issue might have been reported already. Open a new issue
|
|
||||||
in that repository if you can't find a matching issue.
|
|
||||||
close: true
|
|
||||||
close-reason: not planned
|
|
||||||
|
|
||||||
supervisor-issue:
|
|
||||||
comment: >
|
|
||||||
:wave: @{issue-author}, thanks for reporting an issue!
|
|
||||||
|
|
||||||
|
|
||||||
It looks like this issue is related to Home Assistant Supervisor. Please
|
|
||||||
check the [Home Assistant Supervisor](https://github.com/home-assistant/supervisor/issues)
|
|
||||||
repository, the issue might have been reported already. Open a new issue
|
|
||||||
in that repository if you can't find a matching issue.
|
|
||||||
close: true
|
|
||||||
close-reason: not planned
|
|
||||||
|
|
||||||
new-feature:
|
|
||||||
comment: >
|
|
||||||
:wave: @{issue-author}, thanks for your input!
|
|
||||||
|
|
||||||
We use this issue tracker to track issues of currently supported features.
|
|
||||||
Your request appears to request a new feature. We track potential new
|
|
||||||
features in the [Feature Request section of our Community Forum](https://community.home-assistant.io/c/feature-requests/13).
|
|
||||||
Please check if someone already requested a similar feature, or create
|
|
||||||
a new feature request with the "haos" tag in that forum. Thank you!
|
|
||||||
close: true
|
|
||||||
close-reason: not planned
|
|
||||||
38
.github/release-drafter.yml
vendored
38
.github/release-drafter.yml
vendored
@ -1,40 +1,4 @@
|
|||||||
name-template: Home Assistant OS $RESOLVED_VERSION
|
|
||||||
tag-template: $RESOLVED_VERSION
|
|
||||||
version-template: "$MAJOR.$MINOR"
|
|
||||||
categories:
|
|
||||||
- title: 'Home Assistant Operating System'
|
|
||||||
label: 'os'
|
|
||||||
- title: 'Raspberry Pi'
|
|
||||||
label: 'board/raspberrypi'
|
|
||||||
- title: 'Home Assistant Yellow'
|
|
||||||
label: 'board/yellow'
|
|
||||||
- title: 'Home Assistant Green'
|
|
||||||
label: 'board/green'
|
|
||||||
- title: 'Open Virtual Appliance'
|
|
||||||
label: 'board/ova'
|
|
||||||
- title: 'Generic x86-64'
|
|
||||||
label: 'board/generic-x86-64'
|
|
||||||
- title: 'Hardkernel ODROID'
|
|
||||||
label: 'board/odroid'
|
|
||||||
- title: 'ASUS Tinker'
|
|
||||||
label: 'board/tinker'
|
|
||||||
- title: 'Khadas VIM Series'
|
|
||||||
label: 'board/khadas'
|
|
||||||
- title: 'Generic aarch64'
|
|
||||||
label: 'board/generic-aarch64'
|
|
||||||
- title: 'Documentation'
|
|
||||||
label: 'documentation'
|
|
||||||
- title: 'Build System'
|
|
||||||
label: 'build'
|
|
||||||
- title: 'Dependencies'
|
|
||||||
label: 'dependencies'
|
|
||||||
filter-by-commitish: true
|
|
||||||
template: |
|
template: |
|
||||||
## Changes
|
## What's Changed
|
||||||
|
|
||||||
$CHANGES
|
$CHANGES
|
||||||
version-resolver:
|
|
||||||
major:
|
|
||||||
labels:
|
|
||||||
- 'major'
|
|
||||||
default: minor
|
|
||||||
|
|||||||
102
.github/workflows/artifacts-index.yaml
vendored
102
.github/workflows/artifacts-index.yaml
vendored
@ -1,102 +0,0 @@
|
|||||||
name: Update artifacts index
|
|
||||||
|
|
||||||
on:
|
|
||||||
# Manual run for specified version
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: Version of HAOS to build index for
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
# Called by other workflows (e.g. build.yaml)
|
|
||||||
workflow_call:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: Version of HAOS to build index for
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
secrets:
|
|
||||||
R2_OS_ARTIFACTS_ID:
|
|
||||||
required: true
|
|
||||||
R2_OS_ARTIFACTS_KEY:
|
|
||||||
required: true
|
|
||||||
R2_OS_ARTIFACTS_BUCKET:
|
|
||||||
required: true
|
|
||||||
R2_OS_ARTIFACTS_ENDPOINT:
|
|
||||||
required: true
|
|
||||||
CF_ZONE:
|
|
||||||
required: true
|
|
||||||
CF_PURGE_TOKEN:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
env:
|
|
||||||
PYTHON_VERSION: "3.13"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-index:
|
|
||||||
name: Build Home Assistant OS artifacts index
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Checkout source
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Setup Python version ${{ env.PYTHON_VERSION }}
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: ${{ env.PYTHON_VERSION }}
|
|
||||||
|
|
||||||
- name: Install AWS CLI
|
|
||||||
run: pip install 'awscli<1.37.0'
|
|
||||||
|
|
||||||
- name: Create build index
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
|
|
||||||
run: |
|
|
||||||
aws s3api list-objects-v2 \
|
|
||||||
--bucket "${{ secrets.R2_OS_ARTIFACTS_BUCKET }}" \
|
|
||||||
--endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
|
|
||||||
--prefix "${{ inputs.version }}/" \
|
|
||||||
--query 'Contents[].Key' | jq 'map(split("/")[1]) | sort' > "${{ inputs.version }}.json"
|
|
||||||
aws s3 cp \
|
|
||||||
"${{ inputs.version }}.json" \
|
|
||||||
s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/indexes/ \
|
|
||||||
--endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}"
|
|
||||||
|
|
||||||
- name: Regenerate artifacts index
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
|
|
||||||
run: |
|
|
||||||
aws s3api list-objects-v2 \
|
|
||||||
--bucket "${{ secrets.R2_OS_ARTIFACTS_BUCKET }}" \
|
|
||||||
--endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
|
|
||||||
--prefix "indexes/" \
|
|
||||||
--query 'Contents[].Key' | jq 'map(capture("indexes/(?<version>[[:digit:]].+).json").version) | sort' > .os-artifacts/index.json
|
|
||||||
aws s3 sync \
|
|
||||||
.os-artifacts/ \
|
|
||||||
s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/ \
|
|
||||||
--endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
|
|
||||||
|
|
||||||
- name: Flush CloudFlare cache
|
|
||||||
run: |
|
|
||||||
# Create purge list of all artifacts
|
|
||||||
jq -r '. | map("https://os-artifacts.home-assistant.io/${{ inputs.version }}/" + .) | join("\n")' < "${{ inputs.version }}.json" > purge_list
|
|
||||||
# Add indexes to purge list too
|
|
||||||
echo "https://os-artifacts.home-assistant.io/indexes/${{ inputs.version }}.json" >> purge_list
|
|
||||||
echo "https://os-artifacts.home-assistant.io/index.html" >> purge_list
|
|
||||||
echo "https://os-artifacts.home-assistant.io/index.json" >> purge_list
|
|
||||||
# Split to chunks of 30 files (limit of CF API)
|
|
||||||
split -d -l30 purge_list purge_list_chunked
|
|
||||||
# Convert chunked lists to JSON arrays and call CF purge API
|
|
||||||
for f in purge_list_chunked*; do
|
|
||||||
files=$(jq -R -s 'split("\n")[:-1]' < "$f")
|
|
||||||
curl --silent --show-error --fail -X POST \
|
|
||||||
"https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache" \
|
|
||||||
-H "Authorization: Bearer ${{ secrets.CF_PURGE_TOKEN }}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
--data "{\"files\": ${files}}"
|
|
||||||
done
|
|
||||||
475
.github/workflows/build.yaml
vendored
475
.github/workflows/build.yaml
vendored
@ -1,475 +0,0 @@
|
|||||||
# Home Assistant Operating System build workflow
|
|
||||||
|
|
||||||
name: OS build
|
|
||||||
|
|
||||||
on:
|
|
||||||
release:
|
|
||||||
types: [published]
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
boards:
|
|
||||||
description: 'List of boards to build (comma separated identifiers)'
|
|
||||||
required: false
|
|
||||||
type: string
|
|
||||||
publish:
|
|
||||||
description: 'Publish build artifacts to R2 (not applicable to forks)'
|
|
||||||
required: true
|
|
||||||
type: boolean
|
|
||||||
default: true
|
|
||||||
hassio_channel:
|
|
||||||
description: 'Release channel to use (default: stable for GH releases, dev otherwise)'
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: default
|
|
||||||
options:
|
|
||||||
- default
|
|
||||||
- stable
|
|
||||||
- beta
|
|
||||||
- dev
|
|
||||||
|
|
||||||
env:
|
|
||||||
PYTHON_VERSION: "3.13"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
prepare:
|
|
||||||
name: Prepare build
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
pull-requests: read
|
|
||||||
packages: write
|
|
||||||
outputs:
|
|
||||||
version_dev: ${{ steps.version_dev.outputs.version_dev }}
|
|
||||||
version_main: ${{ steps.version.outputs.version_main }}
|
|
||||||
version_full: ${{ steps.version.outputs.version_full }}
|
|
||||||
channel: ${{ steps.channel.outputs.channel }}
|
|
||||||
hassio_channel_option: ${{ steps.channel.outputs.hassio_channel_option }}
|
|
||||||
matrix: ${{ steps.generate_matrix.outputs.result }}
|
|
||||||
build_container_image: ghcr.io/${{ github.repository_owner }}/haos-builder@${{ steps.build_haos_builder.outputs.digest }}
|
|
||||||
publish_build: ${{ steps.check_publish.outputs.publish_build }}
|
|
||||||
self_signed_cert: ${{ steps.generate_signing_key.outputs.self_signed_cert }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout source
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Check if build should be published
|
|
||||||
id: check_publish
|
|
||||||
env:
|
|
||||||
PUBLISH_FLAG: ${{ inputs.publish }}
|
|
||||||
run: |
|
|
||||||
if [ "${{ github.repository }}" == "home-assistant/operating-system" ]; then
|
|
||||||
if [ "${PUBLISH_FLAG}" != "true" ] && [ "${{ github.event_name }}" != "release" ]; then
|
|
||||||
echo "publish_build=false" >> "$GITHUB_OUTPUT"
|
|
||||||
else
|
|
||||||
echo "publish_build=true" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "publish_build=false" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Generate development version
|
|
||||||
shell: bash
|
|
||||||
id: version_dev
|
|
||||||
if: ${{ github.event_name != 'release' }}
|
|
||||||
env:
|
|
||||||
PUBLISH_BUILD: ${{ steps.check_publish.outputs.publish_build }}
|
|
||||||
run: |
|
|
||||||
version_dev="dev$(date --utc +'%Y%m%d')"
|
|
||||||
if [ "${{ env.PUBLISH_BUILD }}" != "true" ]; then
|
|
||||||
version_dev="dev$(date +%s)"
|
|
||||||
fi
|
|
||||||
echo "Development version \"${version_dev}\""
|
|
||||||
echo "version_dev=${version_dev}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Set version suffix
|
|
||||||
if: ${{ github.event_name != 'release' }}
|
|
||||||
env:
|
|
||||||
VERSION_DEV: ${{ steps.version_dev.outputs.version_dev }}
|
|
||||||
run: |
|
|
||||||
sed -i -E "s/(^VERSION_SUFFIX=\").*(\"$)/\1${VERSION_DEV}\2/" buildroot-external/meta
|
|
||||||
|
|
||||||
- name: Get version
|
|
||||||
id: version
|
|
||||||
run: |
|
|
||||||
. ${GITHUB_WORKSPACE}/buildroot-external/meta
|
|
||||||
echo "version_main=${VERSION_MAJOR}.${VERSION_MINOR}" >> $GITHUB_OUTPUT
|
|
||||||
if [ -z "${VERSION_SUFFIX}" ]; then
|
|
||||||
version_full="${VERSION_MAJOR}.${VERSION_MINOR}"
|
|
||||||
else
|
|
||||||
version_full="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUFFIX}"
|
|
||||||
fi
|
|
||||||
echo "version_full=${version_full}" >> $GITHUB_OUTPUT
|
|
||||||
echo "Full version number of this release is \"${version_full}\"."
|
|
||||||
|
|
||||||
- name: Validate version
|
|
||||||
id: version_check
|
|
||||||
if: ${{ github.event_name == 'release' }}
|
|
||||||
run: |
|
|
||||||
if [ "${{ steps.version.outputs.version_full }}" != "${{ github.event.release.tag_name }}" ]; then
|
|
||||||
echo "Version number in Buildroot metadata does not match tag (${{ steps.version.outputs.version_full }} vs ${{ github.event.release.tag_name }})."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Get channel
|
|
||||||
id: channel
|
|
||||||
run: |
|
|
||||||
if [[ "${{ github.event_name }}" == "release" ]]; then
|
|
||||||
if [[ "${{ github.event.release.prerelease }}" == "true" ]]; then
|
|
||||||
echo "channel=beta" >> "$GITHUB_OUTPUT"
|
|
||||||
else
|
|
||||||
echo "channel=stable" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "channel=dev" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${{ inputs.hassio_channel }}" == "default" ]]; then
|
|
||||||
if [[ "${{ github.event_name }}" == "release" ]]; then
|
|
||||||
echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_STABLE" >> "$GITHUB_OUTPUT"
|
|
||||||
else
|
|
||||||
echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_DEV" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ "${{ inputs.hassio_channel }}" == "stable" ]]; then
|
|
||||||
echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_STABLE" >> "$GITHUB_OUTPUT"
|
|
||||||
elif [[ "${{ inputs.hassio_channel }}" == "beta" ]]; then
|
|
||||||
echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_BETA" >> "$GITHUB_OUTPUT"
|
|
||||||
elif [[ "${{ inputs.hassio_channel }}" == "dev" ]]; then
|
|
||||||
echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_DEV" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Create build matrix
|
|
||||||
uses: actions/github-script@v7
|
|
||||||
id: generate_matrix
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
const boards = require('./.github/workflows/matrix.json')
|
|
||||||
if ("${{ github.event_name }}" == "release") {
|
|
||||||
return { "board": boards }
|
|
||||||
}
|
|
||||||
|
|
||||||
const boardFilter = "${{ github.event.inputs.boards }}"
|
|
||||||
if (boardFilter == "") {
|
|
||||||
console.log("Run full build for all boards")
|
|
||||||
return { "board": boards }
|
|
||||||
} else {
|
|
||||||
console.log("Run partial build")
|
|
||||||
const boardSet = new Set(boardFilter.split(","))
|
|
||||||
const buildBoards = boards.filter(b => boardSet.has(b.id))
|
|
||||||
return { "board": buildBoards }
|
|
||||||
}
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3.11.1
|
|
||||||
- name: Log in to the GitHub container registry
|
|
||||||
uses: docker/login-action@v3.4.0
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.repository_owner }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
- name: Build and Push
|
|
||||||
uses: docker/build-push-action@v6.18.0
|
|
||||||
id: build_haos_builder
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
file: Dockerfile
|
|
||||||
tags: ghcr.io/${{ github.repository_owner }}/haos-builder
|
|
||||||
cache-from: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
|
|
||||||
cache-to: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
|
|
||||||
push: true
|
|
||||||
|
|
||||||
- name: Generate self-signed certificate
|
|
||||||
id: generate_signing_key
|
|
||||||
env:
|
|
||||||
RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
|
|
||||||
RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
|
|
||||||
if: env.RAUC_CERTIFICATE == '' || env.RAUC_PRIVATE_KEY == ''
|
|
||||||
run: |
|
|
||||||
echo "::warning:: RAUC certificate or key is missing in the repository secrets. Building with a public self-signed certificate!"
|
|
||||||
buildroot-external/scripts/generate-signing-key.sh cert.pem key.pem
|
|
||||||
echo "self_signed_cert=true" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Create signing key
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: steps.generate_signing_key.outcome == 'success'
|
|
||||||
with:
|
|
||||||
name: signing-key
|
|
||||||
path: |
|
|
||||||
cert.pem
|
|
||||||
key.pem
|
|
||||||
|
|
||||||
build:
|
|
||||||
name: Build for ${{ matrix.board.id }}
|
|
||||||
permissions:
|
|
||||||
contents: write # for actions/upload-release-asset to upload release asset
|
|
||||||
needs: prepare
|
|
||||||
strategy:
|
|
||||||
fail-fast: ${{ github.event_name == 'release' }}
|
|
||||||
matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout source
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
submodules: true
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Setup Python version ${{ env.PYTHON_VERSION }}
|
|
||||||
if: ${{ github.event_name != 'release' }}
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: ${{ env.PYTHON_VERSION }}
|
|
||||||
|
|
||||||
- name: Install AWS CLI
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
|
|
||||||
run: pip install 'awscli<1.37.0'
|
|
||||||
|
|
||||||
- name: Set version suffix
|
|
||||||
if: ${{ github.event_name != 'release' }}
|
|
||||||
env:
|
|
||||||
VERSION_DEV: ${{ needs.prepare.outputs.version_dev }}
|
|
||||||
run: |
|
|
||||||
sed -i -E "s/(^VERSION_SUFFIX=\").*(\"$)/\1${VERSION_DEV}\2/" buildroot-external/meta
|
|
||||||
|
|
||||||
- name: 'Add release PKI certs'
|
|
||||||
if: ${{ needs.prepare.outputs.self_signed_cert != 'true' }}
|
|
||||||
env:
|
|
||||||
RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
|
|
||||||
RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
|
|
||||||
run: |
|
|
||||||
echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
|
|
||||||
echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
|
|
||||||
|
|
||||||
- name: Get self-signed certificate from the prepare job
|
|
||||||
if: ${{ needs.prepare.outputs.self_signed_cert == 'true' }}
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: signing-key
|
|
||||||
|
|
||||||
- name: Free space on build drive
|
|
||||||
run: |
|
|
||||||
# Inspired by https://github.com/easimon/maximize-build-space/blob/v7/action.yml
|
|
||||||
df -h
|
|
||||||
sudo rm -rf /usr/local/lib/android/sdk/ndk
|
|
||||||
sudo rm -rf /opt/hostedtoolcache/CodeQL
|
|
||||||
sudo mkdir /mnt/cache
|
|
||||||
sudo mkdir /mnt/output
|
|
||||||
WORKSPACE_OWNER="$(stat -c '%U:%G' "${GITHUB_WORKSPACE}")"
|
|
||||||
# output directory is symlinked for easier access from workspace
|
|
||||||
# but for build container it must be mounted as a volume
|
|
||||||
sudo ln -sf /mnt/output "${GITHUB_WORKSPACE}/output"
|
|
||||||
sudo chown -R "${WORKSPACE_OWNER}" /mnt/cache
|
|
||||||
sudo chown -R "${WORKSPACE_OWNER}" /mnt/output
|
|
||||||
df -h
|
|
||||||
|
|
||||||
- name: "Restore cache: object files"
|
|
||||||
uses: actions/cache/restore@v4
|
|
||||||
with:
|
|
||||||
path: /mnt/cache/cc
|
|
||||||
key: haos-cc-${{ matrix.board.id }}
|
|
||||||
|
|
||||||
- name: Generate build config
|
|
||||||
uses: "./.github/actions/haos-builder-command"
|
|
||||||
with:
|
|
||||||
image: ${{ needs.prepare.outputs.build_container_image }}
|
|
||||||
command: make ${{ matrix.board.defconfig }}_defconfig
|
|
||||||
|
|
||||||
- name: Override release channel
|
|
||||||
if: ${{ needs.prepare.outputs.hassio_channel_option != 'BR2_PACKAGE_HASSIO_CHANNEL_STABLE' }}
|
|
||||||
uses: "./.github/actions/haos-builder-command"
|
|
||||||
with:
|
|
||||||
image: ${{ needs.prepare.outputs.build_container_image }}
|
|
||||||
command: |
|
|
||||||
bash -c 'echo "${{ needs.prepare.outputs.hassio_channel_option }}=y" >> /build/output/.config && make olddefconfig'
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
uses: "./.github/actions/haos-builder-command"
|
|
||||||
with:
|
|
||||||
image: ${{ needs.prepare.outputs.build_container_image }}
|
|
||||||
command: make
|
|
||||||
|
|
||||||
- name: Check Linux config
|
|
||||||
uses: "./.github/actions/haos-builder-command"
|
|
||||||
with:
|
|
||||||
image: ${{ needs.prepare.outputs.build_container_image }}
|
|
||||||
command: |
|
|
||||||
make BR2_CHECK_DOTCONFIG_OPTS="--github-format --strip-path-prefix=/build/" linux-check-dotconfig
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
|
|
||||||
working-directory: output/images/
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
|
|
||||||
run: |
|
|
||||||
aws s3 sync \
|
|
||||||
./ \
|
|
||||||
s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/${{ needs.prepare.outputs.version_full }}/ \
|
|
||||||
--exclude "*" \
|
|
||||||
--include "haos_*" \
|
|
||||||
--endpoint-url ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
|
|
||||||
|
|
||||||
- name: Upload release assets
|
|
||||||
if: ${{ github.event_name == 'release' }}
|
|
||||||
uses: shogo82148/actions-upload-release-asset@v1
|
|
||||||
with:
|
|
||||||
upload_url: ${{ github.event.release.upload_url }}
|
|
||||||
asset_path: output/images/haos_*
|
|
||||||
|
|
||||||
- name: Print cache stats
|
|
||||||
run: |
|
|
||||||
echo "Cache size: $(du -sh /mnt/cache/cc)"
|
|
||||||
echo "Files total: $(find /mnt/cache/cc -mindepth 1 -type f | wc -l)"
|
|
||||||
echo "Old files to remove: $(find /mnt/cache/cc -mindepth 1 -type f -not -anewer output/Makefile | wc -l)"
|
|
||||||
find /mnt/cache/cc -mindepth 1 -type f -not -anewer output/Makefile -delete
|
|
||||||
echo "Cache size after pruning: $(du -sh /mnt/cache/cc)"
|
|
||||||
|
|
||||||
- name: "Save cache: object files"
|
|
||||||
if: github.ref == 'refs/heads/dev'
|
|
||||||
uses: actions/cache/save@v4
|
|
||||||
with:
|
|
||||||
path: /mnt/cache/cc
|
|
||||||
key: haos-cc-${{ matrix.board.id }}-${{ github.run_id }}
|
|
||||||
|
|
||||||
- name: Generate build summary
|
|
||||||
run: |
|
|
||||||
echo "# ${{ matrix.board.id }} build summary" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "## Artifacts" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
|
|
||||||
for f in output/images/haos_*; do
|
|
||||||
echo "| $(basename $f) | $(du -b $f | cut -f1) | $(du -bh $f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
done
|
|
||||||
echo "## Partitions" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
|
|
||||||
for f in boot.vfat kernel.img rootfs.erofs overlay.ext4 data.ext4; do
|
|
||||||
echo "| ${f} | $(du -b output/images/$f | cut -f1) | $(du -bh output/images/$f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Upload OS image artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id != 'ova' }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
|
|
||||||
|
|
||||||
- name: Upload RAUC bundle artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
|
|
||||||
|
|
||||||
- name: Upload Open Virtualization Format (OVA) artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
|
|
||||||
|
|
||||||
- name: Upload QEMU disk image artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
# Create artifact for ova every time - it's used by the called tests workflow
|
|
||||||
if: ${{ matrix.board.id == 'ova' || (github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'generic-aarch64') }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
|
|
||||||
|
|
||||||
- name: Upload VMware Virtual Machine Disk (VMDK) artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && (matrix.board.id == 'generic-aarch64' || matrix.board.id == 'ova') }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
|
|
||||||
|
|
||||||
- name: Upload VirtualBox Virtual Disk Image (VDI) artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
|
|
||||||
|
|
||||||
- name: Upload Virtual Hard Disk v2 (VHDX) artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
|
|
||||||
with:
|
|
||||||
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
|
|
||||||
path: |
|
|
||||||
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
|
|
||||||
|
|
||||||
test:
|
|
||||||
name: Test OS image
|
|
||||||
needs: [ build, prepare ]
|
|
||||||
uses: ./.github/workflows/test.yaml
|
|
||||||
with:
|
|
||||||
version: ${{ needs.prepare.outputs.version_full }}
|
|
||||||
|
|
||||||
update_index:
|
|
||||||
name: Update artifacts index
|
|
||||||
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
|
|
||||||
needs: [ build, prepare ]
|
|
||||||
uses: home-assistant/operating-system/.github/workflows/artifacts-index.yaml@dev
|
|
||||||
with:
|
|
||||||
version: ${{ needs.prepare.outputs.version_full }}
|
|
||||||
secrets:
|
|
||||||
R2_OS_ARTIFACTS_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
|
|
||||||
R2_OS_ARTIFACTS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
|
|
||||||
R2_OS_ARTIFACTS_BUCKET: ${{ secrets.R2_OS_ARTIFACTS_BUCKET }}
|
|
||||||
R2_OS_ARTIFACTS_ENDPOINT: ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
|
|
||||||
CF_ZONE: ${{ secrets.CF_ZONE }}
|
|
||||||
CF_PURGE_TOKEN: ${{ secrets.CF_PURGE_TOKEN }}
|
|
||||||
|
|
||||||
bump_version:
|
|
||||||
name: Bump ${{ needs.prepare.outputs.channel }} channel version
|
|
||||||
if: ${{ github.repository == 'home-assistant/operating-system' && needs.prepare.outputs.publish_build == 'true' }}
|
|
||||||
environment: ${{ needs.prepare.outputs.channel }}
|
|
||||||
needs: [ build, prepare ]
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout source
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Initialize git
|
|
||||||
uses: home-assistant/actions/helpers/git-init@master
|
|
||||||
with:
|
|
||||||
name: ${{ secrets.GIT_NAME }}
|
|
||||||
email: ${{ secrets.GIT_EMAIL }}
|
|
||||||
token: ${{ secrets.GIT_TOKEN }}
|
|
||||||
|
|
||||||
- name: Bump Home Assistant OS ${{ needs.prepare.outputs.channel }} channel version
|
|
||||||
uses: home-assistant/actions/helpers/version-push@master
|
|
||||||
with:
|
|
||||||
key: "hassos[]"
|
|
||||||
key-description: "Home Assistant OS"
|
|
||||||
version: ${{ needs.prepare.outputs.version_full }}
|
|
||||||
channel: ${{ needs.prepare.outputs.channel }}
|
|
||||||
|
|
||||||
- name: Bump Home Assistant OS beta channel version on stable release
|
|
||||||
if: ${{ needs.prepare.outputs.channel == 'stable' }}
|
|
||||||
uses: home-assistant/actions/helpers/version-push@master
|
|
||||||
with:
|
|
||||||
key: "hassos[]"
|
|
||||||
key-description: "Home Assistant OS"
|
|
||||||
version: ${{ needs.prepare.outputs.version_full }}
|
|
||||||
channel: beta
|
|
||||||
|
|
||||||
- name: Bump stable Home Assistant version for RPi Imager
|
|
||||||
if: ${{ github.event_name == 'release' && needs.prepare.outputs.channel == 'stable' }}
|
|
||||||
uses: "./.github/actions/bump-rpi-imager-version"
|
|
||||||
with:
|
|
||||||
version: ${{ needs.prepare.outputs.version_full }}
|
|
||||||
release-date: ${{ github.event.release.published_at }}
|
|
||||||
17
.github/workflows/label-actions.yml
vendored
17
.github/workflows/label-actions.yml
vendored
@ -1,17 +0,0 @@
|
|||||||
name: 'Label Actions'
|
|
||||||
|
|
||||||
on:
|
|
||||||
issues:
|
|
||||||
types: [labeled, unlabeled]
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
discussions: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
action:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: dessant/label-actions@v4.0.1
|
|
||||||
25
.github/workflows/lock.yml
vendored
25
.github/workflows/lock.yml
vendored
@ -1,25 +0,0 @@
|
|||||||
name: Lock
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "45 5 * * *"
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
discussions: write
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lock:
|
|
||||||
if: github.repository_owner == 'home-assistant'
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: dessant/lock-threads@v5.0.1
|
|
||||||
with:
|
|
||||||
github-token: ${{ github.token }}
|
|
||||||
issue-inactive-days: "30"
|
|
||||||
exclude-issue-created-before: "2025-01-01T00:00:00Z"
|
|
||||||
issue-lock-reason: ""
|
|
||||||
pr-inactive-days: "7"
|
|
||||||
exclude-pr-created-before: "2025-01-01T00:00:00Z"
|
|
||||||
pr-lock-reason: ""
|
|
||||||
116
.github/workflows/matrix.json
vendored
116
.github/workflows/matrix.json
vendored
@ -1,116 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"id": "ova",
|
|
||||||
"defconfig": "ova",
|
|
||||||
"architecture": "x86-64",
|
|
||||||
"label": "board/ova"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "generic-x86-64",
|
|
||||||
"defconfig": "generic_x86_64",
|
|
||||||
"architecture": "x86-64",
|
|
||||||
"label": "board/generic-x86-64"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "generic-aarch64",
|
|
||||||
"defconfig": "generic_aarch64",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/generic-aarch64"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "khadas-vim3",
|
|
||||||
"defconfig": "khadas_vim3",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/khadas"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "odroid-c2",
|
|
||||||
"defconfig": "odroid_c2",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/odroid"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "odroid-c4",
|
|
||||||
"defconfig": "odroid_c4",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/odroid"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "odroid-m1",
|
|
||||||
"defconfig": "odroid_m1",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/odroid"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "odroid-m1s",
|
|
||||||
"defconfig": "odroid_m1s",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/odroid"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "odroid-n2",
|
|
||||||
"defconfig": "odroid_n2",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/odroid"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "odroid-xu4",
|
|
||||||
"defconfig": "odroid_xu4",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/odroid"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "rpi2",
|
|
||||||
"defconfig": "rpi2",
|
|
||||||
"architecture": "arm",
|
|
||||||
"label": "board/raspberrypi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "rpi3",
|
|
||||||
"defconfig": "rpi3",
|
|
||||||
"architecture": "arm",
|
|
||||||
"label": "board/raspberrypi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "rpi3-64",
|
|
||||||
"defconfig": "rpi3_64",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/raspberrypi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "rpi4",
|
|
||||||
"defconfig": "rpi4",
|
|
||||||
"architecture": "arm",
|
|
||||||
"label": "board/raspberrypi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "rpi4-64",
|
|
||||||
"defconfig": "rpi4_64",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/raspberrypi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "rpi5-64",
|
|
||||||
"defconfig": "rpi5_64",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/raspberrypi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "yellow",
|
|
||||||
"defconfig": "yellow",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/yellow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "green",
|
|
||||||
"defconfig": "green",
|
|
||||||
"architecture": "aarch64",
|
|
||||||
"label": "board/green"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "tinker",
|
|
||||||
"defconfig": "tinker",
|
|
||||||
"architecture": "arm",
|
|
||||||
"label": "board/tinker"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
34
.github/workflows/pr-checks.yml
vendored
34
.github/workflows/pr-checks.yml
vendored
@ -1,34 +0,0 @@
|
|||||||
# Home Assistant Operating System pull-request checks
|
|
||||||
|
|
||||||
name: PR checks
|
|
||||||
|
|
||||||
on: [pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
linters:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Install additional dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get -y install \
|
|
||||||
python3-flake8
|
|
||||||
|
|
||||||
- name: Check out code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
submodules: true
|
|
||||||
|
|
||||||
- name: Check Dockerfile
|
|
||||||
uses: brpaz/hadolint-action@v1.5.0
|
|
||||||
with:
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
|
|
||||||
- name: Check shell scripts
|
|
||||||
uses: ludeeus/action-shellcheck@2.0.0
|
|
||||||
with:
|
|
||||||
ignore_paths: buildroot
|
|
||||||
|
|
||||||
- name: Check buildroot-external packages
|
|
||||||
run: |
|
|
||||||
buildroot/utils/check-package --exclude PackageHeader --exclude Upstream --br2-external buildroot-external/package/*/*
|
|
||||||
18
.github/workflows/release-drafter.yml
vendored
18
.github/workflows/release-drafter.yml
vendored
@ -1,18 +0,0 @@
|
|||||||
name: Release Drafter
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- dev
|
|
||||||
- rel-*
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update_release_draft:
|
|
||||||
permissions:
|
|
||||||
contents: write # for release-drafter/release-drafter to create a github release
|
|
||||||
pull-requests: read # for release-drafter/release-drafter to read PR content and labels
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: release-drafter/release-drafter@v6
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
50
.github/workflows/stale.yml
vendored
50
.github/workflows/stale.yml
vendored
@ -1,50 +0,0 @@
|
|||||||
name: Stale
|
|
||||||
|
|
||||||
# yamllint disable-line rule:truthy
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "40 5 * * *"
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
stale:
|
|
||||||
permissions:
|
|
||||||
issues: write # for actions/stale to close stale issues
|
|
||||||
pull-requests: write # for actions/stale to close stale PRs
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
# The 90 day stale policy
|
|
||||||
# Used for:
|
|
||||||
# - Issues & PRs
|
|
||||||
# - No PRs marked as no-stale or pinned
|
|
||||||
# - No issues marked as no-stale, help-wanted or pinned
|
|
||||||
- name: 90 days stale issues & PRs policy
|
|
||||||
uses: actions/stale@v9.1.0
|
|
||||||
with:
|
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
days-before-stale: 90
|
|
||||||
days-before-close: 7
|
|
||||||
operations-per-run: 150
|
|
||||||
remove-stale-when-updated: true
|
|
||||||
stale-issue-label: "stale"
|
|
||||||
exempt-issue-labels: "no-stale,help-wanted,pinned,enhancement"
|
|
||||||
stale-issue-message: >
|
|
||||||
There hasn't been any activity on this issue recently. To keep our
|
|
||||||
backlog manageable we have to clean old issues, as many of them have
|
|
||||||
already been resolved with the latest updates.
|
|
||||||
|
|
||||||
Please make sure to update to the latest Home Assistant OS version and
|
|
||||||
check if that solves the issue. Let us know if that works for you by
|
|
||||||
adding a comment 👍
|
|
||||||
|
|
||||||
This issue has now been marked as stale and will be closed if no
|
|
||||||
further activity occurs. Thank you for your contributions.
|
|
||||||
|
|
||||||
stale-pr-label: "stale"
|
|
||||||
exempt-pr-labels: "no-stale,pinned"
|
|
||||||
stale-pr-message: >
|
|
||||||
There hasn't been any activity on this pull request recently. This
|
|
||||||
pull request has been automatically marked as stale because of that
|
|
||||||
and will be closed if no further activity occurs within 7 days.
|
|
||||||
|
|
||||||
Thank you for your contributions.
|
|
||||||
101
.github/workflows/test.yaml
vendored
101
.github/workflows/test.yaml
vendored
@ -1,101 +0,0 @@
|
|||||||
name: Test HAOS image
|
|
||||||
run-name: "Test HAOS ${{ inputs.version || format('(OS build #{0})', github.event.workflow_run.run_number) }}"
|
|
||||||
|
|
||||||
on:
|
|
||||||
# Manual test of specified version
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: Version of HAOS to test
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
# Called by other workflows (e.g. build.yaml)
|
|
||||||
workflow_call:
|
|
||||||
inputs:
|
|
||||||
use-artifact:
|
|
||||||
# Workaround for GH weirdness: https://github.com/actions/runner/discussions/1884
|
|
||||||
description: Download OS image using actions/download-artifact
|
|
||||||
required: false
|
|
||||||
type: boolean
|
|
||||||
default: true
|
|
||||||
version:
|
|
||||||
description: Version of HAOS to test (as used in the name of the qcow2 image artifact)
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
|
|
||||||
|
|
||||||
name: Test in QEMU
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Checkout source
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y qemu-system-x86 ovmf
|
|
||||||
|
|
||||||
- name: Setup Python
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: 3.12
|
|
||||||
|
|
||||||
- name: Install Python requirements
|
|
||||||
run:
|
|
||||||
pip install -r tests/requirements.txt
|
|
||||||
|
|
||||||
- name: Download HAOS image
|
|
||||||
if: ${{ !inputs.use-artifact }}
|
|
||||||
run: |
|
|
||||||
curl -sfL -o haos.qcow2.xz https://os-artifacts.home-assistant.io/${{github.event.inputs.version}}/haos_ova-${{github.event.inputs.version}}.qcow2.xz
|
|
||||||
|
|
||||||
- name: Get OS image artifact
|
|
||||||
if: ${{ inputs.use-artifact }}
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: haos_ova-${{ inputs.version }}.qcow2.xz
|
|
||||||
|
|
||||||
- name: Extract OS image
|
|
||||||
run: |
|
|
||||||
xz -dc haos*.qcow2.xz > tests/haos.qcow2
|
|
||||||
rm haos*.qcow2.xz
|
|
||||||
|
|
||||||
- name: Enable KVM group perms
|
|
||||||
run: |
|
|
||||||
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
|
|
||||||
sudo udevadm control --reload-rules
|
|
||||||
sudo udevadm trigger --name-match=kvm
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: |
|
|
||||||
./tests/run_tests.sh --durations=0 --durations-min=5.0
|
|
||||||
|
|
||||||
- name: Archive logs
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
name: logs
|
|
||||||
path: |
|
|
||||||
tests/lg_logs/**
|
|
||||||
|
|
||||||
- name: Archive JUnit reports
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
name: junit_reports
|
|
||||||
path: |
|
|
||||||
tests/junit_reports/*.xml
|
|
||||||
|
|
||||||
- name: Publish test report
|
|
||||||
uses: mikepenz/action-junit-report@v5
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
report_paths: 'tests/junit_reports/*.xml'
|
|
||||||
annotate_only: true
|
|
||||||
detailed_summary: true
|
|
||||||
10
.gitignore
vendored
10
.gitignore
vendored
@ -1,12 +1,2 @@
|
|||||||
# OS generated files
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
# Build output dirs
|
|
||||||
/release
|
/release
|
||||||
output*/
|
|
||||||
|
|
||||||
# Certificates
|
|
||||||
*.pem
|
*.pem
|
||||||
|
|
||||||
# vscode generated files
|
|
||||||
.vscode*
|
|
||||||
|
|||||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -1,4 +0,0 @@
|
|||||||
[submodule "buildroot"]
|
|
||||||
path = buildroot
|
|
||||||
url = https://github.com/home-assistant/buildroot.git
|
|
||||||
branch = 2024.02.x-haos
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
ignored:
|
|
||||||
- DL3008
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Home Assistant OS - development builds</title>
|
|
||||||
<link rel="shortcut icon" href="https://brands.home-assistant.io/homeassistant/icon.png">
|
|
||||||
<style>
|
|
||||||
body {
|
|
||||||
font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.error {
|
|
||||||
color: maroon;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>Home Assistant OS - development builds</h1>
|
|
||||||
<select id="os-builds"></select>
|
|
||||||
<div id="os-builds-list"></div>
|
|
||||||
<script>
|
|
||||||
const buildSelect = document.getElementById('os-builds');
|
|
||||||
const osBuildsList = document.getElementById('os-builds-list');
|
|
||||||
|
|
||||||
const fillVersions = async () => {
|
|
||||||
try {
|
|
||||||
const response = await fetch('/index.json');
|
|
||||||
if (!response.ok) {
|
|
||||||
const p = document.createElement('p');
|
|
||||||
p.className = "error";
|
|
||||||
p.textContent = "Could not load version index file.";
|
|
||||||
osBuildsList.appendChild(p);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const items = await response.json();
|
|
||||||
items.reverse();
|
|
||||||
|
|
||||||
items.forEach(buildVersion => {
|
|
||||||
buildSelect.appendChild(new Option(buildVersion, buildVersion));
|
|
||||||
});
|
|
||||||
|
|
||||||
buildSelect.dispatchEvent(new Event('change'));
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error fetching data:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildSelect.addEventListener('change', async function() {
|
|
||||||
osBuildsList.innerHTML = '';
|
|
||||||
|
|
||||||
const buildVersion = this.value;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const response = await fetch(`/indexes/${buildVersion}.json`);
|
|
||||||
if (!response.ok) {
|
|
||||||
const p = document.createElement('p');
|
|
||||||
p.className = "error";
|
|
||||||
p.textContent = `Could not load index file for version ${buildVersion}.`;
|
|
||||||
osBuildsList.appendChild(p);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const images = await response.json();
|
|
||||||
|
|
||||||
const ul = document.createElement('ul');
|
|
||||||
images.forEach(image => {
|
|
||||||
const li = document.createElement('li');
|
|
||||||
const a = document.createElement('a');
|
|
||||||
a.href =`/${buildVersion}/${image}`;
|
|
||||||
a.textContent = image;
|
|
||||||
li.appendChild(a);
|
|
||||||
ul.appendChild(li);
|
|
||||||
});
|
|
||||||
|
|
||||||
osBuildsList.appendChild(ul);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error fetching images:', error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
fillVersions();
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
55
Dockerfile
55
Dockerfile
@ -1,56 +1,21 @@
|
|||||||
FROM debian:bullseye
|
FROM ubuntu:18.04
|
||||||
|
|
||||||
# Set shell
|
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y \
|
||||||
apt-transport-https \
|
apt-transport-https \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
gpg-agent \
|
|
||||||
gpg \
|
|
||||||
dirmngr \
|
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
&& curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/docker.gpg \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/docker.gpg] \
|
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
|
||||||
https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list \
|
&& add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
|
||||||
&& apt-get update && apt-get install -y --no-install-recommends \
|
&& apt-get update && apt-get install -y docker-ce \
|
||||||
docker-ce \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Build tools
|
# Build Tools
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y \
|
||||||
automake \
|
wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
|
||||||
bash \
|
git make g++ file perl bash binutils locales qemu-utils bison flex \
|
||||||
bc \
|
|
||||||
binutils \
|
|
||||||
build-essential \
|
|
||||||
bzip2 \
|
|
||||||
cpio \
|
|
||||||
file \
|
|
||||||
git \
|
|
||||||
graphviz \
|
|
||||||
help2man \
|
|
||||||
jq \
|
|
||||||
make \
|
|
||||||
ncurses-dev \
|
|
||||||
openssh-client \
|
|
||||||
patch \
|
|
||||||
perl \
|
|
||||||
pigz \
|
|
||||||
python3 \
|
|
||||||
python3-matplotlib \
|
|
||||||
python-is-python3 \
|
|
||||||
qemu-utils \
|
|
||||||
rsync \
|
|
||||||
skopeo \
|
|
||||||
sudo \
|
|
||||||
texinfo \
|
|
||||||
unzip \
|
|
||||||
vim \
|
|
||||||
wget \
|
|
||||||
zip \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Init entry
|
# Init entry
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
# Documentation
|
|
||||||
|
|
||||||
Documentation for the Home Assistant Operating System is available at [developers.home-assistant.io/docs/operating-system/][docs].
|
|
||||||
If you want to contribute to this documentation, please refer to the [home-assistant/developers.home-assistant][docs-repo] repository.
|
|
||||||
|
|
||||||
For the list of Linux kernel versions used currently in this branch of Home Assistant Operating System, see [kernel.md](./kernel.md).
|
|
||||||
|
|
||||||
[docs]: https://developers.home-assistant.io/docs/operating-system/
|
|
||||||
[docs-repo]: https://github.com/home-assistant/developers.home-assistant/
|
|
||||||
12
Documentation/bluetooth.md
Normal file
12
Documentation/bluetooth.md
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Bluetooth
|
||||||
|
|
||||||
|
We support `bluetoothctl` on host. Later we want also support Bluetooth trought UI.
|
||||||
|
All pairs and settings are persistent over reboots and updates.
|
||||||
|
|
||||||
|
If you want setup Bluetooth on host, use the `bluetoothctl` utility.
|
||||||
|
|
||||||
|
## Scan devices
|
||||||
|
|
||||||
|
```
|
||||||
|
[bluetooth]# scan on
|
||||||
|
```
|
||||||
22
Documentation/boards/odroid-c2.md
Normal file
22
Documentation/boards/odroid-c2.md
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
# Odroid-C2
|
||||||
|
|
||||||
|
## eMMC
|
||||||
|
|
||||||
|
eMMC support is provided transparently. Just flash the image to the eMMC board as you would an SD card.
|
||||||
|
|
||||||
|
## Console
|
||||||
|
|
||||||
|
By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the AML0 console if you don't plan on using the serial adapter.
|
||||||
|
eg. `console=ttyAML0,115200n8 console=tty0`
|
||||||
|
|
||||||
|
## USB
|
||||||
|
|
||||||
|
A long-standing kernel bug currently results in some odd behavior. To use the USB, a device must be plugged into one of the USB ports at hard boot. If all devices are removed from the USB ports, the USB will cease to function until a reboot.
|
||||||
|
|
||||||
|
### OTG
|
||||||
|
|
||||||
|
The OTG USB is untested.
|
||||||
|
|
||||||
|
## GPIO
|
||||||
|
|
||||||
|
Refer to [the odroid wiki](https://wiki.odroid.com/odroid-c2/hardware/expansion_connectors).
|
||||||
16
Documentation/boards/ova.md
Normal file
16
Documentation/boards/ova.md
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# OVA
|
||||||
|
|
||||||
|
OVA stands for Open Virtual Appliance. Currently we had remove the ova files and publish a vmdk virtual disk,
|
||||||
|
until we have better OVF template to generate our OVA. This VMDK work with (maybe you need convert the disk):
|
||||||
|
- HyperV
|
||||||
|
- VirtualBox
|
||||||
|
- VMware
|
||||||
|
|
||||||
|
## Virtual Machine
|
||||||
|
|
||||||
|
You can use this vmdk in a virtual machine with follow requirements:
|
||||||
|
- OS: Linux 64bit
|
||||||
|
- UEFI boot
|
||||||
|
- min. 1GB RAM
|
||||||
|
- 2x vcpu
|
||||||
|
- 1x Network
|
||||||
35
Documentation/boards/raspberrypi.md
Normal file
35
Documentation/boards/raspberrypi.md
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# Raspberry PI
|
||||||
|
|
||||||
|
Supported Hardware:
|
||||||
|
|
||||||
|
| Device | Board |
|
||||||
|
|--------|-----------|
|
||||||
|
| Raspberry Pi A+/B/B+| rpi |
|
||||||
|
| Raspberry Pi Zero | rpi |
|
||||||
|
| Raspberry Pi Zero W | rpi0-w |
|
||||||
|
| Raspberry Pi 2 B | rpi2 |
|
||||||
|
| Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |
|
||||||
|
|
||||||
|
## Limitation 64bit
|
||||||
|
|
||||||
|
The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
|
||||||
|
|
||||||
|
## Serial console
|
||||||
|
|
||||||
|
For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
|
||||||
|
|
||||||
|
## I2C
|
||||||
|
|
||||||
|
Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
|
||||||
|
|
||||||
|
rpi-i2c.conf:
|
||||||
|
```
|
||||||
|
i2c-dev
|
||||||
|
i2c-bcm2708
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tweaks
|
||||||
|
|
||||||
|
If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.
|
||||||
|
|
||||||
|
[config]: ../configuration.md#automatic
|
||||||
17
Documentation/boards/tinker.md
Normal file
17
Documentation/boards/tinker.md
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Tinker Board
|
||||||
|
|
||||||
|
Supported Hardware:
|
||||||
|
|
||||||
|
| Device | Board |
|
||||||
|
|--------|-----------|
|
||||||
|
| Tinker RK3288 | tinker |
|
||||||
|
| Tinker S RK3288 | tinker |
|
||||||
|
|
||||||
|
## EMMC
|
||||||
|
|
||||||
|
Actual we support only SD cards. The support for EMMC will follow.
|
||||||
|
|
||||||
|
## Serial console
|
||||||
|
|
||||||
|
For access to terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
|
||||||
|
|
||||||
21
Documentation/build.md
Normal file
21
Documentation/build.md
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Building
|
||||||
|
|
||||||
|
Running `sudo ./enter.sh` will get you into the build Docker container.
|
||||||
|
`make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
|
||||||
|
|
||||||
|
## Scripts
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Helpers
|
||||||
|
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external menuconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-menuconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-menuconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-menuconfig`
|
||||||
|
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external savedefconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-update-defconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-update-defconfig`
|
||||||
|
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-update-config`
|
||||||
48
Documentation/configuration.md
Normal file
48
Documentation/configuration.md
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
# Configuration
|
||||||
|
|
||||||
|
## Automatic
|
||||||
|
|
||||||
|
You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
|
||||||
|
Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
|
||||||
|
|
||||||
|
```text
|
||||||
|
network/
|
||||||
|
modules/
|
||||||
|
udev/
|
||||||
|
authorized_keys
|
||||||
|
timesyncd.conf
|
||||||
|
hassos-xy.raucb
|
||||||
|
```
|
||||||
|
|
||||||
|
- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md].
|
||||||
|
- The `modules` folder is for modules-load configuration files.
|
||||||
|
- The `udev` folder is for udev rules files.
|
||||||
|
- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
|
||||||
|
- The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
|
||||||
|
- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
|
||||||
|
|
||||||
|
You can put this USB stick into the device and it will be read on startup. You can also trigger this process later over the
|
||||||
|
API/UI or by calling `systemctl restart hassos-config` on the host.
|
||||||
|
|
||||||
|
## Local
|
||||||
|
|
||||||
|
### Bootargs
|
||||||
|
|
||||||
|
You can edit or create a `cmdline.txt` in your boot partition. That will be read from the bootloader.
|
||||||
|
|
||||||
|
### Kernel-Module
|
||||||
|
|
||||||
|
The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules].
|
||||||
|
|
||||||
|
### Udev rules
|
||||||
|
|
||||||
|
The udev rules folder `/etc/udev/rules.d` is persistent and you can add your configuration files there.
|
||||||
|
|
||||||
|
### Network
|
||||||
|
|
||||||
|
You can manual add, edit or remove connections configurations from `/etc/NetworkManager/system-connections`.
|
||||||
|
|
||||||
|
[systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
|
||||||
|
[network.md]: network.md
|
||||||
|
[hassos-release]: https://github.com/home-assistant/hassos/releases/
|
||||||
|
[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html
|
||||||
29
Documentation/deployment.md
Normal file
29
Documentation/deployment.md
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
# Deployment
|
||||||
|
|
||||||
|
We provide 3 different types of release builds:
|
||||||
|
|
||||||
|
- development (beta/dev)
|
||||||
|
- staging (rc)
|
||||||
|
- production (stable)
|
||||||
|
|
||||||
|
## Versioning
|
||||||
|
|
||||||
|
The format of version is *MAJOR.BUILD*. Everytime we create a new release with same userland, we bump the build number.
|
||||||
|
The development use here own major number they will be bump for the stable version and the development version go to next major number.
|
||||||
|
|
||||||
|
```
|
||||||
|
0.x = development
|
||||||
|
1.x = stable
|
||||||
|
2.x = development
|
||||||
|
3.x = stable
|
||||||
|
```
|
||||||
|
|
||||||
|
## Git branch/Tag
|
||||||
|
|
||||||
|
The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release.
|
||||||
|
|
||||||
|
If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
|
||||||
|
|
||||||
|
## Upload release files
|
||||||
|
|
||||||
|
We use [ghr](https://github.com/tcnksm/ghr) to upload files to our repository. A binary version is available inside `scripts`.
|
||||||
24
Documentation/development.md
Normal file
24
Documentation/development.md
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# Development
|
||||||
|
|
||||||
|
## Boot system
|
||||||
|
|
||||||
|
`BOOT_SYS`:
|
||||||
|
- efi
|
||||||
|
- hyprid
|
||||||
|
- spl
|
||||||
|
- mbr
|
||||||
|
|
||||||
|
HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
|
||||||
|
boot drive. Is that not possible, you can use MBR for your device, they work also with SPLs.
|
||||||
|
|
||||||
|
Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
|
||||||
|
|
||||||
|
`BOOTLOADER`:
|
||||||
|
- uboot
|
||||||
|
- barebox
|
||||||
|
|
||||||
|
We support mainly uboot but for uefi system we can also use barebox. In future we hope to remove barebox with uboot also on uefi.
|
||||||
|
|
||||||
|
`DISK_SIZE`:
|
||||||
|
Default 2. That is the size of end image in GB.
|
||||||
|
|
||||||
106
Documentation/getting_started_development.md
Normal file
106
Documentation/getting_started_development.md
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
Getting started with Hassos development using Docker on GNU/Linux
|
||||||
|
=================================================================
|
||||||
|
|
||||||
|
First, install **docker** for your distribution - I'd advise to use your distro's provided packages, since that will make sure permissions et al. are sanely set up for what you are about to run. You're also expected to have your current user properly set up in in your sudoers policy, so that this account may elevate to root and execute arbitrary commands as UID 0 (this is required, since at some point during the build process, a new loopback device-backed filesystem image will be mounted inside a docker container - which requires a "privileged" container to run, which can only be done as root).
|
||||||
|
|
||||||
|
Next, make sure the docker daemon is running:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ sudo systemctl status docker
|
||||||
|
● docker.service - Docker Application Container Engine
|
||||||
|
Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
|
||||||
|
Active: inactive (dead)
|
||||||
|
Docs: https://docs.docker.com
|
||||||
|
```
|
||||||
|
|
||||||
|
My desktop distro doesn't start newly installed services by default, which means I'll have to manually fire up the `docker` service:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ sudo systemctl start docker
|
||||||
|
$ sudo systemctl --no-pager status docker -n0
|
||||||
|
● docker.service - Docker Application Container Engine
|
||||||
|
Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
|
||||||
|
Active: active (running) since Wed 2018-10-10 21:08:23 CEST; 25s ago
|
||||||
|
Docs: https://docs.docker.com
|
||||||
|
Main PID: 1531 (dockerd)
|
||||||
|
Tasks: 27 (limit: 4915)
|
||||||
|
Memory: 163.4M
|
||||||
|
CGroup: /system.slice/docker.service
|
||||||
|
├─1531 /usr/bin/dockerd -H fd://
|
||||||
|
└─1539 docker-containerd --config /var/run/docker/containerd/containerd.toml
|
||||||
|
```
|
||||||
|
|
||||||
|
Now, change your working directory to your hassos repo checkout (please adapt pathnames as needed), make sure your intended changes to the source tree are applied (and committed, ideally :)), and execute the `enter.sh` helper script:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ cd ~/codebase/hassos/
|
||||||
|
$ sudo scripts/enter.sh
|
||||||
|
Sending build context to Docker daemon 30.48MB
|
||||||
|
Step 1/6 : FROM ubuntu:18.04
|
||||||
|
[...]
|
||||||
|
---> 4dc25a21556b
|
||||||
|
Successfully built 4dc25a21556b
|
||||||
|
Successfully tagged hassbuildroot:latest
|
||||||
|
```
|
||||||
|
|
||||||
|
Note that the current iteration of `enter.sh` will try to load the **overlayfs** kernel module, which is not strictly required for docker's operation, as far as I can tell. It's OK if loading that module fails; the shell script will continue executing. If everything works out, you will find yourself in an interactive login shell inside your docker container/build environment, where you can peek around:
|
||||||
|
|
||||||
|
```
|
||||||
|
root@somehashinhex:/build#
|
||||||
|
root@somehashinhex:/build# cat scripts/build-all.sh
|
||||||
|
[...]
|
||||||
|
```
|
||||||
|
|
||||||
|
The _hassos_ developers provides another convenience script that will build hassos images for a (rather long!) list of targets - if you're not interested in building artifacts for all supported platforms, make sure to take a peek inside and monkeypatch away... After you're done making changes, start it, and go make a cup of tea. Or fifteen.
|
||||||
|
|
||||||
|
```
|
||||||
|
root@0db6f7079872:/build# scripts/build-all.sh
|
||||||
|
[...]
|
||||||
|
```
|
||||||
|
|
||||||
|
Personally, I removed all advertised build targets from the `all_platforms` array variable, expect for the _ova_ variant. That will result in a single VMDK image file at the very end of the build process. This image file is a compressed block device dump with a proper GPT partition table, prepared to ship into any OVA-compatible hypervisor's innards. For me, the end of the **ova** build steps looks like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
[...]
|
||||||
|
2097152+0 records out
|
||||||
|
1073741824 bytes (1.1 GB, 1.0 GiB) copied, 12.2145 s, 87.9 MB/s
|
||||||
|
make: Leaving directory '/build/buildroot'
|
||||||
|
make: Entering directory '/build/buildroot'
|
||||||
|
rm -rf /build/buildroot/output/target /build/buildroot/output/images /build/buildroot/output/host \
|
||||||
|
/build/buildroot/output/build /build/buildroot/output/staging \
|
||||||
|
/build/buildroot/output/legal-info /build/buildroot/output/graphs
|
||||||
|
make: Leaving directory '/build/buildroot'
|
||||||
|
```
|
||||||
|
|
||||||
|
The artifacts you just built are placed in the `target/` subdirectory:
|
||||||
|
|
||||||
|
```
|
||||||
|
root@fd292c061896:/build# ls -lh release/
|
||||||
|
total 141M
|
||||||
|
-rw-r--r-- 1 root root 141M Oct 10 20:22 hassos_ova-2.2.vmdk.gz
|
||||||
|
```
|
||||||
|
|
||||||
|
In order to be able to use this image file with the **qemu** hypervisor, you'll need to unpack it, and convert it to an image format that qemu can work with. Conveniently, the _hassos_ buildenv already provides all the tools we need for this conversion:
|
||||||
|
|
||||||
|
```
|
||||||
|
root@fd292c061896:/build# gunzip release/hassos_ova-2.2.vmdk.gz
|
||||||
|
root@fd292c061896:/build# qemu-img convert -O qcow2 release/hassos_ova-2.2.vmdk release/hassos_ova-2.2.qcow2
|
||||||
|
root@fd292c061896:/build# ls -lh release/
|
||||||
|
total 673M
|
||||||
|
-rw-r--r-- 1 root root 337M Oct 10 20:25 hassos_ova-2.2.qcow2
|
||||||
|
-rw-r--r-- 1 root root 337M Oct 10 20:22 hassos_ova-2.2.vmdk
|
||||||
|
```
|
||||||
|
|
||||||
|
Now, exit the docker container's environment, and find the build artifacts in the `releases/` directory beneath your repository checkout dir. (The generated files will be owned by _root_; make sure to `chown` them to your user account, if needed.)
|
||||||
|
|
||||||
|
From there, qemu can try to boot it. Since the generated image assumes UEFI support in the host/hypervisor, this is slightly more tricky than with "classic"(/legacy) MBR-based images. On the *Debian* host I use to run my qemu virtual machine on, you'll need to install the **ovmf** package, which is described as providing "UEFI firmware for 64-bit x86 virtual machines". That package will install a _TianoCore_-derived qemu UEFI image build at `/usr/share/OVMF/OVMF_CODE.fd`, which we'll use with qemu to boot the generated qcow2 image. (Please adapt pathnames as necessary, for example if you have installed the ovmf firmware image at another location.)
|
||||||
|
|
||||||
|
```
|
||||||
|
$ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive file=release/hassos_ova-2.2.qcow2,index=0,media=disk,if=ide,cache=none,format=qcow2 -drive file=/usr/share/ovmf/x64/OVMF_CODE.fd,if=pflash,format=raw,readonly=on
|
||||||
|
```
|
||||||
|
|
||||||
|
This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
|
||||||
|
|
||||||
|
After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS.
|
||||||
|
|
||||||
|
Happy hacking! :)
|
||||||
@ -3,22 +3,7 @@
|
|||||||
|
|
||||||
| Board | Version |
|
| Board | Version |
|
||||||
|-------|---------|
|
|-------|---------|
|
||||||
| Open Virtual Appliance | 6.12.41 |
|
| Open Virtual Applicance | 4.14.82 |
|
||||||
| Raspberry Pi | 6.12.34 |
|
| Raspberry Pi | 4.14.81 |
|
||||||
| Raspberry Pi 0-W | 6.12.34 |
|
| Tinker Board | 4.14.82 |
|
||||||
| Raspberry Pi 2 | 6.12.34 |
|
| Odroid-C2 | 4.14.67 |
|
||||||
| Raspberry Pi 3 | 6.12.34 |
|
|
||||||
| Raspberry Pi 4 | 6.12.34 |
|
|
||||||
| Raspberry Pi 5 | 6.12.34 |
|
|
||||||
| Home Assistant Yellow | 6.12.34 |
|
|
||||||
| Home Assistant Green | 6.12.41 |
|
|
||||||
| Tinker Board | 6.12.41 |
|
|
||||||
| ODROID-C2 | 6.12.41 |
|
|
||||||
| ODROID-C4 | 6.12.41 |
|
|
||||||
| ODROID-M1 | 6.12.41 |
|
|
||||||
| ODROID-M1S | 6.12.41 |
|
|
||||||
| ODROID-N2 | 6.12.41 |
|
|
||||||
| ODROID-XU4 | 6.12.41 |
|
|
||||||
| Generic aarch64 | 6.12.41 |
|
|
||||||
| Generic x86-64 | 6.12.41 |
|
|
||||||
| Khadas VIM3 | 6.12.41 |
|
|
||||||
|
|||||||
144
Documentation/network.md
Normal file
144
Documentation/network.md
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
# Network
|
||||||
|
|
||||||
|
HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only a manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive and imported to the host as described in [Configuration][configuration-usb].
|
||||||
|
|
||||||
|
## Configuration Examples
|
||||||
|
|
||||||
|
You can read the [Official Manual][keyfile] or find many configuration examples across the internet. The system is read-only, if you don't want the IP address to change on every boot, you should set the UUID property with a generic [UUID4][uuid]. Inside `\CONFIG\network\` on the USB or SD, create a file called `my-network` and add the appropriate contents below:
|
||||||
|
|
||||||
|
### Default
|
||||||
|
|
||||||
|
We have a preinstalled connection profile:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[connection]
|
||||||
|
id=HassOS default
|
||||||
|
uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
|
||||||
|
type=802-3-ethernet
|
||||||
|
|
||||||
|
[ipv4]
|
||||||
|
method=auto
|
||||||
|
|
||||||
|
[ipv6]
|
||||||
|
addr-gen-mode=stable-privacy
|
||||||
|
method=auto
|
||||||
|
```
|
||||||
|
|
||||||
|
### LAN
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[connection]
|
||||||
|
id=hassos-network
|
||||||
|
uuid=d55162b4-6152-4310-9312-8f4c54d86afa
|
||||||
|
type=802-3-ethernet
|
||||||
|
|
||||||
|
[ipv4]
|
||||||
|
method=auto
|
||||||
|
|
||||||
|
[ipv6]
|
||||||
|
addr-gen-mode=stable-privacy
|
||||||
|
method=auto
|
||||||
|
```
|
||||||
|
|
||||||
|
### Wireless WPA/PSK
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[connection]
|
||||||
|
id=hassos-network
|
||||||
|
uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
|
||||||
|
type=802-11-wireless
|
||||||
|
|
||||||
|
[802-11-wireless]
|
||||||
|
mode=infrastructure
|
||||||
|
ssid=MY_SSID
|
||||||
|
# Uncomment below if your SSID is not broadcasted
|
||||||
|
#hidden=true
|
||||||
|
|
||||||
|
[802-11-wireless-security]
|
||||||
|
auth-alg=open
|
||||||
|
key-mgmt=wpa-psk
|
||||||
|
psk=MY_WLAN_SECRET_KEY
|
||||||
|
|
||||||
|
[ipv4]
|
||||||
|
method=auto
|
||||||
|
|
||||||
|
[ipv6]
|
||||||
|
addr-gen-mode=stable-privacy
|
||||||
|
method=auto
|
||||||
|
```
|
||||||
|
|
||||||
|
### Static IP
|
||||||
|
|
||||||
|
Replace the following configuration:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[ipv4]
|
||||||
|
method=manual
|
||||||
|
address=192.168.1.111/24,192.168.1.1
|
||||||
|
dns=8.8.8.8;8.8.4.4;
|
||||||
|
```
|
||||||
|
For address, the value before the comma is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.
|
||||||
|
|
||||||
|
## Tips
|
||||||
|
|
||||||
|
### Reset network
|
||||||
|
|
||||||
|
If you want to reset the network configuration back to the default DHCP settings, use the following commands on the host:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ rm /etc/NetworkManager/system-connections/*
|
||||||
|
$ cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
|
||||||
|
$ nmcli con reload
|
||||||
|
```
|
||||||
|
|
||||||
|
### Powersave
|
||||||
|
|
||||||
|
If you have trouble with powersave you can do following:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[wifi]
|
||||||
|
# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
|
||||||
|
powersave=0
|
||||||
|
```
|
||||||
|
## Using nmcli to set a static IPV4 address
|
||||||
|
|
||||||
|
Log into the HASSOS base system via a console:
|
||||||
|
|
||||||
|
```
|
||||||
|
Welcome to HassOS
|
||||||
|
Hassio login:
|
||||||
|
```
|
||||||
|
Login as `root` (no password needed)
|
||||||
|
|
||||||
|
At the `hassio >` prompt, type `login` (as instructed).
|
||||||
|
|
||||||
|
From here you will use the `nmcli` configuration tool.
|
||||||
|
|
||||||
|
`# nmcli connection show` will list the “HassOS default” connection in use.
|
||||||
|
|
||||||
|
`# nmcli con show "HassOS default"` will list all the properties of the connection.
|
||||||
|
|
||||||
|
`# nmcli con edit "HassOS default"` will put you in a position to edit the connection.
|
||||||
|
|
||||||
|
`nmcli> print ipv4` will show you the ipv4 properties of this connection.
|
||||||
|
|
||||||
|
To add your static IP address (select 'yes' for manual method);
|
||||||
|
```
|
||||||
|
nmcli> set ipv4.addresses 192.168.100.10/24
|
||||||
|
Do you also want to set 'ipv4.method' to 'manual'? [yes]:
|
||||||
|
```
|
||||||
|
In addition I have found it is wise to set the dns server and the local gateway. For most home routers these will be the same address. If you are using Pi-Hole you can set the dns to that.
|
||||||
|
```
|
||||||
|
nmcli> set ipv4.dns 192.168.100.1
|
||||||
|
nmcli> set ipv4.gateway 192.168.100.1
|
||||||
|
nmcli> save
|
||||||
|
nmcli> quit
|
||||||
|
```
|
||||||
|
|
||||||
|
If you now view the default connection `cat /etc/NetworkManager/system-connections/default` you should see the method is manual and the address is set.
|
||||||
|
|
||||||
|
Doing a `nmcli con reload` does not always work so restart the VM.
|
||||||
|
|
||||||
|
[keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
|
||||||
|
[configuration-usb]: configuration.md
|
||||||
|
[uuid]: https://www.uuidgenerator.net/
|
||||||
61
Makefile
61
Makefile
@ -1,61 +0,0 @@
|
|||||||
BUILDDIR:=$(shell pwd)
|
|
||||||
|
|
||||||
BUILDROOT=$(BUILDDIR)/buildroot
|
|
||||||
BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
|
|
||||||
DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
|
|
||||||
|
|
||||||
TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
|
|
||||||
TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
|
|
||||||
|
|
||||||
# Set O variable if not already done on the command line
|
|
||||||
ifneq ("$(origin O)", "command line")
|
|
||||||
O := $(BUILDDIR)/output
|
|
||||||
else
|
|
||||||
override O := $(BUILDDIR)/$(O)
|
|
||||||
endif
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
COLOR_STEP := $(shell tput smso 2>/dev/null)
|
|
||||||
COLOR_WARN := $(shell (tput setab 3; tput setaf 0) 2>/dev/null)
|
|
||||||
TERM_RESET := $(shell tput sgr0 2>/dev/null)
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) default
|
|
||||||
|
|
||||||
.PHONY: $(TARGETS) $(TARGETS_CONFIG) default buildroot-help help
|
|
||||||
|
|
||||||
# fallback target when target undefined here is given
|
|
||||||
.DEFAULT:
|
|
||||||
@echo "$(COLOR_STEP)=== Falling back to Buildroot target '$@' ===$(TERM_RESET)"
|
|
||||||
$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$@"
|
|
||||||
|
|
||||||
# default target when no target is given - must be first in Makefile
|
|
||||||
default:
|
|
||||||
$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
|
|
||||||
|
|
||||||
$(TARGETS_CONFIG): %-config:
|
|
||||||
@if [ -f $(O)/.config ] && ! grep -q 'BR2_DEFCONFIG="$(DEFCONFIG_DIR)/$*_defconfig"' $(O)/.config; then \
|
|
||||||
echo "$(COLOR_WARN)WARNING: Output directory '$(O)' already contains files for another target!$(TERM_RESET)"; \
|
|
||||||
echo " Before running build for a different target, run 'make distclean' first."; \
|
|
||||||
echo ""; \
|
|
||||||
bash -c 'read -t 10 -p "Waiting 10s, press enter to continue or Ctrl-C to abort..."' || true; \
|
|
||||||
fi
|
|
||||||
@echo "$(COLOR_STEP)=== Using $*_defconfig ===$(TERM_RESET)"
|
|
||||||
$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"
|
|
||||||
|
|
||||||
$(TARGETS): %: %-config
|
|
||||||
@echo "$(COLOR_STEP)=== Building $@ ===$(TERM_RESET)"
|
|
||||||
$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
|
|
||||||
|
|
||||||
buildroot-help:
|
|
||||||
$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) help
|
|
||||||
|
|
||||||
help:
|
|
||||||
@echo "Run 'make <target>' to build a target image."
|
|
||||||
@echo "Run 'make <target>-config' to configure buildroot for a target."
|
|
||||||
@echo ""
|
|
||||||
@echo "Supported targets: $(TARGETS)"
|
|
||||||
@echo ""
|
|
||||||
@echo "Unknown Makefile targets fall back to Buildroot make - for details run 'make buildroot-help'"
|
|
||||||
71
README.md
71
README.md
@ -1,61 +1,14 @@
|
|||||||
# Home Assistant Operating System
|
# HassOS
|
||||||
|
Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of IoT hardware. It is also available as virtual appliance. The whole system is optimized for embedded system and security. You can update the system simple with OTA updates or offline updates.
|
||||||
|
|
||||||
Home Assistant Operating System (formerly HassOS) is a Linux based operating system optimized to host [Home Assistant](https://www.home-assistant.io) and its [Add-ons](https://www.home-assistant.io/addons/).
|
## Focus
|
||||||
|
|
||||||
Home Assistant Operating System uses Docker as its container engine. By default it deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [Buildroot](https://buildroot.org/) and it is optimized to run Home Assistant. It targets single board compute (SBC) devices like the Raspberry Pi or ODROID but also supports x86-64 systems with UEFI.
|
- Linux kernel 4.14 (LT)
|
||||||
|
- Barebox as bootloader on EFI
|
||||||
[](https://www.openhomefoundation.org/)
|
- U-Boot as bootloader on IoT
|
||||||
|
- RAUC for OTA updates
|
||||||
## Features
|
- SquashFS LZ4 as filesystem
|
||||||
|
- Docker 18.03.1
|
||||||
- Lightweight and memory-efficient
|
- AppArmor protected
|
||||||
- Minimized I/O
|
- ZRAM LZ4 for /tmp, /var, swap
|
||||||
- Over The Air (OTA) updates
|
- Run every supervisor
|
||||||
- Offline updates
|
|
||||||
- Modular using Docker container engine
|
|
||||||
|
|
||||||
## Supported hardware
|
|
||||||
|
|
||||||
- Nabu Casa
|
|
||||||
- Raspberry Pi
|
|
||||||
- Hardkernel ODROID
|
|
||||||
- Asus Tinker Board
|
|
||||||
- Generic x86-64 (e.g. Intel NUC)
|
|
||||||
- Virtual appliances
|
|
||||||
|
|
||||||
See the full list and specific models [here](./Documentation/boards/README.md)
|
|
||||||
|
|
||||||
## Getting Started
|
|
||||||
|
|
||||||
If you just want to use Home Assistant the official [getting started guide](https://www.home-assistant.io/getting-started/) and [installation instructions](https://www.home-assistant.io/hassio/installation/) take you through how to download Home Assistant Operating System and get it running on your machine.
|
|
||||||
|
|
||||||
If you're interested in finding out more about Home Assistant Operating System and how it works read on...
|
|
||||||
|
|
||||||
## Development
|
|
||||||
|
|
||||||
If you don't have experience with embedded systems, Buildroot or the build process for Linux distributions it is recommended to read up on these topics first (e.g. [Bootlin](https://bootlin.com/docs/) has excellent resources).
|
|
||||||
|
|
||||||
The Home Assistant Operating System documentation can be found on the [Home Assistant Developer Docs website](https://developers.home-assistant.io/docs/operating-system).
|
|
||||||
|
|
||||||
### Components
|
|
||||||
|
|
||||||
- **Bootloader:**
|
|
||||||
- [GRUB](https://www.gnu.org/software/grub/) for devices that support UEFI
|
|
||||||
- [U-Boot](https://www.denx.de/wiki/U-Boot) for devices that don't support UEFI
|
|
||||||
- **Operating System:**
|
|
||||||
- [Buildroot](https://buildroot.org/) LTS Linux
|
|
||||||
- **File Systems:**
|
|
||||||
- [SquashFS](https://www.kernel.org/doc/Documentation/filesystems/squashfs.txt) for read-only file systems (using LZ4 compression)
|
|
||||||
- [ZRAM](https://www.kernel.org/doc/Documentation/blockdev/zram.txt) for `/tmp`, `/var` and swap (using LZ4 compression)
|
|
||||||
- **Container Platform:**
|
|
||||||
- [Docker Engine](https://docs.docker.com/engine/) for running Home Assistant components in containers
|
|
||||||
- **Updates:**
|
|
||||||
- [RAUC](https://rauc.io/) for Over The Air (OTA) and USB updates
|
|
||||||
- **Security:**
|
|
||||||
- [AppArmor](https://apparmor.net/) Linux kernel security module
|
|
||||||
|
|
||||||
### Development builds
|
|
||||||
|
|
||||||
The Development build GitHub Action Workflow is a manually triggered workflow
|
|
||||||
which creates Home Assistant OS development builds. The development builds are
|
|
||||||
available at [https://os-artifacts.home-assistant.io/index.html](https://os-artifacts.home-assistant.io/index.html).
|
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit b73c8daa24c7930195b48a56d9ace57d32a58fb4
|
|
||||||
@ -1,21 +1,6 @@
|
|||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/hassos/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/gasket/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo8-firmware/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo-pci/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/pi-bluetooth/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/lxd-guest-agent/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/rockchip-blobs/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl88x2bu/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/vcgencmd/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in"
|
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
console=ttyS0 console=tty0
|
|
||||||
@ -1,85 +0,0 @@
|
|||||||
set default=99
|
|
||||||
set timeout=1
|
|
||||||
|
|
||||||
set ORDER="A B"
|
|
||||||
set A_OK=0
|
|
||||||
set B_OK=0
|
|
||||||
set A_TRY=0
|
|
||||||
set B_TRY=0
|
|
||||||
set MACHINE_ID=""
|
|
||||||
load_env
|
|
||||||
|
|
||||||
# select bootable slot
|
|
||||||
for SLOT in $ORDER; do
|
|
||||||
if [ "$SLOT" == "A" ]; then
|
|
||||||
INDEX=0
|
|
||||||
OK=$A_OK
|
|
||||||
TRY=$A_TRY
|
|
||||||
fi
|
|
||||||
if [ "$SLOT" == "B" ]; then
|
|
||||||
INDEX=1
|
|
||||||
OK=$B_OK
|
|
||||||
TRY=$B_TRY
|
|
||||||
fi
|
|
||||||
if [ "$OK" -eq 1 -a "$TRY" -lt 3 ]; then
|
|
||||||
default=$INDEX
|
|
||||||
|
|
||||||
# increment attempts and save back to slot
|
|
||||||
if [ "$TRY" -eq 1 ]; then
|
|
||||||
TRY=2
|
|
||||||
elif [ "$TRY" -eq 2 ]; then
|
|
||||||
TRY=3
|
|
||||||
else
|
|
||||||
TRY=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$SLOT" == "A" ]; then
|
|
||||||
A_TRY=$TRY
|
|
||||||
fi
|
|
||||||
if [ "$SLOT" == "B" ]; then
|
|
||||||
B_TRY=$TRY
|
|
||||||
fi
|
|
||||||
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# No bootable slot found, choose rescue...
|
|
||||||
if [ "$default" -eq 99 ]; then
|
|
||||||
if [ "$A_OK" -eq 1 ]; then
|
|
||||||
default=2
|
|
||||||
fi
|
|
||||||
if [ "$B_OK" -eq 1 ]; then
|
|
||||||
default=3
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$MACHINE_ID" == "" ]; then
|
|
||||||
boot_condition="systemd.condition-first-boot=true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID
|
|
||||||
|
|
||||||
default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 systemd.machine_id=$MACHINE_ID fsck.repair=yes $boot_condition"
|
|
||||||
file_env -f ($root)/cmdline.txt cmdline
|
|
||||||
|
|
||||||
# root is a full HDD/partition definition in GRUB format like hd0,gpt1
|
|
||||||
# We extract the part before the comma to then append our own partition index
|
|
||||||
# at the end. This is hacky but the best way I found
|
|
||||||
regexp --set 1:boothd (.+),.+ ${root}
|
|
||||||
|
|
||||||
menuentry "Slot A (OK=$A_OK TRY=$A_TRY)" {
|
|
||||||
linux (${boothd},gpt2)/Image root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A
|
|
||||||
}
|
|
||||||
|
|
||||||
menuentry "Slot B (OK=$B_OK TRY=$B_TRY)" {
|
|
||||||
linux (${boothd},gpt4)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B
|
|
||||||
}
|
|
||||||
|
|
||||||
menuentry "Slot A (rescue shell)" {
|
|
||||||
linux (${boothd},gpt2)/Image root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A systemd.unit=recovery.target
|
|
||||||
}
|
|
||||||
|
|
||||||
menuentry "Slot B (rescue shell)" {
|
|
||||||
linux (${boothd},gpt4)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target
|
|
||||||
}
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# shellcheck disable=SC2155
|
|
||||||
|
|
||||||
function hassos_pre_image() {
|
|
||||||
local BOOT_DATA="$(path_boot_dir)"
|
|
||||||
local EFIPART_DATA="${BINARIES_DIR}/efi-part"
|
|
||||||
|
|
||||||
mkdir -p "${BOOT_DATA}/EFI/BOOT"
|
|
||||||
|
|
||||||
cp "${BOARD_DIR}/grub.cfg" "${EFIPART_DATA}/EFI/BOOT/grub.cfg"
|
|
||||||
cp "${BOARD_DIR}/cmdline.txt" "${EFIPART_DATA}/cmdline.txt"
|
|
||||||
grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" create
|
|
||||||
grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set ORDER="A B"
|
|
||||||
grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_OK=1
|
|
||||||
grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_TRY=0
|
|
||||||
|
|
||||||
cp -r "${EFIPART_DATA}/"* "${BOOT_DATA}/"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function hassos_post_image() {
|
|
||||||
convert_disk_image_virtual vmdk
|
|
||||||
convert_disk_image_virtual vdi
|
|
||||||
convert_disk_image_virtual qcow2
|
|
||||||
|
|
||||||
convert_disk_image_zip vmdk
|
|
||||||
convert_disk_image_zip vdi
|
|
||||||
convert_disk_image_xz qcow2
|
|
||||||
|
|
||||||
convert_disk_image_xz
|
|
||||||
}
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
CONFIG_EFI_STUB=y
|
|
||||||
|
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
|
|
||||||
|
|
||||||
CONFIG_CONNECTOR=y
|
|
||||||
|
|
||||||
CONFIG_VSOCKETS=y
|
|
||||||
|
|
||||||
CONFIG_VIRTIO=y
|
|
||||||
CONFIG_VIRTIO_PCI=y
|
|
||||||
CONFIG_VIRTIO_NET=y
|
|
||||||
CONFIG_VIRTIO_BALLOON=m
|
|
||||||
CONFIG_VIRTIO_MEM=m
|
|
||||||
CONFIG_VIRTIO_INPUT=m
|
|
||||||
CONFIG_VIRTIO_BLK=y
|
|
||||||
CONFIG_VIRTIO_CONSOLE=m
|
|
||||||
CONFIG_VIRTIO_VSOCKETS=m
|
|
||||||
CONFIG_VIRTIO_MMIO=y
|
|
||||||
CONFIG_SCSI_VIRTIO=y
|
|
||||||
CONFIG_HW_RANDOM_VIRTIO=m
|
|
||||||
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
|
|
||||||
CONFIG_VIRTIO_IOMMU=m
|
|
||||||
CONFIG_CRYPTO_ENGINE=m
|
|
||||||
CONFIG_CRYPTO_DEV_VIRTIO=m
|
|
||||||
|
|
||||||
# options for backward compatibility
|
|
||||||
CONFIG_ARMV8_DEPRECATED=y
|
|
||||||
CONFIG_SWP_EMULATION=y
|
|
||||||
CONFIG_CP15_BARRIER_EMULATION=y
|
|
||||||
CONFIG_SETEND_EMULATION=y
|
|
||||||
|
|
||||||
# These options are needed for virtio-fs
|
|
||||||
CONFIG_FUSE_FS=y
|
|
||||||
CONFIG_VIRTIO_FS=y
|
|
||||||
CONFIG_DAX=y
|
|
||||||
CONFIG_FS_DAX=y
|
|
||||||
CONFIG_ZONE_DEVICE=y
|
|
||||||
|
|
||||||
CONFIG_DMI_SYSFS=m
|
|
||||||
CONFIG_FW_CFG_SYSFS=m
|
|
||||||
|
|
||||||
CONFIG_NVME_CORE=y
|
|
||||||
CONFIG_BLK_DEV_NVME=y
|
|
||||||
CONFIG_NVME_HWMON=y
|
|
||||||
|
|
||||||
CONFIG_DRM_VIRTIO_GPU=m
|
|
||||||
|
|
||||||
CONFIG_HYPERV=y
|
|
||||||
CONFIG_HYPERV_UTILS=m
|
|
||||||
CONFIG_HYPERV_BALLOON=m
|
|
||||||
CONFIG_HYPERV_KEYBOARD=m
|
|
||||||
CONFIG_HYPERV_STORAGE=y
|
|
||||||
CONFIG_HYPERV_NET=y
|
|
||||||
CONFIG_HYPERV_VSOCKETS=m
|
|
||||||
CONFIG_PCI_HYPERV=m
|
|
||||||
CONFIG_PCI_HYPERV_INTERFACE=m
|
|
||||||
CONFIG_FB_HYPERV=y
|
|
||||||
|
|
||||||
CONFIG_I6300ESB_WDT=y
|
|
||||||
|
|
||||||
# GPIO support
|
|
||||||
CONFIG_GPIO_ZYNQ=y
|
|
||||||
CONFIG_GPIO_PCA9570=y
|
|
||||||
|
|
||||||
# PHY drivers
|
|
||||||
CONFIG_PHY_XILINX_ZYNQMP=y
|
|
||||||
|
|
||||||
# USB support
|
|
||||||
CONFIG_USB_ONBOARD_DEV=y
|
|
||||||
CONFIG_USB_ONBOARD_DEV_USB5744=y
|
|
||||||
|
|
||||||
# i2c support
|
|
||||||
CONFIG_I2C_CADENCE=y
|
|
||||||
|
|
||||||
# 1-wire
|
|
||||||
CONFIG_W1_MASTER_AMD_AXI=m
|
|
||||||
CONFIG_W1_SLAVE_THERM=m
|
|
||||||
|
|
||||||
# IIO
|
|
||||||
CONFIG_XILINX_AMS=m
|
|
||||||
|
|
||||||
# Audio drivers
|
|
||||||
CONFIG_SND_HDA_INTEL=m
|
|
||||||
CONFIG_SND_HDA_GENERIC=m
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
BOARD_ID=generic-aarch64
|
|
||||||
BOARD_NAME="Generic aarch64"
|
|
||||||
CHASSIS=embedded
|
|
||||||
BOOTLOADER=grub
|
|
||||||
KERNEL_FILE=Image
|
|
||||||
PARTITION_TABLE_TYPE=gpt
|
|
||||||
BOOT_SIZE=32M
|
|
||||||
BOOT_SPL=false
|
|
||||||
DISK_SIZE=6G
|
|
||||||
SUPERVISOR_MACHINE=qemuarm-64
|
|
||||||
SUPERVISOR_ARCH=aarch64
|
|
||||||
@ -1,21 +1,28 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# shellcheck disable=SC2155
|
|
||||||
|
|
||||||
function hassos_pre_image() {
|
function hassos_pre_image() {
|
||||||
local BOOT_DATA="$(path_boot_dir)"
|
local BOOT_DATA="$(path_boot_dir)"
|
||||||
|
local SPL_IMG="$(path_spl_img)"
|
||||||
|
|
||||||
cp -t "${BOOT_DATA}" \
|
cp -t ${BOOT_DATA} \
|
||||||
"${BINARIES_DIR}/boot.scr" \
|
${BINARIES_DIR}/boot.scr \
|
||||||
"${BINARIES_DIR}/rk3288-tinker.dtb" \
|
${BINARIES_DIR}/rk3288-tinker.dtb
|
||||||
"${BINARIES_DIR}/rk3288-tinker-s.dtb"
|
|
||||||
|
|
||||||
mkdir -p "${BOOT_DATA}/overlays"
|
echo "console=tty1" > ${BOOT_DATA}/cmdline.txt
|
||||||
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
|
|
||||||
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
|
# Create boot binary
|
||||||
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
|
rm -f ${BINARIES_DIR}/u-boot-spl-dtb.img
|
||||||
|
mkimage -n rk3288 -T rksd -d ${BINARIES_DIR}/u-boot-spl-dtb.bin ${BINARIES_DIR}/u-boot-spl-dtb.img
|
||||||
|
cat ${BINARIES_DIR}/u-boot-dtb.bin >> ${BINARIES_DIR}/u-boot-spl-dtb.img
|
||||||
|
|
||||||
|
# SPL
|
||||||
|
create_spl_image
|
||||||
|
|
||||||
|
dd if=${BINARIES_DIR}/u-boot-spl-dtb.img of=${SPL_IMG} conv=notrunc bs=512 seek=64
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function hassos_post_image() {
|
function hassos_post_image() {
|
||||||
convert_disk_image_xz
|
convert_disk_image_gz
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
|
|
||||||
#overlays=rpi-rf-mod
|
|
||||||
@ -1 +0,0 @@
|
|||||||
console=tty0
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
image spl.img {
|
|
||||||
size = ${BOOT_SPL_SIZE}
|
|
||||||
|
|
||||||
hdimage {
|
|
||||||
partition-table-type = "none"
|
|
||||||
fill = "yes"
|
|
||||||
}
|
|
||||||
|
|
||||||
partition uboot {
|
|
||||||
offset = 32k
|
|
||||||
image = "u-boot-rockchip.bin"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,5 @@ BOARD_NAME="Asus TinkerBoard"
|
|||||||
CHASSIS=embedded
|
CHASSIS=embedded
|
||||||
BOOTLOADER=uboot
|
BOOTLOADER=uboot
|
||||||
KERNEL_FILE=zImage
|
KERNEL_FILE=zImage
|
||||||
PARTITION_TABLE_TYPE=hybrid
|
BOOT_SYS=spl
|
||||||
BOOT_SIZE=24M
|
|
||||||
BOOT_SPL=true
|
|
||||||
BOOT_SPL_SIZE=8M
|
|
||||||
BOOT_ENV_SIZE=0x8000
|
BOOT_ENV_SIZE=0x8000
|
||||||
SUPERVISOR_MACHINE=tinker
|
|
||||||
SUPERVISOR_ARCH=armv7
|
|
||||||
|
|||||||
@ -1,7 +0,0 @@
|
|||||||
partition spl {
|
|
||||||
size = ${BOOT_SPL_SIZE}
|
|
||||||
image = "spl.img"
|
|
||||||
in-partition-table = "no"
|
|
||||||
offset = 0
|
|
||||||
holes = {"(0; 17k)"}
|
|
||||||
}
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
## Kernel
|
|
||||||
https://github.com/armbian/build/tree/master/patch/kernel/rockchip-next
|
|
||||||
|
|
||||||
## u-boot
|
|
||||||
https://github.com/armbian/build/tree/master/patch/u-boot/u-boot-rockchip/board_tinkerboard
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,122 @@
|
|||||||
|
From 7ba71967a2678e119bcd819ac92d08bd038e1879 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 17 Jul 2017 18:34:33 +0000
|
||||||
|
Subject: [PATCH 5/5] Mali midgard r19p0 fixes for 4.13 kernels
|
||||||
|
|
||||||
|
Mostly due to DMA structure members renamed, and some signatures
|
||||||
|
modifications done during the development of Linux 4.11.
|
||||||
|
|
||||||
|
* mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf
|
||||||
|
11bac80004499ea59f361ef2a5516c84b6eab675
|
||||||
|
v4.11-rc1
|
||||||
|
|
||||||
|
* sched/headers: Move task->mm handling methods to <linux/sched/mm.h>
|
||||||
|
68e21be2916b359fd8afb536c1911dc014cfd03e
|
||||||
|
v4.11-rc1
|
||||||
|
|
||||||
|
* sched/headers: Move task-stack related APIs from <linux/sched.h> to
|
||||||
|
<linux/sched/task_stack.h>
|
||||||
|
f3ac60671954c8d413532627b1be13a76f394c49
|
||||||
|
v4.11-rc1
|
||||||
|
|
||||||
|
* dma-fence: Introduce drm_fence_set_error() helper
|
||||||
|
a009e975da5c7d42a7f5eaadc54946eb5f76c9af
|
||||||
|
v4.11-rc1
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase.h | 4 ++++
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_fence.h | 4 ++++
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_mem_linux.c | 6 ++++++
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_sync_file.c | 12 ++++++++++++
|
||||||
|
4 files changed, 26 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h
|
||||||
|
index d77f186..5ee47c4 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase.h
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase.h
|
||||||
|
@@ -35,6 +35,10 @@
|
||||||
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/rwsem.h>
|
||||||
|
#include <linux/sched.h>
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||||
|
+#include <linux/sched/task_stack.h>
|
||||||
|
+#include <linux/sched/mm.h>
|
||||||
|
+#endif
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/spinlock.h>
|
||||||
|
#include <linux/vmalloc.h>
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h
|
||||||
|
index 8d39299..3c2e3a9 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_fence.h
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h
|
||||||
|
@@ -134,7 +134,11 @@ static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom)
|
||||||
|
static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom,
|
||||||
|
int status)
|
||||||
|
{
|
||||||
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
||||||
|
katom->dma_fence.fence->status = status;
|
||||||
|
+#else
|
||||||
|
+ katom->dma_fence.fence->error = status;
|
||||||
|
+#endif
|
||||||
|
return dma_fence_signal(katom->dma_fence.fence);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
||||||
|
index b1f2c46..896aa35 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
||||||
|
@@ -1788,8 +1788,14 @@ static void kbase_cpu_vm_close(struct vm_area_struct *vma)
|
||||||
|
KBASE_EXPORT_TEST_API(kbase_cpu_vm_close);
|
||||||
|
|
||||||
|
|
||||||
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
||||||
|
static int kbase_cpu_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||||
|
{
|
||||||
|
+#else
|
||||||
|
+static int kbase_cpu_vm_fault(struct vm_fault *vmf)
|
||||||
|
+{
|
||||||
|
+ struct vm_area_struct *vma = vmf->vma;
|
||||||
|
+#endif
|
||||||
|
struct kbase_cpu_mapping *map = vma->vm_private_data;
|
||||||
|
pgoff_t rel_pgoff;
|
||||||
|
size_t i;
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
|
||||||
|
index 4e1621c..d84a54e 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
|
||||||
|
@@ -161,8 +161,13 @@ static void kbase_fence_wait_callback(struct dma_fence *fence,
|
||||||
|
struct kbase_context *kctx = katom->kctx;
|
||||||
|
|
||||||
|
/* Cancel atom if fence is erroneous */
|
||||||
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
||||||
|
if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0)
|
||||||
|
katom->event_code = BASE_JD_EVENT_JOB_CANCELLED;
|
||||||
|
+#else
|
||||||
|
+ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error < 0)
|
||||||
|
+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (kbase_fence_dep_count_dec_and_test(katom)) {
|
||||||
|
/* We take responsibility of handling this */
|
||||||
|
@@ -273,10 +278,17 @@ static void kbase_sync_fence_info_get(struct dma_fence *fence,
|
||||||
|
* 1 : signaled
|
||||||
|
*/
|
||||||
|
if (dma_fence_is_signaled(fence)) {
|
||||||
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
||||||
|
if (fence->status < 0)
|
||||||
|
info->status = fence->status; /* signaled with error */
|
||||||
|
else
|
||||||
|
info->status = 1; /* signaled with success */
|
||||||
|
+#else
|
||||||
|
+ if (fence->error < 0)
|
||||||
|
+ info->status = fence->error; /* signaled with error */
|
||||||
|
+ else
|
||||||
|
+ info->status = 1; /* signaled with success */
|
||||||
|
+#endif
|
||||||
|
} else {
|
||||||
|
info->status = 0; /* still active (unsignaled) */
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
From 675fbbc309e4f7c805cf4fbd7c463cfc8308b54e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
|
||||||
Date: Wed, 17 Feb 2021 19:55:41 +0100
|
|
||||||
Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
|
|
||||||
RK3288"
|
|
||||||
|
|
||||||
This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rockchip/rk3288.dtsi | 8 --------
|
|
||||||
1 file changed, 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
||||||
index 3f1d640afafae..becf3abd8367f 100644
|
|
||||||
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
||||||
@@ -387,8 +387,6 @@ uart0: serial@ff180000 {
|
|
||||||
reg-io-width = <4>;
|
|
||||||
clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
|
|
||||||
clock-names = "baudclk", "apb_pclk";
|
|
||||||
- dmas = <&dmac_peri 1>, <&dmac_peri 2>;
|
|
||||||
- dma-names = "tx", "rx";
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&uart0_xfer>;
|
|
||||||
status = "disabled";
|
|
||||||
@@ -402,8 +400,6 @@ uart1: serial@ff190000 {
|
|
||||||
reg-io-width = <4>;
|
|
||||||
clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
|
|
||||||
clock-names = "baudclk", "apb_pclk";
|
|
||||||
- dmas = <&dmac_peri 3>, <&dmac_peri 4>;
|
|
||||||
- dma-names = "tx", "rx";
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&uart1_xfer>;
|
|
||||||
status = "disabled";
|
|
||||||
@@ -430,8 +426,6 @@ uart3: serial@ff1b0000 {
|
|
||||||
reg-io-width = <4>;
|
|
||||||
clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
|
|
||||||
clock-names = "baudclk", "apb_pclk";
|
|
||||||
- dmas = <&dmac_peri 7>, <&dmac_peri 8>;
|
|
||||||
- dma-names = "tx", "rx";
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&uart3_xfer>;
|
|
||||||
status = "disabled";
|
|
||||||
@@ -445,8 +439,6 @@ uart4: serial@ff1c0000 {
|
|
||||||
reg-io-width = <4>;
|
|
||||||
clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
|
|
||||||
clock-names = "baudclk", "apb_pclk";
|
|
||||||
- dmas = <&dmac_peri 9>, <&dmac_peri 10>;
|
|
||||||
- dma-names = "tx", "rx";
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&uart4_xfer>;
|
|
||||||
status = "disabled";
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
From 37b4467356113f17f55066aef54db55b64daa030 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 5 Nov 2018 22:15:14 +0100
|
|
||||||
Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
|
|
||||||
|
|
||||||
Taken from, and tested by @TonyMac32 .
|
|
||||||
|
|
||||||
Well, the original one was tested by him but I had to adapt the
|
|
||||||
registers definitions to the new 64-bits LPAE-compliant syntax.
|
|
||||||
|
|
||||||
Therefore that *might* break, along with a few other patches.
|
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
||||||
[move change to rk3288-tinker.dtsi]
|
|
||||||
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 19 +++++++++++++++++++
|
|
||||||
1 file changed, 19 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
index 09618bb7d872c..30430d2e64b93 100644
|
|
||||||
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
@@ -483,6 +483,25 @@ &sdio0 {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&spi2 {
|
|
||||||
+ max-freq = <50000000>;
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ spidev@0 {
|
|
||||||
+ compatible = "rockchip,spi_tinker";
|
|
||||||
+ reg = <0x0 0>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ spi-cpha = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ spidev@1 {
|
|
||||||
+ compatible = "rockchip,spi_tinker";
|
|
||||||
+ reg = <0x1>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ spi-cpha = <1>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&tsadc {
|
|
||||||
rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
|
|
||||||
rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
|
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
From f76c9c58669a3bba0456191431be558ab8054f50 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 17 Jul 2017 11:43:00 +0000
|
||||||
|
Subject: [PATCH 3/5] Using the new header on 4.12 kernels for copy_*_user
|
||||||
|
|
||||||
|
These changes are due to :
|
||||||
|
* generic ...copy_..._user primitives
|
||||||
|
d597580d373774b1bdab84b3d26ff0b55162b916
|
||||||
|
Version : 4.12-rc1
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/base/ump/src/linux/ump_kernel_linux.c | 7 ++++++-
|
||||||
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/base/ump/src/linux/ump_kernel_linux.c
|
||||||
|
index d6c3c53..bb3a7f0 100644
|
||||||
|
--- a/drivers/base/ump/src/linux/ump_kernel_linux.c
|
||||||
|
+++ b/drivers/base/ump/src/linux/ump_kernel_linux.c
|
||||||
|
@@ -20,7 +20,12 @@
|
||||||
|
#include <linux/ump-ioctl.h>
|
||||||
|
#include <linux/ump.h>
|
||||||
|
|
||||||
|
-#include <asm/uaccess.h> /* copy_*_user */
|
||||||
|
+#include <linux/version.h>
|
||||||
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
|
||||||
|
+#include <asm/uaccess.h> /* copy_*_user */
|
||||||
|
+#else
|
||||||
|
+#include <linux/uaccess.h> /* copy_*_user */
|
||||||
|
+#endif
|
||||||
|
#include <linux/compat.h>
|
||||||
|
#include <linux/module.h> /* kernel module definitions */
|
||||||
|
#include <linux/fs.h> /* file system operations */
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From 1a15fc7f6a241895a31b00c1f324d358d408a610 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
|
||||||
Date: Fri, 4 Sep 2020 21:57:55 +0200
|
|
||||||
Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
|
|
||||||
|
|
||||||
Enable I2C devices which are accessible via 40-pin header.
|
|
||||||
|
|
||||||
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
index 30430d2e64b93..395afc2b2283c 100644
|
|
||||||
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
@@ -342,10 +342,18 @@ regulator-state-mem {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+&i2c1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&i2c2 {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&i2c4 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&i2c5 {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
From 63c110cdebc2c692964e1250c6f74f9e8c47c85d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 10 Jan 2017 04:28:48 +0000
|
||||||
|
Subject: [PATCH 4/5] Adapt get_user_pages calls to use the new calling
|
||||||
|
procedure
|
||||||
|
|
||||||
|
These changes are due to this commit:
|
||||||
|
mm: replace get_user_pages_remote() write/force parameters with gup_flags
|
||||||
|
9beae1ea89305a9667ceaab6d0bf46a045ad71e7
|
||||||
|
Kernel: 4.9.0-rc
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/base/ump/src/linux/ump_kernel_linux_mem.c | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/base/ump/src/linux/ump_kernel_linux_mem.c b/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
||||||
|
index 9186dd0..def4c0e 100644
|
||||||
|
--- a/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
||||||
|
+++ b/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
||||||
|
@@ -35,6 +35,10 @@
|
||||||
|
#include <ump_arch.h>
|
||||||
|
#include <common/ump_kernel_priv.h>
|
||||||
|
|
||||||
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0))
|
||||||
|
+#include <linux/pfn_t.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static void umpp_vm_close(struct vm_area_struct *vma)
|
||||||
|
{
|
||||||
|
umpp_cpu_mapping * mapping;
|
||||||
|
@@ -222,7 +226,11 @@ int umpp_linux_mmap(struct file * filp, struct vm_area_struct * vma)
|
||||||
|
paddr = alloc->block_array[block_idx].addr;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4,4,0))
|
||||||
|
err = vm_insert_mixed(vma, vma->vm_start + (i << PAGE_SHIFT), paddr >> PAGE_SHIFT);
|
||||||
|
+#else
|
||||||
|
+ err = vm_insert_mixed(vma, vma->vm_start + (i << PAGE_SHIFT), __pfn_to_pfn_t(paddr >> PAGE_SHIFT, PFN_DEV));
|
||||||
|
+#endif
|
||||||
|
paddr += PAGE_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
From 7c27055687c595e9f9eca484314f4fe3866a4260 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 18 Jul 2017 17:35:16 +0000
|
||||||
|
Subject: [PATCH 2/2] Don't be TOO severe when looking for the IRQ names
|
||||||
|
|
||||||
|
Using strncmp with an all caps result in the driver being unable to
|
||||||
|
initialize itself when using the mainlined RK3288 DTS files, since they
|
||||||
|
define the IRQ names as "job", "mmu" and "gpu" instead of "JOB", "MMU"
|
||||||
|
and "GPU".
|
||||||
|
|
||||||
|
strncmp calls have been replaced by strncasecmp calls in order to
|
||||||
|
avoid such issue.
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
index 0cccb0b..9cc65d2 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
@@ -938,11 +938,11 @@ static int assign_irqs(struct platform_device *pdev)
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF
|
||||||
|
- if (!strncmp(irq_res->name, "JOB", 4)) {
|
||||||
|
+ if (!strncasecmp(irq_res->name, "JOB", 4)) {
|
||||||
|
irqtag = JOB_IRQ_TAG;
|
||||||
|
- } else if (!strncmp(irq_res->name, "MMU", 4)) {
|
||||||
|
+ } else if (!strncasecmp(irq_res->name, "MMU", 4)) {
|
||||||
|
irqtag = MMU_IRQ_TAG;
|
||||||
|
- } else if (!strncmp(irq_res->name, "GPU", 4)) {
|
||||||
|
+ } else if (!strncasecmp(irq_res->name, "GPU", 4)) {
|
||||||
|
irqtag = GPU_IRQ_TAG;
|
||||||
|
} else {
|
||||||
|
dev_err(&pdev->dev, "Invalid irq res name: '%s'\n",
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From d6c44c231fc4518ad69bb7870a193bb10c563f2a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:24:47 +0200
|
|
||||||
Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
|
|
||||||
|
|
||||||
The spi2_cs1 pin reference is missing in the spi2 first pin control
|
|
||||||
definition.
|
|
||||||
|
|
||||||
This patch is taken from the patches provided by the ARMbian team.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rockchip/rk3288.dtsi | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
||||||
index becf3abd8367f..e78fa883b9841 100644
|
|
||||||
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
||||||
@@ -320,7 +320,7 @@ spi2: spi@ff130000 {
|
|
||||||
dma-names = "tx", "rx";
|
|
||||||
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
pinctrl-names = "default";
|
|
||||||
- pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>;
|
|
||||||
+ pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0 &spi2_cs1>;
|
|
||||||
reg = <0x0 0xff130000 0x0 0x1000>;
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From dfb0232e9fae1267d04247aaf171739038c1659e Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 5 Nov 2018 20:16:05 +0100
|
|
||||||
Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
|
|
||||||
|
|
||||||
Taken from the various patches provided by @TonyMac32 .
|
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
index 395afc2b2283c..c7e79e5947206 100644
|
|
||||||
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
@@ -184,7 +184,7 @@ vdd_cpu: DCDC_REG1 {
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
regulator-min-microvolt = <750000>;
|
|
||||||
- regulator-max-microvolt = <1400000>;
|
|
||||||
+ regulator-max-microvolt = <1450000>;
|
|
||||||
regulator-name = "vdd_arm";
|
|
||||||
regulator-ramp-delay = <6000>;
|
|
||||||
regulator-state-mem {
|
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
From ef7689887c31d2b1336e14f2c089185e8f60a9f1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 7 Aug 2017 19:22:39 +0000
|
||||||
|
Subject: [PATCH] Added the new "compatible" list, mainly used by Rockchip
|
||||||
|
|
||||||
|
Because, you know, all the Mali Midgard GPU used to define the GPU
|
||||||
|
using the 'compatible = "arm,mali-midgard"' property, which worked fine.
|
||||||
|
|
||||||
|
But it was removed.
|
||||||
|
|
||||||
|
They replaced the "arm,mali-midgard" node by "arm,mali-tXXX" where XXX
|
||||||
|
is the GPU series, and added "arm,rk3288-mali" which is used by nothing.
|
||||||
|
|
||||||
|
Which broke the Mali Midgard GPL kernel driver.
|
||||||
|
|
||||||
|
This patch fixes this issue.
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
index 27dcd9c1..cc4932a4 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
@@ -4742,6 +4742,12 @@ static const struct dev_pm_ops kbase_pm_ops = {
|
||||||
|
static const struct of_device_id kbase_dt_ids[] = {
|
||||||
|
{ .compatible = "arm,malit6xx" },
|
||||||
|
{ .compatible = "arm,mali-midgard" },
|
||||||
|
+ { .compatible = "arm,mali-t720" },
|
||||||
|
+ { .compatible = "arm,mali-t760" },
|
||||||
|
+ { .compatible = "arm,mali-t820" },
|
||||||
|
+ { .compatible = "arm,mali-t830" },
|
||||||
|
+ { .compatible = "arm,mali-t860" },
|
||||||
|
+ { .compatible = "arm,mali-t880" },
|
||||||
|
{ /* sentinel */ }
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, kbase_dt_ids);
|
||||||
|
--
|
||||||
|
2.13.0
|
||||||
|
|
||||||
@ -1,113 +0,0 @@
|
|||||||
From 4955695e410289df07258b00290d4028c3ac8fb1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Sun, 7 Jan 2018 01:52:44 +0100
|
|
||||||
Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
|
|
||||||
|
|
||||||
On ASUS Tinkerboard systems, if the SDMMC hardware is shutdown before
|
|
||||||
rebooting, the system will be dead, as the SDMMC is the only way to
|
|
||||||
boot anything, and the hardware doesn't power up the SDMMC hardware
|
|
||||||
automatically when rebooting.
|
|
||||||
|
|
||||||
So, when using an ASUS Tinkerboard system, a new reboot handler is
|
|
||||||
installed. This reboot handler takes care of powering the SDMMC
|
|
||||||
hardware again before restarting the system, resolving the issue.
|
|
||||||
|
|
||||||
The code was inspired by the pwrseq_emmc.c, which seems to overcome
|
|
||||||
similar effects with eMMC hardware.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 66 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
|
|
||||||
index f96260fd143b4..fa779ce8fb661 100644
|
|
||||||
--- a/drivers/mmc/host/dw_mmc-rockchip.c
|
|
||||||
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
|
|
||||||
@@ -12,6 +12,11 @@
|
|
||||||
#include <linux/pm_runtime.h>
|
|
||||||
#include <linux/slab.h>
|
|
||||||
|
|
||||||
+#include <linux/regulator/consumer.h>
|
|
||||||
+#include <linux/reboot.h>
|
|
||||||
+#include <linux/delay.h>
|
|
||||||
+#include "../core/core.h"
|
|
||||||
+
|
|
||||||
#include "dw_mmc.h"
|
|
||||||
#include "dw_mmc-pltfm.h"
|
|
||||||
|
|
||||||
@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
|
|
||||||
|
|
||||||
+struct dw_mci_rockchip_broken_boards_data {
|
|
||||||
+ struct notifier_block reset_nb;
|
|
||||||
+ struct platform_device *pdev;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/* This reboot handler handles cases where disabling the SDMMC on
|
|
||||||
+ * reboot will cause the hardware to be unable to start correctly
|
|
||||||
+ * after rebooting.
|
|
||||||
+ *
|
|
||||||
+ * This happens with Tinkerboard systems...
|
|
||||||
+ */
|
|
||||||
+static int dw_mci_rockchip_broken_boards_reset_nb(
|
|
||||||
+ struct notifier_block *this,
|
|
||||||
+ unsigned long mode, void *cmd)
|
|
||||||
+{
|
|
||||||
+ struct dw_mci_rockchip_broken_boards_data const *data =
|
|
||||||
+ container_of(this,
|
|
||||||
+ struct dw_mci_rockchip_broken_boards_data,
|
|
||||||
+ reset_nb);
|
|
||||||
+ struct dw_mci *host = platform_get_drvdata(data->pdev);
|
|
||||||
+ struct mmc_host *mmc = host->slot->mmc;
|
|
||||||
+
|
|
||||||
+ printk(KERN_ERR "Meow.\n");
|
|
||||||
+
|
|
||||||
+ mmc_power_off(mmc);
|
|
||||||
+
|
|
||||||
+ mdelay(20);
|
|
||||||
+
|
|
||||||
+ if (!IS_ERR(mmc->supply.vmmc))
|
|
||||||
+ regulator_enable(mmc->supply.vmmc);
|
|
||||||
+
|
|
||||||
+ if (!IS_ERR(mmc->supply.vqmmc))
|
|
||||||
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
|
|
||||||
+
|
|
||||||
+ printk(KERN_ERR "woeM.\n");
|
|
||||||
+
|
|
||||||
+ return NOTIFY_DONE;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void dw_mci_rockchip_register_broken_boards_reboot_handler(
|
|
||||||
+ struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ struct dw_mci_rockchip_broken_boards_data *data;
|
|
||||||
+
|
|
||||||
+ if (!of_machine_is_compatible("asus,rk3288-tinker"))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
||||||
+
|
|
||||||
+ if (!data)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ data->reset_nb.notifier_call =
|
|
||||||
+ dw_mci_rockchip_broken_boards_reset_nb;
|
|
||||||
+ data->reset_nb.priority = 255;
|
|
||||||
+ register_restart_handler(&data->reset_nb);
|
|
||||||
+
|
|
||||||
+ data->pdev = pdev;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int dw_mci_rockchip_probe(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
const struct dw_mci_drv_data *drv_data;
|
|
||||||
@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
|
|
||||||
}
|
|
||||||
|
|
||||||
pm_runtime_put_autosuspend(&pdev->dev);
|
|
||||||
+ dw_mci_rockchip_register_broken_boards_reboot_handler(pdev);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
From 74227462bbe9236dca234dd24cce4191fa71bdf9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
|
||||||
Date: Tue, 10 May 2022 22:57:26 +0200
|
|
||||||
Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker
|
|
||||||
|
|
||||||
Enable Bluetooth support via UART0. Use the existing bindings
|
|
||||||
for Realtek rtl8723bs Bluetooth device.
|
|
||||||
|
|
||||||
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 26 +++++++++++++++++++
|
|
||||||
1 file changed, 26 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
index c7e79e5947206..5d261fae6e72a 100644
|
|
||||||
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
|
|
||||||
@@ -386,6 +386,20 @@ bl_en: bl-en {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+ bluetooth {
|
|
||||||
+ bt_enable_pin: bt-enable-pin {
|
|
||||||
+ rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ bt_device_wake_pin: bt-device-wake-pin {
|
|
||||||
+ rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ bt_host_wake_pin: bt-host-wake-pin {
|
|
||||||
+ rockchip,pins = <4 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
buttons {
|
|
||||||
pwrbtn: pwrbtn {
|
|
||||||
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
@@ -518,6 +532,18 @@ &tsadc {
|
|
||||||
|
|
||||||
&uart0 {
|
|
||||||
status = "okay";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
|
|
||||||
+ uart-has-rtscts;
|
|
||||||
+
|
|
||||||
+ bluetooth {
|
|
||||||
+ compatible = "realtek,rtl8723bs-bt";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&bt_device_wake_pin &bt_host_wake_pin &bt_enable_pin>;
|
|
||||||
+ enable-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ device-wake-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ host-wake-gpios = <&gpio4 RK_PD7 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
&uart1 {
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From eb29ab60a69353f355b3af58b06fff1a89d17992 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
|
|
||||||
Date: Wed, 10 Jan 2024 16:29:59 +0100
|
|
||||||
Subject: [PATCH] usb-audio: add ASUS TinkerBoard's ALC4040
|
|
||||||
|
|
||||||
Converted to git-series patch from the original plain git diff file
|
|
||||||
buildroot-external/board/asus/tinker/patches/linux/3001_Tinkerboard-4.19-audio.patch
|
|
||||||
|
|
||||||
Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>
|
|
||||||
---
|
|
||||||
sound/usb/card.c | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/sound/usb/card.c b/sound/usb/card.c
|
|
||||||
index 9c411b82a218d..672136e25c81d 100644
|
|
||||||
--- a/sound/usb/card.c
|
|
||||||
+++ b/sound/usb/card.c
|
|
||||||
@@ -533,6 +533,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
|
|
||||||
}
|
|
||||||
|
|
||||||
strim(card->shortname);
|
|
||||||
+
|
|
||||||
+ /* Tinker Board ALC4040 CODEC */
|
|
||||||
+
|
|
||||||
+ if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
|
|
||||||
+ USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
|
|
||||||
+ strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
static void usb_audio_make_longname(struct usb_device *dev,
|
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
From 9812105eb6220863af05fc72591118f0a48e1c4e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 21 May 2018 22:32:59 +0200
|
||||||
|
Subject: [PATCH] GPU: ARM: Midgard: Adapt to the new mmap call checks.
|
||||||
|
|
||||||
|
Now, I don't know if this driver is just one of these "buggy" drivers
|
||||||
|
Linus is talking about, or if this is just standard GPU procedure.
|
||||||
|
|
||||||
|
Anyway, this patch is due to this change by Linus Torvalds :
|
||||||
|
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=be83bbf806822b1b89e0a0f23cd87cddc409e429
|
||||||
|
|
||||||
|
And the fix is inspired by :
|
||||||
|
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76ef6b28ea4f81c3d511866a9b31392caa833126
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
index cc4932a4ead7..89b4cca27cf1 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
@@ -1087,6 +1087,7 @@ static int kbase_open(struct inode *inode, struct file *filp)
|
||||||
|
|
||||||
|
init_waitqueue_head(&kctx->event_queue);
|
||||||
|
filp->private_data = kctx;
|
||||||
|
+ filp->f_mode |= FMODE_UNSIGNED_OFFSET;
|
||||||
|
kctx->filp = filp;
|
||||||
|
|
||||||
|
if (kbdev->infinite_cache_active_default)
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
@ -0,0 +1,65 @@
|
|||||||
|
From 7de25b73e152830587740d8f2ffaad94c72d90ac Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 17 Jul 2017 11:24:47 +0000
|
||||||
|
Subject: [PATCH 1/5] Integrating the Mali drivers
|
||||||
|
|
||||||
|
Changses required in order to select and compile the previously copied
|
||||||
|
Mali Midgard drivers.
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
|
||||||
|
---
|
||||||
|
drivers/base/Kconfig | 2 ++
|
||||||
|
drivers/base/Makefile | 1 +
|
||||||
|
drivers/gpu/Makefile | 2 +-
|
||||||
|
drivers/video/Kconfig | 1 +
|
||||||
|
4 files changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
|
||||||
|
index f046d21..b0982fc 100644
|
||||||
|
--- a/drivers/base/Kconfig
|
||||||
|
+++ b/drivers/base/Kconfig
|
||||||
|
@@ -348,3 +348,5 @@ config GENERIC_ARCH_TOPOLOGY
|
||||||
|
runtime.
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
+
|
||||||
|
+source "drivers/base/ump/Kconfig"
|
||||||
|
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
|
||||||
|
index 397e5c3..251e0cf 100644
|
||||||
|
--- a/drivers/base/Makefile
|
||||||
|
+++ b/drivers/base/Makefile
|
||||||
|
@@ -24,6 +24,7 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o
|
||||||
|
obj-$(CONFIG_DEV_COREDUMP) += devcoredump.o
|
||||||
|
obj-$(CONFIG_GENERIC_MSI_IRQ_DOMAIN) += platform-msi.o
|
||||||
|
obj-$(CONFIG_GENERIC_ARCH_TOPOLOGY) += arch_topology.o
|
||||||
|
+obj-$(CONFIG_UMP) += ump/
|
||||||
|
|
||||||
|
obj-y += test/
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
|
||||||
|
index e9ed439..66386b4 100644
|
||||||
|
--- a/drivers/gpu/Makefile
|
||||||
|
+++ b/drivers/gpu/Makefile
|
||||||
|
@@ -2,5 +2,5 @@
|
||||||
|
# taken to initialize them in the correct order. Link order is the only way
|
||||||
|
# to ensure this currently.
|
||||||
|
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
|
||||||
|
-obj-y += drm/ vga/
|
||||||
|
+obj-y += drm/ vga/ arm/
|
||||||
|
obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/
|
||||||
|
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
|
||||||
|
index 3c20af9..041e15f 100644
|
||||||
|
--- a/drivers/video/Kconfig
|
||||||
|
+++ b/drivers/video/Kconfig
|
||||||
|
@@ -17,6 +17,7 @@ source "drivers/gpu/vga/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/gpu/host1x/Kconfig"
|
||||||
|
source "drivers/gpu/ipu-v3/Kconfig"
|
||||||
|
+source "drivers/gpu/arm/midgard/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/gpu/drm/Kconfig"
|
||||||
|
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
From e0c5a419cf5464cd02996431afa98e3b22dc6801 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 17 Jul 2017 23:14:48 +0000
|
||||||
|
Subject: [PATCH] clk: rockchip: add all known operating points to the allowed
|
||||||
|
CPU freqs
|
||||||
|
|
||||||
|
Patch from Willy Tarreau
|
||||||
|
|
||||||
|
Original commit message :
|
||||||
|
At least 1920 MHz runs stable on the MiQi even on openssl speed -multi 4,
|
||||||
|
which is by far the most intensive workload, and 1992/2016 work fine on
|
||||||
|
the CS-008 until it starts to heat too much. So add all of them so that
|
||||||
|
the device tree can simply manipulate them.
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/clk/rockchip/clk-rk3288.c | 17 +++++++++++++++++
|
||||||
|
1 file changed, 17 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
|
||||||
|
index 753c649..fd2058f 100644
|
||||||
|
--- a/drivers/clk/rockchip/clk-rk3288.c
|
||||||
|
+++ b/drivers/clk/rockchip/clk-rk3288.c
|
||||||
|
@@ -145,6 +145,23 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = {
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct rockchip_cpuclk_rate_table rk3288_cpuclk_rates[] __initdata = {
|
||||||
|
+ RK3288_CPUCLK_RATE(2208000000U, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2184000000U, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2160000000U, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2136000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2112000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2088000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2064000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2040000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(2016000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1992000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1968000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1944000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1920000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1896000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1872000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1848000000, 1, 3, 1, 3, 3),
|
||||||
|
+ RK3288_CPUCLK_RATE(1824000000, 1, 3, 1, 3, 3),
|
||||||
|
RK3288_CPUCLK_RATE(1800000000, 1, 3, 1, 3, 3),
|
||||||
|
RK3288_CPUCLK_RATE(1704000000, 1, 3, 1, 3, 3),
|
||||||
|
RK3288_CPUCLK_RATE(1608000000, 1, 3, 1, 3, 3),
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From b82f540967f6a732a22bbd236457b864951aeda7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Sun, 14 May 2017 10:13:26 +0000
|
||||||
|
Subject: [PATCH] clk: rockchip: rk3288: prefer vdpu for vcodec clock source
|
||||||
|
|
||||||
|
Patch provided by Randy Li. The original commit message reads :
|
||||||
|
|
||||||
|
_______________
|
||||||
|
The RK3288 CRU system clock solution would suggest use
|
||||||
|
the vdpu clock source for the VPU(aclk_vpu and hclk_vpu).
|
||||||
|
|
||||||
|
Reading the registers of VPU(both VEPU and VDPU) would become all high
|
||||||
|
when the vepu is used as the clock source. It may be a bug in the SoC,
|
||||||
|
not sure whether it is fixed at RK3288W.
|
||||||
|
|
||||||
|
Signed-off-by: Randy Li <ayaka@soulik.info>
|
||||||
|
_______________
|
||||||
|
|
||||||
|
This also resolves a freeze when loading the OOT Video Codec driver
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/clk/rockchip/clk-rk3288.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
|
||||||
|
index 1227f74..f218256 100644
|
||||||
|
--- a/drivers/clk/rockchip/clk-rk3288.c
|
||||||
|
+++ b/drivers/clk/rockchip/clk-rk3288.c
|
||||||
|
@@ -215,7 +215,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" };
|
||||||
|
PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" };
|
||||||
|
PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" };
|
||||||
|
|
||||||
|
-PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vepu", "aclk_vdpu" };
|
||||||
|
+PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vdpu", "aclk_vepu" };
|
||||||
|
PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m",
|
||||||
|
"sclk_otgphy0_480m" };
|
||||||
|
PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" };
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
From 239a5e3016b7f676bc3f56ea509ed172bf954001 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Sat, 22 Jul 2017 04:07:36 +0000
|
||||||
|
Subject: [PATCH] Remove the dependency to the clk_mali symbol.
|
||||||
|
|
||||||
|
Inspired by @wzzy2 patch
|
||||||
|
|
||||||
|
https://github.com/rockchip-linux/rockchip_forwardports/commit/359865c617129fe5fcc5530f4a88abcfaa6a5cb4
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
index 9cc65d2..27dcd9c 100644
|
||||||
|
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||||
|
@@ -3793,7 +3793,7 @@ static int power_control_init(struct platform_device *pdev)
|
||||||
|
}
|
||||||
|
#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */
|
||||||
|
|
||||||
|
- kbdev->clock = clk_get(kbdev->dev, "clk_mali");
|
||||||
|
+ kbdev->clock = of_clk_get(kbdev->dev->of_node, 0);
|
||||||
|
if (IS_ERR_OR_NULL(kbdev->clock)) {
|
||||||
|
err = PTR_ERR(kbdev->clock);
|
||||||
|
kbdev->clock = NULL;
|
||||||
|
--
|
||||||
|
2.10.2
|
||||||
|
|
||||||
@ -0,0 +1,156 @@
|
|||||||
|
From 1aeeeeaf10ad5888c1a5b3ab9b780be91c7dada9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 24 Jul 2017 23:09:31 +0000
|
||||||
|
Subject: [PATCH] Last try for the reboot hack
|
||||||
|
|
||||||
|
If this one does not work, get a refund for your CantRebootBoard.
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/mmc/host/dw_mmc-rockchip.c | 24 ++++++++++++++++++++++++
|
||||||
|
drivers/mmc/host/dw_mmc.c | 26 ++++++++++++++++++++++++++
|
||||||
|
include/linux/reboot.h | 3 +++
|
||||||
|
kernel/reboot.c | 1 +
|
||||||
|
4 files changed, 54 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
|
||||||
|
index aaed6f9b..71131020 100644
|
||||||
|
--- a/drivers/mmc/host/dw_mmc-rockchip.c
|
||||||
|
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
|
||||||
|
@@ -14,10 +14,12 @@
|
||||||
|
#include <linux/of_address.h>
|
||||||
|
#include <linux/mmc/slot-gpio.h>
|
||||||
|
#include <linux/pm_runtime.h>
|
||||||
|
+#include <linux/regulator/consumer.h> // Hack
|
||||||
|
#include <linux/slab.h>
|
||||||
|
|
||||||
|
#include "dw_mmc.h"
|
||||||
|
#include "dw_mmc-pltfm.h"
|
||||||
|
+#include "../core/core.h" // Hack
|
||||||
|
|
||||||
|
#define RK3288_CLKGEN_DIV 2
|
||||||
|
|
||||||
|
@@ -365,6 +367,27 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void dw_mci_rockchip_platfm_shutdown(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct dw_mci *host = platform_get_drvdata(pdev);
|
||||||
|
+ struct mmc_host *mmc = host->slot->mmc;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ if(of_machine_is_compatible("asus,rk3288-tinker")){
|
||||||
|
+
|
||||||
|
+ mmc_power_off(mmc);
|
||||||
|
+
|
||||||
|
+ mdelay(20);
|
||||||
|
+
|
||||||
|
+ if (!IS_ERR(mmc->supply.vmmc))
|
||||||
|
+ ret = regulator_enable(mmc->supply.vmmc);
|
||||||
|
+
|
||||||
|
+ if (!IS_ERR(mmc->supply.vqmmc))
|
||||||
|
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
static int dw_mci_rockchip_remove(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
pm_runtime_get_sync(&pdev->dev);
|
||||||
|
@@ -385,6 +408,7 @@ static const struct dev_pm_ops dw_mci_rockchip_dev_pm_ops = {
|
||||||
|
static struct platform_driver dw_mci_rockchip_pltfm_driver = {
|
||||||
|
.probe = dw_mci_rockchip_probe,
|
||||||
|
.remove = dw_mci_rockchip_remove,
|
||||||
|
+ .shutdown = dw_mci_rockchip_platfm_shutdown,
|
||||||
|
.driver = {
|
||||||
|
.name = "dwmmc_rockchip",
|
||||||
|
.of_match_table = dw_mci_rockchip_match,
|
||||||
|
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
|
||||||
|
index a9dfb269..ee956a57 100644
|
||||||
|
--- a/drivers/mmc/host/dw_mmc.c
|
||||||
|
+++ b/drivers/mmc/host/dw_mmc.c
|
||||||
|
@@ -39,8 +39,10 @@
|
||||||
|
#include <linux/of.h>
|
||||||
|
#include <linux/of_gpio.h>
|
||||||
|
#include <linux/mmc/slot-gpio.h>
|
||||||
|
+#include <linux/reboot.h> // Hack
|
||||||
|
|
||||||
|
#include "dw_mmc.h"
|
||||||
|
+#include "../core/core.h" // Hack
|
||||||
|
|
||||||
|
/* Common flag combinations */
|
||||||
|
#define DW_MCI_DATA_ERROR_FLAGS (SDMMC_INT_DRTO | SDMMC_INT_DCRC | \
|
||||||
|
@@ -2687,6 +2689,28 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
|
||||||
|
return IRQ_HANDLED;
|
||||||
|
}
|
||||||
|
|
||||||
|
+struct dw_mci *mSdhost;
|
||||||
|
+void setmmcEmergency() {
|
||||||
|
+ struct mmc_host *mmc;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ printk(KERN_ERR "Emergency route taken.\n");
|
||||||
|
+ if (of_machine_is_compatible("asus,rk3288-tinker")) {
|
||||||
|
+ mmc = mSdhost->slot->mmc;
|
||||||
|
+
|
||||||
|
+ mmc_power_off(mmc);
|
||||||
|
+
|
||||||
|
+ mdelay(20);
|
||||||
|
+
|
||||||
|
+ if (!IS_ERR(mmc->supply.vmmc))
|
||||||
|
+ ret = regulator_enable(mmc->supply.vmmc);
|
||||||
|
+
|
||||||
|
+ if (!IS_ERR(mmc->supply.vqmmc))
|
||||||
|
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL(setmmcEmergency);
|
||||||
|
+
|
||||||
|
static int dw_mci_init_slot(struct dw_mci *host)
|
||||||
|
{
|
||||||
|
struct mmc_host *mmc;
|
||||||
|
@@ -2718,6 +2742,8 @@ static int dw_mci_init_slot(struct dw_mci *host)
|
||||||
|
mmc->f_max = freq[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (of_find_property(host->dev->of_node, "supports-sd", NULL))
|
||||||
|
+ mSdhost = host;
|
||||||
|
/*if there are external regulators, get them*/
|
||||||
|
ret = mmc_regulator_get_supply(mmc);
|
||||||
|
if (ret == -EPROBE_DEFER)
|
||||||
|
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
|
||||||
|
index a7ff409f..586e4504 100644
|
||||||
|
--- a/include/linux/reboot.h
|
||||||
|
+++ b/include/linux/reboot.h
|
||||||
|
@@ -72,12 +72,15 @@ extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN];
|
||||||
|
|
||||||
|
extern void orderly_poweroff(bool force);
|
||||||
|
extern void orderly_reboot(void);
|
||||||
|
+// Wonderful ASUS hack
|
||||||
|
+extern void setmmcEmergency(void);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Emergency restart, callable from an interrupt handler.
|
||||||
|
*/
|
||||||
|
|
||||||
|
extern void emergency_restart(void);
|
||||||
|
+
|
||||||
|
#include <asm/emergency-restart.h>
|
||||||
|
|
||||||
|
#endif /* _LINUX_REBOOT_H */
|
||||||
|
diff --git a/kernel/reboot.c b/kernel/reboot.c
|
||||||
|
index bd30a973..9f99488f 100644
|
||||||
|
--- a/kernel/reboot.c
|
||||||
|
+++ b/kernel/reboot.c
|
||||||
|
@@ -61,6 +61,7 @@ void (*pm_power_off_prepare)(void);
|
||||||
|
void emergency_restart(void)
|
||||||
|
{
|
||||||
|
kmsg_dump(KMSG_DUMP_EMERG);
|
||||||
|
+ setmmcEmergency();
|
||||||
|
machine_emergency_restart();
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(emergency_restart);
|
||||||
|
--
|
||||||
|
2.13.0
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,59 @@
|
|||||||
|
From c9f505dba7e4a3adc62054b852349e8bbae10326 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jacob Chen <jacob-chen@iotwrt.com>
|
||||||
|
Date: Mon, 26 Jun 2017 22:53:22 +0800
|
||||||
|
Subject: [PATCH 5/9] dt-bindings: Document the Rockchip RGA bindings
|
||||||
|
|
||||||
|
Add DT bindings documentation for Rockchip RGA
|
||||||
|
|
||||||
|
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
|
||||||
|
Signed-off-by: Jacob Chen <jacob-chen@iotwrt.com>
|
||||||
|
---
|
||||||
|
.../devicetree/bindings/media/rockchip-rga.txt | 36 ++++++++++++++++++++++
|
||||||
|
1 file changed, 36 insertions(+)
|
||||||
|
create mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.txt
|
||||||
|
|
||||||
|
diff --git a/Documentation/devicetree/bindings/media/rockchip-rga.txt b/Documentation/devicetree/bindings/media/rockchip-rga.txt
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..48a260e5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Documentation/devicetree/bindings/media/rockchip-rga.txt
|
||||||
|
@@ -0,0 +1,36 @@
|
||||||
|
+device-tree bindings for rockchip 2D raster graphic acceleration controller (RGA)
|
||||||
|
+
|
||||||
|
+RGA is a separate 2D raster graphic acceleration unit. It accelerates 2D
|
||||||
|
+graphics operations, such as point/line drawing, image scaling, rotation,
|
||||||
|
+BitBLT, alpha blending and image blur/sharpness.
|
||||||
|
+
|
||||||
|
+Required properties:
|
||||||
|
+- compatible: value should be one of the following
|
||||||
|
+ "rockchip,rk3228-rga";
|
||||||
|
+ "rockchip,rk3288-rga";
|
||||||
|
+ "rockchip,rk3399-rga";
|
||||||
|
+
|
||||||
|
+- interrupts: RGA interrupt number.
|
||||||
|
+
|
||||||
|
+- clocks: phandle to RGA sclk/hclk/aclk clocks
|
||||||
|
+
|
||||||
|
+- clock-names: should be "aclk" "hclk" and "sclk"
|
||||||
|
+
|
||||||
|
+- resets: Must contain an entry for each entry in reset-names.
|
||||||
|
+ See ../reset/reset.txt for details.
|
||||||
|
+- reset-names: should be "core" "axi" and "ahb"
|
||||||
|
+
|
||||||
|
+Example:
|
||||||
|
+SoC specific DT entry:
|
||||||
|
+ rga: rga@ff680000 {
|
||||||
|
+ compatible = "rockchip,rk3399-rga";
|
||||||
|
+ reg = <0xff680000 0x10000>;
|
||||||
|
+ interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ interrupt-names = "rga";
|
||||||
|
+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>;
|
||||||
|
+ clock-names = "aclk", "hclk", "sclk";
|
||||||
|
+
|
||||||
|
+ resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>;
|
||||||
|
+ reset-names = "core, "axi", "ahb";
|
||||||
|
+ status = "disabled";
|
||||||
|
+ };
|
||||||
|
--
|
||||||
|
2.13.0
|
||||||
|
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
|
||||||
|
index 7b6eb0ad513b..96b6935dc0d7 100644
|
||||||
|
--- a/drivers/usb/dwc2/hcd.c
|
||||||
|
+++ b/drivers/usb/dwc2/hcd.c
|
||||||
|
@@ -2748,6 +2748,8 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
|
||||||
|
chan->xfer_len = urb->length - urb->actual_length;
|
||||||
|
chan->xfer_count = 0;
|
||||||
|
|
||||||
|
+ chan->csplit_nak = 0;
|
||||||
|
+
|
||||||
|
/* Set the split attributes if required */
|
||||||
|
if (qh->do_split)
|
||||||
|
dwc2_hc_init_split(hsotg, chan, qtd, urb);
|
||||||
|
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
|
||||||
|
index 78e9e01051b5..e54f1351225b 100644
|
||||||
|
--- a/drivers/usb/dwc2/hcd.h
|
||||||
|
+++ b/drivers/usb/dwc2/hcd.h
|
||||||
|
@@ -143,6 +143,7 @@ struct dwc2_host_chan {
|
||||||
|
u8 halt_pending;
|
||||||
|
u8 do_split;
|
||||||
|
u8 complete_split;
|
||||||
|
+ u8 csplit_nak;
|
||||||
|
u8 hub_addr;
|
||||||
|
u8 hub_port;
|
||||||
|
u8 xact_pos;
|
||||||
|
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
|
||||||
|
index 916d991b96b8..551cfacd2252 100644
|
||||||
|
--- a/drivers/usb/dwc2/hcd_intr.c
|
||||||
|
+++ b/drivers/usb/dwc2/hcd_intr.c
|
||||||
|
@@ -691,6 +691,7 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
||||||
|
enum dwc2_transaction_type tr_type;
|
||||||
|
u32 haintmsk;
|
||||||
|
int free_qtd = 0;
|
||||||
|
+ int continue_trans = 1;
|
||||||
|
|
||||||
|
if (dbg_hc(chan))
|
||||||
|
dev_vdbg(hsotg->dev, " %s: channel %d, halt_status %d\n",
|
||||||
|
@@ -719,6 +720,7 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
||||||
|
* deactivated. Don't want to do anything except release the
|
||||||
|
* host channel and try to queue more transfers.
|
||||||
|
*/
|
||||||
|
+ continue_trans = 0;
|
||||||
|
goto cleanup;
|
||||||
|
case DWC2_HC_XFER_PERIODIC_INCOMPLETE:
|
||||||
|
dev_vdbg(hsotg->dev, " Complete URB with I/O error\n");
|
||||||
|
@@ -730,6 +732,11 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (chan->csplit_nak) {
|
||||||
|
+ continue_trans = 0;
|
||||||
|
+ chan->csplit_nak = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
dwc2_deactivate_qh(hsotg, chan->qh, free_qtd);
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
@@ -767,9 +774,11 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
||||||
|
dwc2_writel(haintmsk, hsotg->regs + HAINTMSK);
|
||||||
|
|
||||||
|
/* Try to queue more transfers now that there's a free channel */
|
||||||
|
- tr_type = dwc2_hcd_select_transactions(hsotg);
|
||||||
|
- if (tr_type != DWC2_TRANSACTION_NONE)
|
||||||
|
- dwc2_hcd_queue_transactions(hsotg, tr_type);
|
||||||
|
+ if (continue_trans) {
|
||||||
|
+ tr_type = dwc2_hcd_select_transactions(hsotg);
|
||||||
|
+ if (tr_type != DWC2_TRANSACTION_NONE)
|
||||||
|
+ dwc2_hcd_queue_transactions(hsotg, tr_type);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -1205,6 +1214,7 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg,
|
||||||
|
if (chan->do_split) {
|
||||||
|
if (chan->complete_split)
|
||||||
|
qtd->error_count = 0;
|
||||||
|
+ chan->csplit_nak = 1;
|
||||||
|
qtd->complete_split = 0;
|
||||||
|
dwc2_halt_channel(hsotg, chan, qtd, DWC2_HC_XFER_NAK);
|
||||||
|
goto handle_nak_done;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
From 604ea7fc311af2b3a41e7fe3b4fbde0ee03dfb9c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:09:50 +0200
|
||||||
|
Subject: [PATCH 04/28] dts: rk3288: miqi: Enabling the Mali GPU node
|
||||||
|
|
||||||
|
Why is the MiQi the only one left without a working mali GPU node ?
|
||||||
|
|
||||||
|
Seriously, is there a rk3288 chipset WITHOUT a mali GPU ? Couldn't
|
||||||
|
they enable it once in the DTSI, instead of defining it as "disabled"
|
||||||
|
and enabling it in every DTS file ?
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-miqi.dts | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
index 4d923aa6..3cd60674 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
@@ -149,6 +149,11 @@
|
||||||
|
status = "ok";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&gpu {
|
||||||
|
+ mali-supply = <&vdd_gpu>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&hdmi {
|
||||||
|
ddc-i2c-bus = <&i2c5>;
|
||||||
|
status = "okay";
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
From 89e5763110ca77d68a4be00cd97a638adc2401d5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Willy Tarreau <w@1wt.eu>
|
||||||
|
Date: Tue, 2 Aug 2016 08:31:00 +0200
|
||||||
|
Subject: [PATCH 05/28] ARM: dts: rockchip: fix the regulator's voltage range
|
||||||
|
on MiQi board
|
||||||
|
|
||||||
|
The board declared too narrow a voltage range for the CPU and GPU
|
||||||
|
regulators, preventing it from using the full CPU frequency range.
|
||||||
|
The regulators support 712500 to 1500000 microvolts.
|
||||||
|
|
||||||
|
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
||||||
|
(cherry picked from commit 95330e63a9295a2632cee8cce5db80677f01857a)
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-miqi.dts | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
index 3cd60674..a1c3cdaa 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
@@ -168,8 +168,8 @@
|
||||||
|
fcs,suspend-voltage-selector = <1>;
|
||||||
|
reg = <0x40>;
|
||||||
|
regulator-name = "vdd_cpu";
|
||||||
|
- regulator-min-microvolt = <850000>;
|
||||||
|
- regulator-max-microvolt = <1350000>;
|
||||||
|
+ regulator-min-microvolt = <712500>;
|
||||||
|
+ regulator-max-microvolt = <1500000>;
|
||||||
|
regulator-always-on;
|
||||||
|
regulator-boot-on;
|
||||||
|
regulator-enable-ramp-delay = <300>;
|
||||||
|
@@ -182,8 +182,8 @@
|
||||||
|
fcs,suspend-voltage-selector = <1>;
|
||||||
|
reg = <0x41>;
|
||||||
|
regulator-name = "vdd_gpu";
|
||||||
|
- regulator-min-microvolt = <850000>;
|
||||||
|
- regulator-max-microvolt = <1350000>;
|
||||||
|
+ regulator-min-microvolt = <712500>;
|
||||||
|
+ regulator-max-microvolt = <1500000>;
|
||||||
|
regulator-always-on;
|
||||||
|
vin-supply = <&vcc_sys>;
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
From c27e445527e949f3ef46d5326066196969c17d23 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Sun, 12 Mar 2017 19:43:15 +0000
|
||||||
|
Subject: [PATCH 06/28] ARM: dts: rockchip: add the MiQi board's fan definition
|
||||||
|
|
||||||
|
The MiQi board is sold with an enclosure in which a fan is connected
|
||||||
|
to the second LED output, and configured by default in "heartbeat"
|
||||||
|
mode so that it rotates slowly and increases when the CPU load
|
||||||
|
increases, ensuring appropriate cooling by default. This LED output
|
||||||
|
is called "Fan" in the original kernel and connected to GPIO18
|
||||||
|
(gpiochip 0, pin 18). Here we called it "miqi:green:fan" to stay
|
||||||
|
consistent with the kernel's naming conventions.
|
||||||
|
|
||||||
|
It's worth noting that without this patch the fan doesn't work at
|
||||||
|
all, risking to make the board overheat.
|
||||||
|
|
||||||
|
Fixes: 162718c (v4.7)
|
||||||
|
Cc: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-miqi.dts | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
index a1c3cdaa..0e383595 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
@@ -67,6 +67,13 @@
|
||||||
|
leds {
|
||||||
|
compatible = "gpio-leds";
|
||||||
|
|
||||||
|
+ fan {
|
||||||
|
+ gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ label = "miqi:green:fan";
|
||||||
|
+ linux,default-trigger = "heartbeat";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+
|
||||||
|
work {
|
||||||
|
gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
|
||||||
|
label = "miqi:green:user";
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From e7e092be197c51b4d222a3b4e6638318067b7e6a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Willy Tarreau <w@1wt.eu>
|
||||||
|
Date: Tue, 2 Aug 2016 08:20:53 +0200
|
||||||
|
Subject: [PATCH 07/28] ARM: dts: rockchip: add support for 1800 MHz operation
|
||||||
|
on MiQi board
|
||||||
|
|
||||||
|
This board happily supports 1800 MHz operations (and even more), so
|
||||||
|
let's enable it.
|
||||||
|
|
||||||
|
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
||||||
|
(cherry picked from commit a0b82a29e7873a81f49ac5f50be3df1c7d312a14)
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-miqi.dts | 12 ++++++++++++
|
||||||
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
index 0e383595..80603a3d 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
@@ -126,6 +126,18 @@
|
||||||
|
|
||||||
|
&cpu0 {
|
||||||
|
cpu0-supply = <&vdd_cpu>;
|
||||||
|
+ operating-points = <
|
||||||
|
+ /* KHz uV */
|
||||||
|
+ 1800000 1400000
|
||||||
|
+ 1704000 1350000
|
||||||
|
+ 1608000 1300000
|
||||||
|
+ 1512000 1250000
|
||||||
|
+ 1416000 1200000
|
||||||
|
+ 1200000 1100000
|
||||||
|
+ 1008000 1050000
|
||||||
|
+ 816000 1000000
|
||||||
|
+ 600000 900000
|
||||||
|
+ >;
|
||||||
|
};
|
||||||
|
|
||||||
|
&emmc {
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,170 @@
|
|||||||
|
From de9dcd5ecab0686022eee243464f35d2c7a34c97 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 16 Jan 2017 12:44:56 +0000
|
||||||
|
Subject: [PATCH 08/28] Readapt: ARM: dts: rockchip: miqi: add turbo-mode
|
||||||
|
operating points
|
||||||
|
|
||||||
|
Readaptation of Willy Tarreau patch.
|
||||||
|
|
||||||
|
Here's the original commit message:
|
||||||
|
|
||||||
|
By switching to opp-v2 we can declare "turbo-mode" operating points
|
||||||
|
which are only enabled when /sys/devices/system/cpu/cpufreq/boost is
|
||||||
|
set. It is convenient because it allows to boot, set a safe powersave
|
||||||
|
governor, enable boost, limit scaling_max_freq to a safe value, then
|
||||||
|
change the governor to performance or ondemand, and the frequency can
|
||||||
|
then be manually adjusted by only touching scaling_max_freq.
|
||||||
|
|
||||||
|
New values are 1896, 1920, 1992, 2016, 2040 MHz, 2064, 2088, 2112,
|
||||||
|
2136, 2160, 2184, 2208. MiQi boards work fine up to 2112 with a very
|
||||||
|
good power supply (5.2V/3A real) and a strong heatsink. Higher
|
||||||
|
frequencies may randomly work. At least 1992 is rock solid for hours
|
||||||
|
using "openssl speed -multi 4". The other ones have only been tested
|
||||||
|
for a few minutes. Frequencies of 1896 and 1920 MHz use 1.425V.
|
||||||
|
1992 MHz uses 1.45V. 2016, 2040 and 2064 use 1.475V. 2088 and above
|
||||||
|
use 1.500V. 2160, 2184 and 2208 cause the lowest frequency to be
|
||||||
|
picked. It's obvious that it's a sign issue somewhere in the kernel
|
||||||
|
but this one was not found yet.
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-miqi.dts | 120 +++++++++++++++++++++++++++++++++-----
|
||||||
|
1 file changed, 107 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
index 80603a3d..d7fde483 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
@@ -122,22 +122,116 @@
|
||||||
|
regulator-always-on;
|
||||||
|
regulator-boot-on;
|
||||||
|
};
|
||||||
|
-};
|
||||||
|
|
||||||
|
+
|
||||||
|
+ cpu0_opp_table: opp_table0 {
|
||||||
|
+ compatible = "operating-points-v2";
|
||||||
|
+ opp-shared;
|
||||||
|
+
|
||||||
|
+ opp@600000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <600000000>;
|
||||||
|
+ opp-microvolt = <900000>;
|
||||||
|
+ };
|
||||||
|
+ opp@816000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <816000000>;
|
||||||
|
+ opp-microvolt = <1000000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1008000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1008000000>;
|
||||||
|
+ opp-microvolt = <1050000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1200000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1200000000>;
|
||||||
|
+ opp-microvolt = <1100000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1416000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1416000000>;
|
||||||
|
+ opp-microvolt = <1200000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1512000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1512000000>;
|
||||||
|
+ opp-microvolt = <1250000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1608000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1608000000>;
|
||||||
|
+ opp-microvolt = <1300000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1704000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1704000000>;
|
||||||
|
+ opp-microvolt = <1350000>;
|
||||||
|
+ };
|
||||||
|
+ opp@1800000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1800000000>;
|
||||||
|
+ opp-microvolt = <1400000>;
|
||||||
|
+ };
|
||||||
|
+ /* boot-only frequencies below */
|
||||||
|
+ opp@1896000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1896000000>;
|
||||||
|
+ opp-microvolt = <1425000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@1920000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1920000000>;
|
||||||
|
+ opp-microvolt = <1425000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@1992000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <1992000000>;
|
||||||
|
+ opp-microvolt = <1450000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2016000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2016000000>;
|
||||||
|
+ opp-microvolt = <1475000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2040000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2040000000>;
|
||||||
|
+ opp-microvolt = <1475000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2064000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2064000000>;
|
||||||
|
+ opp-microvolt = <1475000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2088000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2088000000>;
|
||||||
|
+ opp-microvolt = <1500000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2112000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2112000000>;
|
||||||
|
+ opp-microvolt = <1500000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2136000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2136000000>;
|
||||||
|
+ opp-microvolt = <1500000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2160000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2160000000>;
|
||||||
|
+ opp-microvolt = <1500000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2184000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2184000000>;
|
||||||
|
+ opp-microvolt = <1500000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ opp@2208000000 {
|
||||||
|
+ opp-hz = /bits/ 64 <2208000000>;
|
||||||
|
+ opp-microvolt = <1500000>;
|
||||||
|
+ turbo-mode;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&cpu0 {
|
||||||
|
cpu0-supply = <&vdd_cpu>;
|
||||||
|
- operating-points = <
|
||||||
|
- /* KHz uV */
|
||||||
|
- 1800000 1400000
|
||||||
|
- 1704000 1350000
|
||||||
|
- 1608000 1300000
|
||||||
|
- 1512000 1250000
|
||||||
|
- 1416000 1200000
|
||||||
|
- 1200000 1100000
|
||||||
|
- 1008000 1050000
|
||||||
|
- 816000 1000000
|
||||||
|
- 600000 900000
|
||||||
|
- >;
|
||||||
|
+
|
||||||
|
+ operating-points-v2 = <&cpu0_opp_table>;
|
||||||
|
};
|
||||||
|
|
||||||
|
&emmc {
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
From 771bcfe1735e42650b763e52a042a9fd98b2fa5b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:20:43 +0200
|
||||||
|
Subject: [PATCH 09/28] ARM: DTSI: rk3288.dtsi: Missing GRF handles
|
||||||
|
|
||||||
|
Add missing GRF handles.
|
||||||
|
|
||||||
|
This patch is taken from the patches provided by the ARMbian team.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 356ed1e6..5b789528 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -547,6 +547,7 @@
|
||||||
|
pinctrl-2 = <&otp_gpio>;
|
||||||
|
#thermal-sensor-cells = <1>;
|
||||||
|
rockchip,hw-tshut-temp = <95000>;
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -655,6 +656,7 @@
|
||||||
|
pinctrl-0 = <&pwm0_pin>;
|
||||||
|
clocks = <&cru PCLK_PWM>;
|
||||||
|
clock-names = "pwm";
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -666,6 +668,7 @@
|
||||||
|
pinctrl-0 = <&pwm1_pin>;
|
||||||
|
clocks = <&cru PCLK_PWM>;
|
||||||
|
clock-names = "pwm";
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -677,6 +680,7 @@
|
||||||
|
pinctrl-0 = <&pwm2_pin>;
|
||||||
|
clocks = <&cru PCLK_PWM>;
|
||||||
|
clock-names = "pwm";
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -688,6 +692,7 @@
|
||||||
|
pinctrl-0 = <&pwm3_pin>;
|
||||||
|
clocks = <&cru PCLK_PWM>;
|
||||||
|
clock-names = "pwm";
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
From 062488e4b8fd552c01e1104b3bc91a6f7ffe6c41 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:24:47 +0200
|
||||||
|
Subject: [PATCH 10/28] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
|
||||||
|
|
||||||
|
The spi2_cs1 pin reference is missing in the spi2 first pin control
|
||||||
|
definition.
|
||||||
|
|
||||||
|
This patch is taken from the patches provided by the ARMbian team.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 5b789528..9ed532cc 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -334,7 +334,7 @@
|
||||||
|
dma-names = "tx", "rx";
|
||||||
|
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
- pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>;
|
||||||
|
+ pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0 &spi2_cs1>;
|
||||||
|
reg = <0x0 0xff130000 0x0 0x1000>;
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <0>;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
From af8d73ec0df1dde1e2fe1674c5708d4c30385ba9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 5 Jun 2017 12:37:17 +0000
|
||||||
|
Subject: [PATCH 11/28] Added support for Tinkerboard's SPI interface
|
||||||
|
|
||||||
|
Imported from ARMbian
|
||||||
|
|
||||||
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/spi/spidev.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
|
||||||
|
index cda10719..a6287475 100644
|
||||||
|
--- a/drivers/spi/spidev.c
|
||||||
|
+++ b/drivers/spi/spidev.c
|
||||||
|
@@ -669,6 +669,7 @@ static const struct of_device_id spidev_dt_ids[] = {
|
||||||
|
{ .compatible = "lineartechnology,ltc2488" },
|
||||||
|
{ .compatible = "ge,achc" },
|
||||||
|
{ .compatible = "semtech,sx1301" },
|
||||||
|
+ { .compatible = "rockchip,spi_tinker" },
|
||||||
|
{},
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, spidev_dt_ids);
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
From 7af8d2bf732cb3baab7d926ed8a7e061e7a09ad9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:39:00 +0200
|
||||||
|
Subject: [PATCH 13/28] ARM: DTSI: rk3288.dtsi: Adding cells addresses and
|
||||||
|
sizes of MMC nodes
|
||||||
|
|
||||||
|
Imported from the Rockchip 4.4 patches.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index be985f02..14ef8202 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -236,6 +236,8 @@
|
||||||
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
|
fifo-depth = <0x100>;
|
||||||
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
reg = <0x0 0xff0c0000 0x0 0x4000>;
|
||||||
|
resets = <&cru SRST_MMC0>;
|
||||||
|
reset-names = "reset";
|
||||||
|
@@ -250,6 +252,8 @@
|
||||||
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
|
fifo-depth = <0x100>;
|
||||||
|
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
reg = <0x0 0xff0d0000 0x0 0x4000>;
|
||||||
|
resets = <&cru SRST_SDIO0>;
|
||||||
|
reset-names = "reset";
|
||||||
|
@@ -264,6 +268,8 @@
|
||||||
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
|
fifo-depth = <0x100>;
|
||||||
|
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
reg = <0x0 0xff0e0000 0x0 0x4000>;
|
||||||
|
resets = <&cru SRST_SDIO1>;
|
||||||
|
reset-names = "reset";
|
||||||
|
@@ -278,6 +284,8 @@
|
||||||
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
|
fifo-depth = <0x100>;
|
||||||
|
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
reg = <0x0 0xff0f0000 0x0 0x4000>;
|
||||||
|
resets = <&cru SRST_EMMC>;
|
||||||
|
reset-names = "reset";
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
From ac220d592aa38b9b717d36f7bb93f7be5a08f6b3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:43:51 +0200
|
||||||
|
Subject: [PATCH 14/28] ARM: DTSI: rk3288.dtsi: Adding missing EDP power domain
|
||||||
|
|
||||||
|
Imported from Rockchip 4.4 kernel patches.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 14ef8202..10ecebb4 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -1105,6 +1105,7 @@
|
||||||
|
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
|
||||||
|
clock-names = "dp", "pclk";
|
||||||
|
+ power-domains = <&power RK3288_PD_VIO>;
|
||||||
|
phys = <&edp_phy>;
|
||||||
|
phy-names = "dp";
|
||||||
|
resets = <&cru SRST_EDP>;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
From 3fe37d29b53e3d06c8f4314cfc113bfa679f67eb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:48:05 +0200
|
||||||
|
Subject: [PATCH 15/28] ARM: DTSI: rk3288.dtsi: Add the RGA node
|
||||||
|
|
||||||
|
Imported from @wzyy2 patches.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 14 ++++++++++++++
|
||||||
|
1 file changed, 14 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 10ecebb4..455446f6 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -1159,6 +1159,20 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ rga: rga@ff920000 {
|
||||||
|
+ compatible = "rockchip,rk3288-rga";
|
||||||
|
+ reg = <0x0 0xff920000 0x0 0x180>;
|
||||||
|
+ interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ interrupt-names = "rga";
|
||||||
|
+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
|
||||||
|
+ clock-names = "aclk", "hclk", "sclk";
|
||||||
|
+ power-domains = <&power RK3288_PD_VIO>;
|
||||||
|
+ resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>;
|
||||||
|
+
|
||||||
|
+ reset-names = "core", "axi", "ahb";
|
||||||
|
+ status = "disabled";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
vpu_mmu: iommu@ff9a0800 {
|
||||||
|
compatible = "rockchip,iommu";
|
||||||
|
reg = <0x0 0xff9a0800 0x0 0x100>;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From c5af6798c9a411b3f550f463182a4b4904a21ec2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:51:14 +0200
|
||||||
|
Subject: [PATCH 16/28] ARM: DTSI: rk3288.dtsi: Adding missing VOPB registers
|
||||||
|
|
||||||
|
Imported from @wzyy2 patches... I think...
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 455446f6..125f8835 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -987,7 +987,7 @@
|
||||||
|
|
||||||
|
vopb: vop@ff930000 {
|
||||||
|
compatible = "rockchip,rk3288-vop";
|
||||||
|
- reg = <0x0 0xff930000 0x0 0x19c>;
|
||||||
|
+ reg = <0x0 0xff930000 0x0 0x19c>, <0x0 0xff931000 0x0 0x1000>;
|
||||||
|
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
|
||||||
|
clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
From a0602b2724893de7ac9b4190a7a6bb66458da2d5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 21:54:37 +0200
|
||||||
|
Subject: [PATCH 17/28] ARM: DTSI: rk3288.dtsi: Fixed the SPDIF node address
|
||||||
|
|
||||||
|
Now, the typo is only in the name of the node itself, not in the
|
||||||
|
actual registers addresses definition.
|
||||||
|
|
||||||
|
Still, this ought to be fixed one day !
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 125f8835..e5d3d3c9 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -922,7 +922,7 @@
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
- spdif: sound@ff88b0000 {
|
||||||
|
+ spdif: sound@ff8b0000 {
|
||||||
|
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
|
||||||
|
reg = <0x0 0xff8b0000 0x0 0x10000>;
|
||||||
|
#sound-dai-cells = <0>;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,165 @@
|
|||||||
|
From 2715f4a9ab5c169c546029a61eebb0bde6619b0e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 22:12:48 +0200
|
||||||
|
Subject: [PATCH 18/28] ARM: DTS: rk3288-tinker.dts: Enabling SDIO, Wireless
|
||||||
|
and Bluetooth
|
||||||
|
|
||||||
|
Adding the appropriate nodes in order to exploit the WiFi capabilities
|
||||||
|
of the board.
|
||||||
|
Since these capabilities are provided through SDIO, and the SDIO
|
||||||
|
nodes were not defined, these were added too.
|
||||||
|
|
||||||
|
These seems to depend on each other so they are added in one big
|
||||||
|
patch.
|
||||||
|
|
||||||
|
Split if necessary.
|
||||||
|
|
||||||
|
Bluetooth and uart0 (AKA Bluetooth UART) definitions were also added
|
||||||
|
in order to deal with all the wireless techs in one patch.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 82 ++++++++++++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 81 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index 346b0d8b..c552fd95 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -44,6 +44,7 @@
|
||||||
|
|
||||||
|
#include "rk3288.dtsi"
|
||||||
|
#include <dt-bindings/input/input.h>
|
||||||
|
+#include <dt-bindings/clock/rockchip,rk808.h>
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Rockchip RK3288 Tinker Board";
|
||||||
|
@@ -114,6 +115,24 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ /* This is essential to get SDIO devices working.
|
||||||
|
+ The Wifi depends on SDIO ! */
|
||||||
|
+ sdio_pwrseq: sdio-pwrseq {
|
||||||
|
+ compatible = "mmc-pwrseq-simple";
|
||||||
|
+ clocks = <&rk808 RK808_CLKOUT1>;
|
||||||
|
+ clock-names = "ext_clock";
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * On the module itself this is one of these (depending
|
||||||
|
+ * on the actual card populated):
|
||||||
|
+ * - SDIO_RESET_L_WL_REG_ON
|
||||||
|
+ * - PDN (power down when low)
|
||||||
|
+ */
|
||||||
|
+ reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>, <&gpio4 RK_PD3 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
vcc_sys: vsys-regulator {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vcc_sys";
|
||||||
|
@@ -134,6 +153,28 @@
|
||||||
|
startup-delay-us = <100000>;
|
||||||
|
vin-supply = <&vcc_io>;
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ wireless-wlan {
|
||||||
|
+ compatible = "wlan-platdata";
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
+ wifi_chip_type = "8723bs";
|
||||||
|
+ sdio_vref = <1800>;
|
||||||
|
+ WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ wireless-bluetooth {
|
||||||
|
+ compatible = "bluetooth-platdata";
|
||||||
|
+ uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
|
||||||
|
+ pinctrl-names = "default","rts_gpio";
|
||||||
|
+ pinctrl-0 = <&uart0_rts>;
|
||||||
|
+ pinctrl-1 = <&uart0_gpios>;
|
||||||
|
+ BT,reset_gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ BT,wake_gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
};
|
||||||
|
|
||||||
|
&cpu0 {
|
||||||
|
@@ -373,10 +414,30 @@
|
||||||
|
|
||||||
|
&io_domains {
|
||||||
|
status = "okay";
|
||||||
|
-
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
+ wifi-supply = <&vcc_18>;
|
||||||
|
sdcard-supply = <&vccio_sd>;
|
||||||
|
};
|
||||||
|
|
||||||
|
+&sdio0 {
|
||||||
|
+ status = "okay";
|
||||||
|
+ clock-frequency = <50000000>;
|
||||||
|
+ clock-freq-min-max = <200000 50000000>;
|
||||||
|
+ bus-width = <4>;
|
||||||
|
+ cap-sd-highspeed;
|
||||||
|
+ cap-sdio-irq;
|
||||||
|
+ disable-wp;
|
||||||
|
+ keep-power-in-suspend;
|
||||||
|
+ mmc-pwrseq = <&sdio_pwrseq>;
|
||||||
|
+ non-removable;
|
||||||
|
+ num-slots = <1>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
||||||
|
+ sd-uhs-sdr104;
|
||||||
|
+ supports-sdio;
|
||||||
|
+
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&pinctrl {
|
||||||
|
pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
|
||||||
|
drive-strength = <8>;
|
||||||
|
@@ -422,6 +483,16 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ sdio-pwrseq {
|
||||||
|
+ wifi_enable_h: wifienable-h {
|
||||||
|
+ rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ chip_enable_h: chip-enable-h {
|
||||||
|
+ rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
sdmmc {
|
||||||
|
sdmmc_bus4: sdmmc-bus4 {
|
||||||
|
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
|
||||||
|
@@ -453,6 +524,13 @@
|
||||||
|
rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ wireless-bluetooth {
|
||||||
|
+ uart0_gpios: uart0-gpios {
|
||||||
|
+ rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
};
|
||||||
|
|
||||||
|
&pwm0 {
|
||||||
|
@@ -485,6 +563,8 @@
|
||||||
|
|
||||||
|
&uart0 {
|
||||||
|
status = "okay";
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>;
|
||||||
|
};
|
||||||
|
|
||||||
|
&uart1 {
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
From 39e50ab508d8104a733771a8681908a66a300edd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 22:25:03 +0200
|
||||||
|
Subject: [PATCH 20/28] ARM: DTS: rk3288-tinker.dts: Setting up the SD
|
||||||
|
regulators
|
||||||
|
|
||||||
|
Some are needed and some are not. Playing with these parameters is
|
||||||
|
required to get reboot working on these boards.
|
||||||
|
|
||||||
|
I still can't believe that these boards can't soft reset correctly.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index 4ce94698..90c1a251 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -333,6 +333,8 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
vccio_sd: LDO_REG5 {
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ regulator-boot-on;
|
||||||
|
regulator-min-microvolt = <1800000>;
|
||||||
|
regulator-max-microvolt = <3300000>;
|
||||||
|
regulator-name = "vccio_sd";
|
||||||
|
@@ -379,7 +381,6 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
vcc33_sd: SWITCH_REG1 {
|
||||||
|
- regulator-always-on;
|
||||||
|
regulator-boot-on;
|
||||||
|
regulator-name = "vcc33_sd";
|
||||||
|
regulator-state-mem {
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
From b0a552add28bf4590b979abb3530b14b6811eec1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 22:33:39 +0200
|
||||||
|
Subject: [PATCH 21/28] ARM: DTS: rk3288-tinker.dts: Defined the I2C interfaces
|
||||||
|
|
||||||
|
And all the hardware behind.
|
||||||
|
|
||||||
|
Taken from, and tested by @TonyMac32 .
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 23 +++++++++++++++++++++++
|
||||||
|
1 file changed, 23 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index 90c1a251..67a3ce6f 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -400,8 +400,31 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2c1 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&i2c2 {
|
||||||
|
status = "okay";
|
||||||
|
+
|
||||||
|
+ afc0:af-controller@0 {
|
||||||
|
+ status = "okay";
|
||||||
|
+ compatible = "silicon touch,vm149C-v4l2-i2c-subdev";
|
||||||
|
+ reg = <0x0 0x0c>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ eeprom:m24c08@50 {
|
||||||
|
+ compatible = "at,24c08";
|
||||||
|
+ reg = <0x0 0x50>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&i2c3 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&i2c4 {
|
||||||
|
+ status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
&i2c5 {
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
From 8ca607f3fe77c80a3367d8363703d5dc1d6781d4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 22:36:02 +0200
|
||||||
|
Subject: [PATCH 22/28] ARM: DTS: rk3288-tinker.dts: Add the MIPI DSI node
|
||||||
|
|
||||||
|
Taken from, and tested by @TonyMac32 .
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 9 +++++++++
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index 67a3ce6f..6f4c0843 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -443,6 +443,15 @@
|
||||||
|
sdcard-supply = <&vccio_sd>;
|
||||||
|
};
|
||||||
|
|
||||||
|
+&mipi_dsi {
|
||||||
|
+ status = "okay";
|
||||||
|
+ mipi_panel: mipi-panel {
|
||||||
|
+ compatible ="asus,tc358762";
|
||||||
|
+ reg = <0x0 0>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&sdio0 {
|
||||||
|
status = "okay";
|
||||||
|
clock-frequency = <50000000>;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From 14f951ca2d354ad8fd068d0f3d8648d5c0d1e60e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 22:40:26 +0200
|
||||||
|
Subject: [PATCH 23/28] ARM: DTS: rk3288-tinker.dts: Defining the SPI interface
|
||||||
|
|
||||||
|
Taken from, and tested by @TonyMac32 .
|
||||||
|
|
||||||
|
Well, the original one was tested by him but I had to adapt the
|
||||||
|
registers definitions to the new 64-bits LPAE-compliant syntax.
|
||||||
|
|
||||||
|
Therefore that *might* break, along with a few other patches.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 18 ++++++++++++++++++
|
||||||
|
1 file changed, 18 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index 6f4c0843..f4b4525c 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -471,6 +471,24 @@
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
+&spi2 {
|
||||||
|
+ status = "okay";
|
||||||
|
+ max-freq = <50000000>;
|
||||||
|
+ spidev@0 {
|
||||||
|
+ compatible = "rockchip,spi_tinker";
|
||||||
|
+ reg = <0x0 0>;
|
||||||
|
+ spi-max-frequency = <50000000>;
|
||||||
|
+ spi-cpha = <1>;
|
||||||
|
+ };
|
||||||
|
+ spidev@1 {
|
||||||
|
+ compatible = "rockchip,spi_tinker";
|
||||||
|
+ reg = <0x0 1>;
|
||||||
|
+ spi-max-frequency = <50000000>;
|
||||||
|
+ spi-cpha = <1>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+
|
||||||
|
&pinctrl {
|
||||||
|
pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
|
||||||
|
drive-strength = <8>;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From 58d72a1cc693c4c08391487476d0cd6d167a57cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Thu, 19 Oct 2017 22:48:36 +0200
|
||||||
|
Subject: [PATCH 24/28] ARM: DTS: rk3288-tinker.dts: Defining SDMMC properties
|
||||||
|
|
||||||
|
I never knew if these properties were required to fix the dreaded
|
||||||
|
reboot issue...
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index f4b4525c..a0663425 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -601,7 +601,12 @@
|
||||||
|
disable-wp; /* wp not hooked up */
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
|
||||||
|
+ sd-uhs-sdr12;
|
||||||
|
+ sd-uhs-sdr25;
|
||||||
|
+ sd-uhs-sdr50;
|
||||||
|
+ sd-uhs-sdr104;
|
||||||
|
status = "okay";
|
||||||
|
+ supports-sd;
|
||||||
|
vmmc-supply = <&vcc33_sd>;
|
||||||
|
vqmmc-supply = <&vccio_sd>;
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -0,0 +1,107 @@
|
|||||||
|
From f4480cb8198085607c15e523b49aa21bc38cf62c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 21 Nov 2017 21:47:33 +0100
|
||||||
|
Subject: [PATCH 1/5] ARM: DTSI: rk3288.dtsi: Define the VPU services
|
||||||
|
|
||||||
|
Still, you will need appropriate drivers to use them.
|
||||||
|
|
||||||
|
Contrary to the previous versions of this patch, these services are :
|
||||||
|
* NOT enabled by default;
|
||||||
|
* MUST be activated in each individual DTS;
|
||||||
|
|
||||||
|
I currently do not own enough RK3288 boards to ensure that the
|
||||||
|
VPU and HEVC MMU + services can be activated without issues.
|
||||||
|
|
||||||
|
Still this patch does not generate issues like the previous one AND
|
||||||
|
still enable these services on boot, when activated properly in
|
||||||
|
individual DTS files.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 63 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 63 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 30b04257..bc3601ac 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -1182,6 +1182,27 @@
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
+ vpu_service: vpu-service@ff9a0000 {
|
||||||
|
+ compatible = "rockchip,vpu_service";
|
||||||
|
+ reg = <0x0 0xff9a0000 0x0 0x800>;
|
||||||
|
+ interrupts =
|
||||||
|
+ <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
+ <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ interrupt-names = "irq_enc", "irq_dec";
|
||||||
|
+ clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
|
||||||
|
+ clock-names = "aclk_vcodec", "hclk_vcodec";
|
||||||
|
+ power-domains = <&power RK3288_PD_VIDEO>;
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
+ resets = <&cru SRST_VCODEC_AXI>, <&cru SRST_VCODEC_AHB>;
|
||||||
|
+ reset-names = "video_a", "video_h";
|
||||||
|
+ iommus = <&vpu_mmu>;
|
||||||
|
+ iommu_enabled = <1>;
|
||||||
|
+ dev_mode = <0>;
|
||||||
|
+ status = "disabled";
|
||||||
|
+ /* 0 means ion, 1 means drm */
|
||||||
|
+ allocator = <1>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
hevc_mmu: iommu@ff9c0440 {
|
||||||
|
compatible = "rockchip,iommu";
|
||||||
|
reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>;
|
||||||
|
@@ -1191,6 +1212,48 @@
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
+ hevc_service: hevc-service@ff9c0000 {
|
||||||
|
+ compatible = "rockchip,hevc_service";
|
||||||
|
+ reg = <0x0 0xff9c0000 0x0 0x400>;
|
||||||
|
+ interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ interrupt-names = "irq_dec";
|
||||||
|
+ clocks =
|
||||||
|
+ <&cru ACLK_HEVC>,
|
||||||
|
+ <&cru HCLK_HEVC>,
|
||||||
|
+ <&cru SCLK_HEVC_CORE>,
|
||||||
|
+ <&cru SCLK_HEVC_CABAC>;
|
||||||
|
+ clock-names =
|
||||||
|
+ "aclk_vcodec",
|
||||||
|
+ "hclk_vcodec",
|
||||||
|
+ "clk_core",
|
||||||
|
+ "clk_cabac";
|
||||||
|
+ /*
|
||||||
|
+ * The 4K hevc would also work well with 500/125/300/300,
|
||||||
|
+ * no more err irq and reset request.
|
||||||
|
+ */
|
||||||
|
+ assigned-clocks =
|
||||||
|
+ <&cru ACLK_HEVC>,
|
||||||
|
+ <&cru HCLK_HEVC>,
|
||||||
|
+ <&cru SCLK_HEVC_CORE>,
|
||||||
|
+ <&cru SCLK_HEVC_CABAC>;
|
||||||
|
+ assigned-clock-rates =
|
||||||
|
+ <400000000>,
|
||||||
|
+ <100000000>,
|
||||||
|
+ <300000000>,
|
||||||
|
+ <300000000>;
|
||||||
|
+
|
||||||
|
+ resets = <&cru SRST_HEVC>;
|
||||||
|
+ reset-names = "video";
|
||||||
|
+ power-domains = <&power RK3288_PD_HEVC>;
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
+ dev_mode = <1>;
|
||||||
|
+ iommus = <&hevc_mmu>;
|
||||||
|
+ iommu_enabled = <1>;
|
||||||
|
+ status = "disabled";
|
||||||
|
+ /* 0 means ion, 1 means drm */
|
||||||
|
+ allocator = <1>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
gpu: gpu@ffa30000 {
|
||||||
|
compatible = "rockchip,rk3288-mali", "arm,mali-t760";
|
||||||
|
reg = <0x0 0xffa30000 0x0 0x10000>;
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
From 647d6012849191e9909a8acb0fc9ae5df1afc747 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 21 Nov 2017 21:51:31 +0100
|
||||||
|
Subject: [PATCH 2/5] ARM: DTS: rk3288-miqi.dts: Enable the Video encoding MMU
|
||||||
|
and services
|
||||||
|
|
||||||
|
Enable the :
|
||||||
|
* VPU MMU;
|
||||||
|
* VPU service;
|
||||||
|
* HEVC MMU;
|
||||||
|
* HEVC service;
|
||||||
|
on MiQi devices.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-miqi.dts | 18 +++++++++++++++++-
|
||||||
|
1 file changed, 17 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
index d7fde483..dd785c70 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||||
|
@@ -124,7 +124,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
- cpu0_opp_table: opp_table0 {
|
||||||
|
+ cpu0_opp_table: opp_table {
|
||||||
|
compatible = "operating-points-v2";
|
||||||
|
opp-shared;
|
||||||
|
|
||||||
|
@@ -575,6 +575,22 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&vpu_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&vpu_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&wdt {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
From 092c26ead2eb4035a57217f8705c9deed3bfb927 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 21 Nov 2017 21:54:22 +0100
|
||||||
|
Subject: [PATCH 3/5] ARM: DTS: rk3288-tinker: Enable the Video encoding MMU
|
||||||
|
and services
|
||||||
|
|
||||||
|
Enable the :
|
||||||
|
* VPU MMU;
|
||||||
|
* VPU Service;
|
||||||
|
* HEVC MMU;
|
||||||
|
* HEVC Service;
|
||||||
|
for ASUS Tinkerboard devices.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 16 ++++++++++++++++
|
||||||
|
1 file changed, 16 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index a0663425..07b4af4f 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -671,6 +671,22 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&vpu_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&vpu_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&wdt {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From 2769b0e656d849c5d652c75db71ce0faff1c0551 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 21 Nov 2017 21:56:45 +0100
|
||||||
|
Subject: [PATCH 4/5] ARM: DTSI: rk3288-firefly: Enable the Video encoding MMU
|
||||||
|
and services
|
||||||
|
|
||||||
|
Enable the :
|
||||||
|
* VPU MMU;
|
||||||
|
* VPU Service;
|
||||||
|
* HEVC MMU;
|
||||||
|
* HEVC Service;
|
||||||
|
for RK3288 Firefly devices.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-firefly.dtsi | 17 +++++++++++++++++
|
||||||
|
1 file changed, 17 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
|
||||||
|
index b9e6f3a9..9961acce 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
|
||||||
|
@@ -606,6 +606,23 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&vpu_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&vpu_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&wdt {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
+
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
From 4766516bcbf023813ad883c2d61c422316770d12 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Tue, 21 Nov 2017 21:58:22 +0100
|
||||||
|
Subject: [PATCH 5/5] ARM: DTSI: rk3288-veyron: Enable the Video encoding MMU
|
||||||
|
and services
|
||||||
|
|
||||||
|
Enable the :
|
||||||
|
* VPU MMU;
|
||||||
|
* VPU Service;
|
||||||
|
* HEVC MMU;
|
||||||
|
* HEVC Service;
|
||||||
|
for RK3288 Chromebook laptops.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-veyron.dtsi | 16 ++++++++++++++++
|
||||||
|
1 file changed, 16 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
|
||||||
|
index 6e5bd897..517b9242 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
|
||||||
|
@@ -450,6 +450,22 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&vpu_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&vpu_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hevc_service {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&wdt {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/sound/usb/card.c b/sound/usb/card.c
|
||||||
|
index 23d1d23..98610ae 100644
|
||||||
|
--- a/sound/usb/card.c
|
||||||
|
+++ b/sound/usb/card.c
|
||||||
|
@@ -434,6 +434,14 @@ static int snd_usb_audio_create(struct usb_interface *intf,
|
||||||
|
}
|
||||||
|
strim(card->shortname);
|
||||||
|
|
||||||
|
+ /* Tinker Board ALC4040 CODEC */
|
||||||
|
+
|
||||||
|
+ if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
|
||||||
|
+ USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
|
||||||
|
+ strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/* retrieve the vendor and device strings as longname */
|
||||||
|
if (quirk && quirk->vendor_name && *quirk->vendor_name) {
|
||||||
|
len = strlcpy(card->longname, quirk->vendor_name, sizeof(card->longname));
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user