qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for Orange Pi Zero2w

This commit is contained in:
orangepi-xunlong 2023-08-18 19:17:05 +08:00
parent 50d9ccad68
commit de53cf7b70
23 changed files with 134 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
external/cache/debs/arm64/wiringpi_2.49.deb vendored
View File

Binary file not shown.

BIN
external/cache/debs/arm64/wiringpi_2.51.deb vendored Normal file
View File

Binary file not shown.

BIN
external/cache/debs/h618/linux-u-boot-current-orangepizero2w_1.0.0_arm64.deb vendored
View File

Binary file not shown.

BIN
external/cache/debs/h618/linux-u-boot-current-orangepizero3_1.0.0_arm64.deb vendored
View File

Binary file not shown.

BIN
external/cache/debs/h618/linux-u-boot-current-orangepizero3_1.0.2_arm64.deb vendored Normal file
View File

Binary file not shown.

2
external/config/boards/orangepizero2w.conf vendored
View File

@ -10,6 +10,6 @@ MODULES_BLACKLIST_LEGACY="bcmdhd"
MODULES_BLACKLIST_CURRENT="bcmdhd"
DISTRIB_TYPE_LEGACY="buster"
DISTRIB_TYPE_CURRENT="bullseye focal jammy"
DISTRIB_TYPE_NEXT="bullseye bookworm jammy"
DISTRIB_TYPE_NEXT="bullseye bookworm jammy raspi"
BOOT_LOGO="desktop"
REVISION="1.0.0"

2
external/config/boards/orangepizero3.conf vendored
View File

@ -12,4 +12,4 @@ DISTRIB_TYPE_LEGACY="buster"
DISTRIB_TYPE_CURRENT="bullseye focal jammy"
DISTRIB_TYPE_NEXT="bullseye bookworm jammy"
BOOT_LOGO="desktop"
REVISION="1.0.0"
REVISION="1.0.2"

8
external/config/kernel/linux-6.1-sun50iw9-next.config vendored
View File

@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.1.31 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0"
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=110300
CONFIG_GCC_VERSION=110400
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23800
@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=122
CONFIG_PAHOLE_VERSION=125
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@ -2919,7 +2919,7 @@ CONFIG_KEYBOARD_PINEPHONE=m
# CONFIG_KEYBOARD_SAMSUNG is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
CONFIG_KEYBOARD_SUN4I_LRADC=y
CONFIG_KEYBOARD_IQS62X=m
# CONFIG_KEYBOARD_OMAP4 is not set
# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set

13
external/config/kernel/linux-sun50iw9-current.config vendored
View File

@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.4.125 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (GNU Toolchain for the Arm Architecture 11.2-2022.02 (arm-11.14)) 11.2.1 20220111"
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=110201
CONFIG_GCC_VERSION=110400
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@ -5583,8 +5583,8 @@ CONFIG_QUOTA_TREE=y
# CONFIG_QFMT_V1 is not set
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
# CONFIG_AUTOFS4_FS is not set
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=y
CONFIG_AUTOFS_FS=y
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
# CONFIG_VIRTIO_FS is not set
@ -6375,8 +6375,8 @@ CONFIG_DEBUG_LIST=y
#
# CONFIG_RCU_PERF_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
CONFIG_RCU_TRACE=y
# CONFIG_RCU_EQS_DEBUG is not set
# end of RCU Debugging
@ -6393,6 +6393,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACE_CLOCK=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_KUNIT is not set

3
external/config/sources/families/include/rk356x_gpu_vpu.inc vendored
View File

@ -549,11 +549,14 @@ rk356x_gpu_vpu_tweaks_for_raspios()
rk356x_deb+=("rk356x_packages/bullseye/mpv/libmpv-dev_0.32.0-3_arm64.deb")
rk356x_deb+=("rk356x_packages/bullseye/mpv/mpv_0.32.0-3_arm64.deb")
chroot $SDCARD /bin/bash -c "apt remove -y chromium-browser rpi-chromium-mods libwidevinecdm0"
for deb in ${rk356x_deb[@]}
do
dpkg_install_deb_chroot "$EXTER/cache/sources/${deb}"
done
chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X"
# The chromium using fixed pathes for libv4l2.so

4
external/config/sources/families/sun50iw9.conf vendored
View File

@ -109,6 +109,10 @@ family_tweaks_bsp()
install -m 755 $EXTER/packages/blobs/bt/hciattach/hciattach_opi_${ARCH} $destination/usr/bin/hciattach_opi
if [[ ${BOARD} == orangepizero2w ]]; then
install -m 755 $EXTER/packages/bsp/h618/sun50i-h618-lradc-keys-${BRANCH}.dts $destination/usr/src/sun50i-h618-lradc-keys.dts
fi
}
uboot_custom_postprocess()

5
external/packages/bsp/common/lib/udev/rules.d/71-axp-power-button.rules vendored
View File

@ -1,5 +1,10 @@
# Handle AXP power button with systemd
ACTION=="remove", GOTO="power_switch_end"
SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="axp20x-pek", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_PATH}=="platform-soc@3000000", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_PATH}=="platform-soc@3000000", ENV{ID_INPUT}="1"
SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_PATH}=="platform-soc@3000000", ENV{ID_INPUT_KEY}="1"
SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="axp[12][890]-supplyer", TAG+="power-switch"
LABEL="power_switch_end"

9
external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization vendored
View File

@ -97,7 +97,7 @@ prepare_board() {
rockpro64|renegade-elite|pinebook-pro|station-p1)
BOARDFAMILY=rk3399
;;
orangepi5|orangepi5b|orangepi5plus|orangepitab|orangepi900)
orangepi5|orangepicm5|orangepi5b|orangepi5plus|orangepitab|orangepi900)
[[ $BOARD =~ orangepi5|orangepi5b ]] && echo host > /sys/kernel/debug/usb/fc000000.usb/mode
if [[ $BOARD =~ orangepi900 ]]; then
@ -187,7 +187,12 @@ prepare_board() {
if [[ $BOARD == orangepizero2w ]]; then
interface_100m="eth0"
if [[ ${DISTRIBUTION_CODENAME} == "bookworm" ]]; then
interface_100m="end0"
else
interface_100m="eth0"
fi
echo netdev > /sys/class/leds/100m_act/trigger
echo "${interface_100m}" > /sys/class/leds/100m_act/device_name
echo 1 > /sys/class/leds/100m_act/tx

15
external/packages/bsp/h618/sun50i-h618-lradc-keys-current.dts vendored Normal file
View File

@ -0,0 +1,15 @@
/dts-v1/;
/plugin/;
/ {
fragment@0 {
target = <&keyboard>;
__overlay__ {
status = "okay";
key0 = <600 2>;
key1 = <800 28>;
};
};
};

22
external/packages/bsp/h618/sun50i-h618-lradc-keys-next.dts vendored Normal file
View File

@ -0,0 +1,22 @@
/dts-v1/;
/plugin/;
/ {
fragment@0 {
target = <&r_lradc>;
__overlay__ {
status = "okay";
button-500 {
label = "KEY_1";
linux,code = <2>;
};
button-800 {
label = "KEY_ENTER";
linux,code = <28>;
};
};
};
};

61
external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2w-u-boot-current.dts vendored
View File

@ -1824,9 +1824,25 @@
compatible = "x-powers,axp1530";
reg = <0x36>;
wakeup-source;
pmu_hot_shutdown = <0x1>;
//pmu_hot_shutdown = <0x1>;
phandle = <0xa6>;
//interrupt-parent = <0x23>;
//interrupts = <2 9 8>;
//interrupt-controller;
//#interrupt-cells = <1>;
//powerkey0: powerkey@0{
// status = "okay";
// compatible = "x-powers,axp2101-pek";
// pmu_powkey_off_time = <6000>;
// pmu_powkey_off_func = <0>;
// pmu_powkey_off_en = <1>;
// pmu_powkey_long_time = <1500>;
// pmu_powkey_on_time = <1000>;
// wakeup_falling;
//};
standby_param {
vdd-cpua = <0x2>;
vdd-sys = <0x1>;
@ -1982,17 +1998,19 @@
clocks = <0x2 0x58>;
clock-names = "bus";
resets = <0x2 0x22>;
status = "okay";
status = "disabled";
phandle = <0xab>;
};
keyboard@5070800 {
compatible = "allwinner,keyboard_1350mv";
reg = <0x0 0x5070800 0x0 0x400>;
interrupts = <0x0 0x14 0x0>;
interrupts = <0x0 0x14 0x1>;
clocks = <0x2 0x74>;
key_cnt = <1>;
key0 = <1800 139>;
resets = <0x2 53>;
key_cnt = <2>;
key0 = <600 2>;
key1 = <800 28>;
status = "okay";
phandle = <0xac>;
};
@ -2352,34 +2370,22 @@
compatible = "gpio-leds";
status = "okay";
status {
label = "status_led";
green_led {
label = "green_led";
gpios = <0x23 0x2 0xd 0x0>; /* PC13 */
linux,default-trigger = "heartbeat";
};
100m_link {
label = "100m_link";
gpios = <0x23 0x2 0xc 0x0>; /* PC12 */
gpios = <0x23 0x2 0xf 0x0>; /* PC15 */
default-state = "off";
};
100m_act {
label = "100m_act";
gpios = <0x23 0x2 0xe 0x0>; /* PC14 */
default-state = "off";
};
led12 {
label = "led12";
gpios = <0x23 0x2 0xf 0x0>; /* PC15 */
linux,default-trigger = "heartbeat";
};
led34 {
label = "led34";
gpios = <0x23 0x2 0x10 0x0>; /* PC16 */
linux,default-trigger = "heartbeat";
default-state = "off";
};
};
@ -2671,7 +2677,7 @@
clocks = <0xd 0x8 0xa 0xd 0x7>;
clock-names = "bus", "pclk", "mclk";
resets = <0xd 0x3>;
status = "disabled";
status = "okay";
s_cir0_used = <0x1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <0x64>;
@ -2978,16 +2984,6 @@
};
};
usb0-drvvvbus {
compatible = "regulator-fixed";
regulator-name = "usb0-drvvbus";
regulator-min-microvolt = <0x4c4b40>;
regulator-max-microvolt = <0x4c4b40>;
regulator-enable-ramp-delay = <0x3e8>;
enable-active-high;
phandle = <0x62>;
};
box_start_os0 {
compatible = "allwinner,box_start_os";
start_type = <0x1>;
@ -3209,6 +3205,5 @@
cpu_threshold = "/thermal-zones/cpu_thermal_zone/trips/trip-point@0";
cpu_target = "/thermal-zones/cpu_thermal_zone/trips/trip-point@1";
cpu_crit = "/thermal-zones/cpu_thermal_zone/trips/cpu_crit@0";
usb0_drvvbus = "/usb0-drvvvbus";
};
};

2
external/packages/raspi/orangepi/common/01-run.sh vendored
View File

@ -10,4 +10,4 @@
#EOF
install -m 644 files/hciattach_opi "${ROOTFS_DIR}/usr/bin/"
install -m 644 files/brcm_patchram_plus "${ROOTFS_DIR}/usr/bin/"

BIN
external/packages/raspi/orangepi/common/files/brcm_patchram_plus vendored Executable file
View File

Binary file not shown.

32
external/packages/raspi/orangepi/common/files/orangepi-hardware-optimization vendored
View File

@ -51,14 +51,36 @@ prepare_board() {
amixer -c 0 cset name='Playback Path' HP > /dev/null 2>&1
amixer -c 0 cset name='Capture MIC Path' 'Main Mic' > /dev/null 2>&1
rfkill unblock all
/usr/bin/hciattach_opi -n -s 1500000 /dev/ttyBT0 sprd &
#rfkill unblock all
#brcm_patchram_plus --bd_addr_rand --enable_hci --no2bytes --use_baudrate_for_download --tosleep 200000 \
# --baudrate 1500000 --patchram /lib/firmware/cyw43455/BCM4345C0.hcd /dev/ttyS1 &
if [[ $BOARD == orangepi3b ]]; then
rfkill unblock all
/usr/bin/hciattach_opi -n -s 1500000 /dev/ttyBT0 sprd &
elif [[ $BOARD == orangepicm4 ]]; then
rfkill unblock all
brcm_patchram_plus --bd_addr_rand --enable_hci --no2bytes --use_baudrate_for_download --tosleep 200000 \
--baudrate 1500000 --patchram /lib/firmware/BCM4345C0.hcd /dev/ttyS1 &
fi
;;
orangepizero2|orangepizero2-lts|orangepizero2-b|orangepizero3|orangepir1b|orangepizero2w)
kv=$(uname -r)
if [[ $BOARD == orangepizero2w ]]; then
if [[ ${DISTRIBUTION_CODENAME} == "bookworm" ]]; then
interface_100m="end0"
else
interface_100m="eth0"
fi
echo netdev > /sys/class/leds/100m_act/trigger
echo "${interface_100m}" > /sys/class/leds/100m_act/device_name
echo 1 > /sys/class/leds/100m_act/tx
echo 1 > /sys/class/leds/100m_act/rx
echo netdev > /sys/class/leds/100m_link/trigger
echo ${interface_100m} > /sys/class/leds/100m_link/device_name
echo 1 > /sys/class/leds/100m_link/link
fi
if [[ $BOARD == orangepir1b ]]; then
#for 100m interface

2
external/packages/raspi/stage3/00-install-packages/00-packages vendored
View File

@ -5,7 +5,7 @@ git
policykit-1
gvfs
rfkill
#chromium-browser rpi-chromium-mods libwidevinecdm0
chromium-browser rpi-chromium-mods libwidevinecdm0
gldriver-test
fonts-droid-fallback
fonts-liberation2

5
scripts/distributions.sh
View File

@ -996,6 +996,10 @@ install_opi_specific()
[[ -n $BOOT_FDT_FILE && -f "${SDCARD}"/boot/orangepiEnv.txt ]] && \
echo "fdtfile=${BOOT_FDT_FILE}" >> "${SDCARD}/boot/orangepiEnv.txt"
# install initial asound.state if defined
mkdir -p "${SDCARD}"/var/lib/alsa/
[[ -n $ASOUND_STATE ]] && cp "${EXTER}/packages/blobs/asound.state/${ASOUND_STATE}" "${SDCARD}"/var/lib/alsa/asound.state
# create modules file
local modules=MODULES_${BRANCH^^}
if [[ -n "${!modules}" ]]; then
@ -1035,6 +1039,7 @@ install_opi_specific()
install -m 755 "${EXTER}/packages/bsp/common/etc/initramfs/post-update.d/99-uboot" "${SDCARD}/etc/initramfs/post-update.d/"
install -m 755 "${EXTER}/packages/raspi/orangepi/common/files/hciattach_opi" "${SDCARD}/usr/bin/"
install -m 755 "${EXTER}/packages/raspi/orangepi/common/files/brcm_patchram_plus" "${SDCARD}/usr/bin/"
install -d "${SDCARD}/usr/lib/orangepi/"
install -m 755 "${EXTER}/packages/raspi/orangepi/common/files/orangepi-hardware-optimization" "${SDCARD}/usr/lib/orangepi/"

2
scripts/general.sh
View File

@ -1869,7 +1869,7 @@ show_checklist_variables ()
install_wiringop()
{
install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.49.deb"
install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.51.deb"
chroot "${SDCARD}" /bin/bash -c "apt-mark hold wiringpi" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
if [[ ${IGNORE_UPDATES} != yes ]]; then

3
scripts/main.sh
View File

@ -227,13 +227,14 @@ if [[ -z $BOARD ]]; then
#options+=("orangepizero2-b" "Allwinner H616 quad core 512MB/1GB RAM WiFi/BT GBE SPI")
#options+=("orangepizero2-lts" "Allwinner H616 quad core 1.5GB RAM WiFi/BT GBE SPI")
options+=("orangepizero3" "Allwinner H618 quad core 1GB/1.5GB/2GB/4GB RAM WiFi/BT GBE SPI")
#options+=("orangepizero2w" "Allwinner H618 quad core 1GB/1.5GB/2GB/4GB RAM WiFi/BT SPI")
options+=("orangepizero2w" "Allwinner H618 quad core 1GB/1.5GB/2GB/4GB RAM WiFi/BT SPI")
#options+=("orangepir1b" "Allwinner H618 quad core 1.5GB/2GB/4GB RAM WiFi/BT GBE SPI")
#options+=("orangepi400" "Allwinner H616 quad core 4GB RAM WiFi/BT GBE eMMC VGA")
options+=("orangepi4" "Rockchip RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT")
options+=("orangepi4-lts" "Rockchip RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT")
options+=("orangepi800" "Rockchip RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT VGA")
options+=("orangepi5" "Rockchip RK3588S octa core 4-16GB RAM GBE USB3 USB-C NVMe")
#options+=("orangepicm5" "Rockchip RK3588S octa core 4-16GB RAM GBE USB3 USB-C")
options+=("orangepi5b" "Rockchip RK3588S octa core 4-16GB RAM GBE USB3 USB-C WiFi/BT eMMC")
#options+=("orangepitab" "Rockchip RK3588S octa core 4-16GB RAM USB-C WiFi/BT NVMe")
#options+=("orangepi900" "Rockchip RK3588 octa core 4-16GB RAM 2.5GBE USB3 USB-C WiFi/BT NVMe")