diff --git a/archives/filesystem/special/Edge/etc/fw_env.config b/archives/filesystem/special/Edge1/etc/fw_env.config similarity index 100% rename from archives/filesystem/special/Edge/etc/fw_env.config rename to archives/filesystem/special/Edge1/etc/fw_env.config diff --git a/archives/filesystem/special/Edge/etc/init.d/adbd.sh b/archives/filesystem/special/Edge1/etc/init.d/adbd.sh similarity index 100% rename from archives/filesystem/special/Edge/etc/init.d/adbd.sh rename to archives/filesystem/special/Edge1/etc/init.d/adbd.sh diff --git a/archives/filesystem/special/Edge/etc/modules b/archives/filesystem/special/Edge1/etc/modules similarity index 100% rename from archives/filesystem/special/Edge/etc/modules rename to archives/filesystem/special/Edge1/etc/modules diff --git a/archives/filesystem/special/Edge/etc/modules.mainline b/archives/filesystem/special/Edge1/etc/modules.mainline similarity index 100% rename from archives/filesystem/special/Edge/etc/modules.mainline rename to archives/filesystem/special/Edge1/etc/modules.mainline diff --git a/archives/filesystem/special/Edge/etc/profile.d/gst.sh b/archives/filesystem/special/Edge1/etc/profile.d/gst.sh similarity index 100% rename from archives/filesystem/special/Edge/etc/profile.d/gst.sh rename to archives/filesystem/special/Edge1/etc/profile.d/gst.sh diff --git a/archives/filesystem/special/Edge/etc/rc.local b/archives/filesystem/special/Edge1/etc/rc.local similarity index 100% rename from archives/filesystem/special/Edge/etc/rc.local rename to archives/filesystem/special/Edge1/etc/rc.local diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/50-hevc-rk3399.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/50-hevc-rk3399.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/50-hevc-rk3399.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/50-hevc-rk3399.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/50-hevc.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/50-hevc.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/50-hevc.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/50-hevc.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/50-mali.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/50-mali.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/50-mali.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/50-mali.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/50-mali400.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/50-mali400.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/50-mali400.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/50-mali400.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/50-vpu-rk3399.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/50-vpu-rk3399.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/50-vpu-rk3399.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/50-vpu-rk3399.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/50-vpu.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/50-vpu.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/50-vpu.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/50-vpu.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/60-drm.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/60-drm.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/60-drm.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/60-drm.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/60-media.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/60-media.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/60-media.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/60-media.rules diff --git a/archives/filesystem/special/Edge/etc/udev/rules.d/60-rga.rules b/archives/filesystem/special/Edge1/etc/udev/rules.d/60-rga.rules similarity index 100% rename from archives/filesystem/special/Edge/etc/udev/rules.d/60-rga.rules rename to archives/filesystem/special/Edge1/etc/udev/rules.d/60-rga.rules diff --git a/archives/filesystem/special/Edge/lib/systemd/system/adb-helper-khadas.service b/archives/filesystem/special/Edge1/lib/systemd/system/adb-helper-khadas.service similarity index 100% rename from archives/filesystem/special/Edge/lib/systemd/system/adb-helper-khadas.service rename to archives/filesystem/special/Edge1/lib/systemd/system/adb-helper-khadas.service diff --git a/archives/filesystem/special/Edge/lib/systemd/system/example/adbd.service b/archives/filesystem/special/Edge1/lib/systemd/system/example/adbd.service similarity index 100% rename from archives/filesystem/special/Edge/lib/systemd/system/example/adbd.service rename to archives/filesystem/special/Edge1/lib/systemd/system/example/adbd.service diff --git a/archives/filesystem/special/Edge/lib/systemd/system/example/bt_uart.service b/archives/filesystem/special/Edge1/lib/systemd/system/example/bt_uart.service similarity index 100% rename from archives/filesystem/special/Edge/lib/systemd/system/example/bt_uart.service rename to archives/filesystem/special/Edge1/lib/systemd/system/example/bt_uart.service diff --git a/archives/filesystem/special/Edge/lib/systemd/system/firstrun.service b/archives/filesystem/special/Edge1/lib/systemd/system/firstrun.service similarity index 100% rename from archives/filesystem/special/Edge/lib/systemd/system/firstrun.service rename to archives/filesystem/special/Edge1/lib/systemd/system/firstrun.service diff --git a/archives/filesystem/special/Edge/lib/systemd/system/reboot-test-khadas.service b/archives/filesystem/special/Edge1/lib/systemd/system/reboot-test-khadas.service similarity index 100% rename from archives/filesystem/special/Edge/lib/systemd/system/reboot-test-khadas.service rename to archives/filesystem/special/Edge1/lib/systemd/system/reboot-test-khadas.service diff --git a/archives/filesystem/special/Edge/lib/systemd/system/rockchip.service b/archives/filesystem/special/Edge1/lib/systemd/system/rockchip.service similarity index 100% rename from archives/filesystem/special/Edge/lib/systemd/system/rockchip.service rename to archives/filesystem/special/Edge1/lib/systemd/system/rockchip.service diff --git a/archives/filesystem/special/Edge/usr/include/rga/RgaApi.h b/archives/filesystem/special/Edge1/usr/include/rga/RgaApi.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/RgaApi.h rename to archives/filesystem/special/Edge1/usr/include/rga/RgaApi.h diff --git a/archives/filesystem/special/Edge/usr/include/rga/RockchipFileOps.h b/archives/filesystem/special/Edge1/usr/include/rga/RockchipFileOps.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/RockchipFileOps.h rename to archives/filesystem/special/Edge1/usr/include/rga/RockchipFileOps.h diff --git a/archives/filesystem/special/Edge/usr/include/rga/RockchipRga.h b/archives/filesystem/special/Edge1/usr/include/rga/RockchipRga.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/RockchipRga.h rename to archives/filesystem/special/Edge1/usr/include/rga/RockchipRga.h diff --git a/archives/filesystem/special/Edge/usr/include/rga/RockchipRgaMacro.h b/archives/filesystem/special/Edge1/usr/include/rga/RockchipRgaMacro.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/RockchipRgaMacro.h rename to archives/filesystem/special/Edge1/usr/include/rga/RockchipRgaMacro.h diff --git a/archives/filesystem/special/Edge/usr/include/rga/drmrga.h b/archives/filesystem/special/Edge1/usr/include/rga/drmrga.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/drmrga.h rename to archives/filesystem/special/Edge1/usr/include/rga/drmrga.h diff --git a/archives/filesystem/special/Edge/usr/include/rga/rga.h b/archives/filesystem/special/Edge1/usr/include/rga/rga.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/rga.h rename to archives/filesystem/special/Edge1/usr/include/rga/rga.h diff --git a/archives/filesystem/special/Edge/usr/include/rga/version.h b/archives/filesystem/special/Edge1/usr/include/rga/version.h similarity index 100% rename from archives/filesystem/special/Edge/usr/include/rga/version.h rename to archives/filesystem/special/Edge1/usr/include/rga/version.h diff --git a/archives/filesystem/special/Edge/usr/lib/librga.so b/archives/filesystem/special/Edge1/usr/lib/librga.so similarity index 100% rename from archives/filesystem/special/Edge/usr/lib/librga.so rename to archives/filesystem/special/Edge1/usr/lib/librga.so diff --git a/archives/filesystem/special/Edge/usr/local/bin/adb-setup b/archives/filesystem/special/Edge1/usr/local/bin/adb-setup similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/adb-setup rename to archives/filesystem/special/Edge1/usr/local/bin/adb-setup diff --git a/archives/filesystem/special/Edge/usr/local/bin/bluetooth-khadas.sh b/archives/filesystem/special/Edge1/usr/local/bin/bluetooth-khadas.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/bluetooth-khadas.sh rename to archives/filesystem/special/Edge1/usr/local/bin/bluetooth-khadas.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/bluetooth-power-fixup.sh b/archives/filesystem/special/Edge1/usr/local/bin/bluetooth-power-fixup.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/bluetooth-power-fixup.sh rename to archives/filesystem/special/Edge1/usr/local/bin/bluetooth-power-fixup.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/drm-hotplug.sh b/archives/filesystem/special/Edge1/usr/local/bin/drm-hotplug.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/drm-hotplug.sh rename to archives/filesystem/special/Edge1/usr/local/bin/drm-hotplug.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/fan.sh b/archives/filesystem/special/Edge1/usr/local/bin/fan.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/fan.sh rename to archives/filesystem/special/Edge1/usr/local/bin/fan.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/fan_setup.sh b/archives/filesystem/special/Edge1/usr/local/bin/fan_setup.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/fan_setup.sh rename to archives/filesystem/special/Edge1/usr/local/bin/fan_setup.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/hdmi-toggle b/archives/filesystem/special/Edge1/usr/local/bin/hdmi-toggle similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/hdmi-toggle rename to archives/filesystem/special/Edge1/usr/local/bin/hdmi-toggle diff --git a/archives/filesystem/special/Edge/usr/local/bin/io b/archives/filesystem/special/Edge1/usr/local/bin/io similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/io rename to archives/filesystem/special/Edge1/usr/local/bin/io diff --git a/archives/filesystem/special/Edge/usr/local/bin/play_video b/archives/filesystem/special/Edge1/usr/local/bin/play_video similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/play_video rename to archives/filesystem/special/Edge1/usr/local/bin/play_video diff --git a/archives/filesystem/special/Edge/usr/local/bin/qt5_player b/archives/filesystem/special/Edge1/usr/local/bin/qt5_player similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/qt5_player rename to archives/filesystem/special/Edge1/usr/local/bin/qt5_player diff --git a/archives/filesystem/special/Edge/usr/local/bin/reboot-test-handle.sh b/archives/filesystem/special/Edge1/usr/local/bin/reboot-test-handle.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/reboot-test-handle.sh rename to archives/filesystem/special/Edge1/usr/local/bin/reboot-test-handle.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/systeminfo.sh b/archives/filesystem/special/Edge1/usr/local/bin/systeminfo.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/systeminfo.sh rename to archives/filesystem/special/Edge1/usr/local/bin/systeminfo.sh diff --git a/archives/filesystem/special/Edge/usr/local/bin/wol_setup.sh b/archives/filesystem/special/Edge1/usr/local/bin/wol_setup.sh similarity index 100% rename from archives/filesystem/special/Edge/usr/local/bin/wol_setup.sh rename to archives/filesystem/special/Edge1/usr/local/bin/wol_setup.sh diff --git a/archives/filesystem/special/Edge/usr/share/alsa/init/00main b/archives/filesystem/special/Edge1/usr/share/alsa/init/00main similarity index 100% rename from archives/filesystem/special/Edge/usr/share/alsa/init/00main rename to archives/filesystem/special/Edge1/usr/share/alsa/init/00main diff --git a/archives/filesystem/special/Edge/usr/share/alsa/init/rt5651 b/archives/filesystem/special/Edge1/usr/share/alsa/init/rt5651 similarity index 100% rename from archives/filesystem/special/Edge/usr/share/alsa/init/rt5651 rename to archives/filesystem/special/Edge1/usr/share/alsa/init/rt5651 diff --git a/archives/filesystem/special/Edge/usr/share/alsa/ucm/realtek,rt5651-codec/HiFi.conf b/archives/filesystem/special/Edge1/usr/share/alsa/ucm/realtek,rt5651-codec/HiFi.conf similarity index 100% rename from archives/filesystem/special/Edge/usr/share/alsa/ucm/realtek,rt5651-codec/HiFi.conf rename to archives/filesystem/special/Edge1/usr/share/alsa/ucm/realtek,rt5651-codec/HiFi.conf diff --git a/archives/filesystem/special/Edge/usr/share/alsa/ucm/realtek,rt5651-codec/realtek,rt5651-codec.conf b/archives/filesystem/special/Edge1/usr/share/alsa/ucm/realtek,rt5651-codec/realtek,rt5651-codec.conf similarity index 100% rename from archives/filesystem/special/Edge/usr/share/alsa/ucm/realtek,rt5651-codec/realtek,rt5651-codec.conf rename to archives/filesystem/special/Edge1/usr/share/alsa/ucm/realtek,rt5651-codec/realtek,rt5651-codec.conf diff --git a/config/boards/Edge.conf b/config/boards/Edge1.conf similarity index 99% rename from config/boards/Edge.conf rename to config/boards/Edge1.conf index 407899e1..24b94c16 100644 --- a/config/boards/Edge.conf +++ b/config/boards/Edge1.conf @@ -82,7 +82,7 @@ GPU_MODEL="arm-mali-midgard-t86x" uboot_custom_postprocess() { # try resolve - for RK_BIN in "$BUILD"/rkbin-*; do + for RK_BIN in "$BUILD"/rkbin_edge1-*; do [ -d "$RK_BIN" ] || { error_msg "Not found $RK_BIN" return 1 diff --git a/config/functions/common-functions b/config/functions/common-functions index 086fe223..835040db 100644 --- a/config/functions/common-functions +++ b/config/functions/common-functions @@ -370,6 +370,7 @@ prepare_packages() { if [ "$VENDOR" == "Rockchip" ]; then build_package "rkbin:host" + build_package "rkbin_edge1:host" fi } diff --git a/env/setenv.sh b/env/setenv.sh index fc37fd69..cd7f3fe2 100644 --- a/env/setenv.sh +++ b/env/setenv.sh @@ -770,7 +770,7 @@ function lunch() { elif [[ "$KHADAS_BOARD" =~ Edge[12] ]]; then export VENDOR="Rockchip" case "$KHADAS_BOARD" in - Edge) + Edge1) export CHIP="RK3399" ;; Edge2) diff --git a/packages/rkbin_edge1/package.mk b/packages/rkbin_edge1/package.mk new file mode 100644 index 00000000..023b1495 --- /dev/null +++ b/packages/rkbin_edge1/package.mk @@ -0,0 +1,21 @@ +PKG_NAME="rkbin_edge1" +PKG_VERSION="5aa9a92b5652d37b323c870329103e120dfc8d87" +PKG_SHA256="2b8f817e90ce623bf2cae5e6249f14ffc7ac9991e1e44b9ad6b43ca34c57663c" +PKG_SOURCE_DIR="rkbin-${PKG_VERSION}*" +PKG_SITE="$GITHUB_URL/rockchip-linux/rkbin" +PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" +PKG_ARCH="X86" +PKG_LICENSE="GPL" +PKG_SHORTDESC="Rockchip Firmware and Tool Binarys" +PKG_SOURCE_NAME="rkbin-${PKG_VERSION}.tar.gz" +PKG_NEED_BUILD="NO" + + +make_host() { + chmod +x firmware_merger + # Fixup links + ln -fs bin/rk33/rk3399_ddr_800MHz_v1.24.bin rk3399_ddr.bin + ln -fs bin/rk33/rk3399_miniloader_spinor_v1.14.bin rk3399miniloaderall_spi.bin + ln -fs bin/rk33/rk3399_miniloader_v1.24.bin rk3399miniloaderall.bin +} + diff --git a/packages/rkbin_edge1/patches/5aa9a92b5652d37b323c870329103e120dfc8d87/0001-add-SPI-merger-tool-for-RK3399.patch b/packages/rkbin_edge1/patches/5aa9a92b5652d37b323c870329103e120dfc8d87/0001-add-SPI-merger-tool-for-RK3399.patch new file mode 100644 index 00000000..25768e1b Binary files /dev/null and b/packages/rkbin_edge1/patches/5aa9a92b5652d37b323c870329103e120dfc8d87/0001-add-SPI-merger-tool-for-RK3399.patch differ