diff --git a/documents/RaspberryPi.md b/documents/RaspberryPi.md index d501c77..fe378de 100644 --- a/documents/RaspberryPi.md +++ b/documents/RaspberryPi.md @@ -149,7 +149,7 @@ - `dde`，带 DDE 桌面以及中文字体、输入法等全部配套软件。 - `gnome`，带 GNOME 桌面以及中文字体、输入法等全部配套软件。 - `devstation`，带 GNOME 桌面、中文字体、输入法、大量开发工具和 IDE 等配套软件。 - - rpmlist 文件路径，该文件包含镜像中要安装的软件列表，内容参考 [rpmlist](../scripts/configs-rpi/rpmlist)。 + - rpmlist 文件路径，该文件包含镜像中要安装的软件列表，内容参考 [rpmlist](../scripts/configs/raspberrypi/rpmlist)。 默认使用 `headless` 选项。 diff --git a/documents/Rockchip.md b/documents/Rockchip.md index 967f4a5..d647f6a 100644 --- a/documents/Rockchip.md +++ b/documents/Rockchip.md @@ -149,7 +149,7 @@ - `xfce`，带 Xfce 桌面以及中文字体、输入法等全部配套软件。 - `ukui`，带 UKUI 桌面及必要的配套软件（不包括中文字体以及输入法）。 - `dde`，带 DDE 桌面及必要的配套软件（不包括中文字体以及输入法）。 - - rpmlist 文件路径，其中包含镜像中要安装的软件列表，内容参考 [rpmlist](../scripts/configs/rpmlist)。 + - rpmlist 文件路径，其中包含镜像中要安装的软件列表，内容参考 [rpmlist](../scripts/configs/rockchip//rpmlist)。 默认使用 `headless` 选项。 diff --git a/documents/rockchip/openEuler适配指南.md b/documents/rockchip/openEuler适配指南.md index 4ea362a..efd30b2 100644 --- a/documents/rockchip/openEuler适配指南.md +++ b/documents/rockchip/openEuler适配指南.md @@ -46,11 +46,11 @@ - RK35xx - 需要将编译好的 u-boot 二进制文件放到 [u-boot 目录](../../scripts/bin/u-boot/)下，并在版型文件中增加文件路径。 + 需要将编译好的 u-boot 二进制文件放到 [u-boot 目录](../../scripts/bin/rockchip/u-boot/)下，并在版型文件中增加文件路径。 ## 准备 firmware 文件 -这里提到的 firmware 是开发板的板载蓝牙和 WiFi 的驱动固件，可参考[本框架储存的的 firmware 文件](../../scripts/bin/linux-firmware/)。 +这里提到的 firmware 是开发板的板载蓝牙和 WiFi 的驱动固件，可参考[本框架储存的的 firmware 文件](../../scripts/bin/rockchip/linux-firmware/)。 请确定开发板所使用的 firmware，并提交至仓库的相应目录下。 @@ -118,7 +118,7 @@ POST_BOARD_OVERLAY() { - nonfree_bin_dir - 该参数为储存 firmware 的文件夹，默认为 [../../scripts/bin/](../../scripts/bin/)。 + 该参数为储存 firmware 的文件夹，默认为 [../../scripts/bin/rockchip/](../../scripts/bin/rockchip/)。 - rootfs_dir diff --git a/documents/rockchip/openEuler镜像的构建.md b/documents/rockchip/openEuler镜像的构建.md index 0eb71f5..47c3c54 100644 --- a/documents/rockchip/openEuler镜像的构建.md +++ b/documents/rockchip/openEuler镜像的构建.md @@ -441,7 +441,7 @@ dnf --installroot=$WORKDIR/rootfs/ install -y alsa-utils wpa_supplicant vim net- ``` 3. 拷贝 wifi 配置文件，蓝牙启动文件 - 1. 下载 [无线配置目录](../../scripts/bin/wireless) 到 $WORKDIR + 1. 下载 [无线配置目录](../../scripts/bin/rockchip/wireless) 到 $WORKDIR 2. 拷贝文件 : ``` diff --git a/documents/rockchip/刷写EMMC镜像.md b/documents/rockchip/刷写EMMC镜像.md index 0c75443..7dd6784 100644 --- a/documents/rockchip/刷写EMMC镜像.md +++ b/documents/rockchip/刷写EMMC镜像.md @@ -47,8 +47,8 @@ 1. 生成的刷写文件压缩包为 build 下或项目主页发布的的压缩后的 RAW 原始镜像（需要解压）：openEuler-VERSION-BOARD-RELEASE.img.xz。 2. 项目主页 scripts/bin 目录下提供的： - - 如果是 RK3399，使用 [rk3399_loader.bin](../../scripts/bin/rk3399_loader.bin) - - 如果是 RK3588，使用 [rk3588_loader.bin](../../scripts/bin/rk3588_loader.bin) + - 如果是 RK3399，使用 [rk3399_loader.bin](../../scripts/bin/rockchip/rk3399_loader.bin) + - 如果是 RK3588，使用 [rk3588_loader.bin](../../scripts/bin/rockchip/rk3588_loader.bin) 3. 下载版本不小于 2.92 的 [RKDevTool 工具](https://dl.radxa.com/tools/windows/windows_RKDevTool_Release_v2.92.zip)。 diff --git a/documents/rockchip/顺序构建.md b/documents/rockchip/顺序构建.md index 6cda461..97fb22a 100644 --- a/documents/rockchip/顺序构建.md +++ b/documents/rockchip/顺序构建.md @@ -109,7 +109,7 @@ - `xfce`，带 Xfce 桌面以及中文字体、输入法等全部配套软件。 - `ukui`，带 UKUI 桌面及必要的配套软件（不包括中文字体以及输入法）。 - `dde`，带 DDE 桌面及必要的配套软件（不包括中文字体以及输入法）。 - - rpmlist 文件路径，其中包含镜像中要安装的软件列表，内容参考 [rpmlist](../../scripts/configs/rpmlist)。 + - rpmlist 文件路径，其中包含镜像中要安装的软件列表，内容参考 [rpmlist](../../scripts/configs/rockchip/rpmlist)。 默认使用 `headless` 选项。 diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/aic_userconfig.txt b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/aic_userconfig.txt similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/aic_userconfig.txt rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/aic_userconfig.txt diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fmacfw.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fmacfw.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_m2d.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_m2d.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_m2d.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_m2d.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep_rf.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep_rf.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep_rf.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_no_msg_ep_rf.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_rf.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_rf.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fmacfw_rf.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fmacfw_rf.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_adid.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_adid.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_adid.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_adid.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_adid_rf.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_adid_rf.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_adid_rf.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_adid_rf.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_adid_u03.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_adid_u03.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_adid_u03.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_adid_u03.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_ble_scan.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_ble_scan.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_ble_scan.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_ble_scan.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_dcdc.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_dcdc.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_dcdc.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_dcdc.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_ldo.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_ldo.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_ldo.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_ble_scan_ad_filter_ldo.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_patch.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_patch.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_rf.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_rf.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_rf.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_rf.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_table.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_table.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_table.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_table.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_table_u03.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_table_u03.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_table_u03.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_table_u03.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_u03.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_u03.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/fw_patch_u03.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/fw_patch_u03.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800/m2d_ota.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800/m2d_ota.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800/m2d_ota.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800/m2d_ota.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/aic_userconfig_8800d80.txt b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/aic_userconfig_8800d80.txt similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/aic_userconfig_8800d80.txt rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/aic_userconfig_8800d80.txt diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/calibmode_8800d80.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/calibmode_8800d80.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/calibmode_8800d80.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/calibmode_8800d80.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/fmacfw_8800d80_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fmacfw_8800d80_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/fmacfw_8800d80_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fmacfw_8800d80_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/fw_adid_8800d80_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_adid_8800d80_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/fw_adid_8800d80_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_adid_8800d80_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/fw_ble_scan_ad_filter.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_ble_scan_ad_filter.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/fw_ble_scan_ad_filter.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_ble_scan_ad_filter.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/fw_patch_8800d80_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_patch_8800d80_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/fw_patch_8800d80_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_patch_8800d80_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/fw_patch_table_8800d80_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_patch_table_8800d80_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/fw_patch_table_8800d80_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/fw_patch_table_8800d80_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800D80/lmacfw_rf_8800d80_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/lmacfw_rf_8800d80_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800D80/lmacfw_rf_8800d80_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800D80/lmacfw_rf_8800d80_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dc.txt b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dc.txt similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dc.txt rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dc.txt diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dw.txt b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dw.txt similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dw.txt rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/aic_userconfig_8800dw.txt diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_h_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_h_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_h_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_h_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_calib_8800dc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_h_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_h_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_h_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_h_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_8800dc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_h_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_h_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_h_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_h_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fw_adid_8800dc_u02h.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_adid_8800dc_u02h.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fw_adid_8800dc_u02h.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_adid_8800dc_u02h.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02h.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02h.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02h.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_8800dc_u02h.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02h.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02h.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02h.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/fw_patch_table_8800dc_u02h.bin diff --git a/scripts/bin/linux-firmware/aic8800/aic8800DC/lmacfw_rf_8800dc.bin b/scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/lmacfw_rf_8800dc.bin similarity index 100% rename from scripts/bin/linux-firmware/aic8800/aic8800DC/lmacfw_rf_8800dc.bin rename to scripts/bin/rockchip/linux-firmware/aic8800/aic8800DC/lmacfw_rf_8800dc.bin diff --git a/scripts/bin/linux-firmware/ap6255/BCM4345C0.hcd b/scripts/bin/rockchip/linux-firmware/ap6255/BCM4345C0.hcd similarity index 100% rename from scripts/bin/linux-firmware/ap6255/BCM4345C0.hcd rename to scripts/bin/rockchip/linux-firmware/ap6255/BCM4345C0.hcd diff --git a/scripts/bin/linux-firmware/ap6255/brcmfmac43455-sdio.bin b/scripts/bin/rockchip/linux-firmware/ap6255/brcmfmac43455-sdio.bin similarity index 100% rename from scripts/bin/linux-firmware/ap6255/brcmfmac43455-sdio.bin rename to scripts/bin/rockchip/linux-firmware/ap6255/brcmfmac43455-sdio.bin diff --git a/scripts/bin/linux-firmware/ap6255/brcmfmac43455-sdio.txt b/scripts/bin/rockchip/linux-firmware/ap6255/brcmfmac43455-sdio.txt similarity index 100% rename from scripts/bin/linux-firmware/ap6255/brcmfmac43455-sdio.txt rename to scripts/bin/rockchip/linux-firmware/ap6255/brcmfmac43455-sdio.txt diff --git a/scripts/bin/linux-firmware/ap6275s/BCM4362A2.hcd b/scripts/bin/rockchip/linux-firmware/ap6275s/BCM4362A2.hcd similarity index 100% rename from scripts/bin/linux-firmware/ap6275s/BCM4362A2.hcd rename to scripts/bin/rockchip/linux-firmware/ap6275s/BCM4362A2.hcd diff --git a/scripts/bin/linux-firmware/ap6275s/brcmfmac43752-sdio.bin b/scripts/bin/rockchip/linux-firmware/ap6275s/brcmfmac43752-sdio.bin similarity index 100% rename from scripts/bin/linux-firmware/ap6275s/brcmfmac43752-sdio.bin rename to scripts/bin/rockchip/linux-firmware/ap6275s/brcmfmac43752-sdio.bin diff --git a/scripts/bin/linux-firmware/ap6275s/brcmfmac43752-sdio.txt b/scripts/bin/rockchip/linux-firmware/ap6275s/brcmfmac43752-sdio.txt similarity index 100% rename from scripts/bin/linux-firmware/ap6275s/brcmfmac43752-sdio.txt rename to scripts/bin/rockchip/linux-firmware/ap6275s/brcmfmac43752-sdio.txt diff --git a/scripts/bin/linux-firmware/ap6356s/BCM4356A2.hcd b/scripts/bin/rockchip/linux-firmware/ap6356s/BCM4356A2.hcd similarity index 100% rename from scripts/bin/linux-firmware/ap6356s/BCM4356A2.hcd rename to scripts/bin/rockchip/linux-firmware/ap6356s/BCM4356A2.hcd diff --git a/scripts/bin/linux-firmware/ap6356s/brcmfmac4356-sdio.bin b/scripts/bin/rockchip/linux-firmware/ap6356s/brcmfmac4356-sdio.bin similarity index 100% rename from scripts/bin/linux-firmware/ap6356s/brcmfmac4356-sdio.bin rename to scripts/bin/rockchip/linux-firmware/ap6356s/brcmfmac4356-sdio.bin diff --git a/scripts/bin/linux-firmware/ap6356s/brcmfmac4356-sdio.txt b/scripts/bin/rockchip/linux-firmware/ap6356s/brcmfmac4356-sdio.txt similarity index 100% rename from scripts/bin/linux-firmware/ap6356s/brcmfmac4356-sdio.txt rename to scripts/bin/rockchip/linux-firmware/ap6356s/brcmfmac4356-sdio.txt diff --git a/scripts/bin/linux-firmware/bcmdhd/config.txt b/scripts/bin/rockchip/linux-firmware/bcmdhd/config.txt similarity index 100% rename from scripts/bin/linux-firmware/bcmdhd/config.txt rename to scripts/bin/rockchip/linux-firmware/bcmdhd/config.txt diff --git a/scripts/bin/linux-firmware/bcmdhd/fw_bcm43752a2_ag.bin b/scripts/bin/rockchip/linux-firmware/bcmdhd/fw_bcm43752a2_ag.bin similarity index 100% rename from scripts/bin/linux-firmware/bcmdhd/fw_bcm43752a2_ag.bin rename to scripts/bin/rockchip/linux-firmware/bcmdhd/fw_bcm43752a2_ag.bin diff --git a/scripts/bin/linux-firmware/bcmdhd/nvram_ap6275s.txt b/scripts/bin/rockchip/linux-firmware/bcmdhd/nvram_ap6275s.txt similarity index 100% rename from scripts/bin/linux-firmware/bcmdhd/nvram_ap6275s.txt rename to scripts/bin/rockchip/linux-firmware/bcmdhd/nvram_ap6275s.txt diff --git a/scripts/bin/linux-firmware/rtl8821c/rtk_hciattach b/scripts/bin/rockchip/linux-firmware/rtl8821c/rtk_hciattach similarity index 100% rename from scripts/bin/linux-firmware/rtl8821c/rtk_hciattach rename to scripts/bin/rockchip/linux-firmware/rtl8821c/rtk_hciattach diff --git a/scripts/bin/linux-firmware/rtl8821c/rtl8821c_config b/scripts/bin/rockchip/linux-firmware/rtl8821c/rtl8821c_config similarity index 100% rename from scripts/bin/linux-firmware/rtl8821c/rtl8821c_config rename to scripts/bin/rockchip/linux-firmware/rtl8821c/rtl8821c_config diff --git a/scripts/bin/linux-firmware/rtl8821c/rtl8821c_fw b/scripts/bin/rockchip/linux-firmware/rtl8821c/rtl8821c_fw similarity index 100% rename from scripts/bin/linux-firmware/rtl8821c/rtl8821c_fw rename to scripts/bin/rockchip/linux-firmware/rtl8821c/rtl8821c_fw diff --git a/scripts/bin/linux-firmware/rtl8821c/systemd-hciattach.service b/scripts/bin/rockchip/linux-firmware/rtl8821c/systemd-hciattach.service similarity index 100% rename from scripts/bin/linux-firmware/rtl8821c/systemd-hciattach.service rename to scripts/bin/rockchip/linux-firmware/rtl8821c/systemd-hciattach.service diff --git a/scripts/bin/linux-firmware/uwe5622/wcnmodem-38222.bin b/scripts/bin/rockchip/linux-firmware/uwe5622/wcnmodem-38222.bin similarity index 100% rename from scripts/bin/linux-firmware/uwe5622/wcnmodem-38222.bin rename to scripts/bin/rockchip/linux-firmware/uwe5622/wcnmodem-38222.bin diff --git a/scripts/bin/linux-firmware/uwe5622/wcnmodem.bin b/scripts/bin/rockchip/linux-firmware/uwe5622/wcnmodem.bin similarity index 100% rename from scripts/bin/linux-firmware/uwe5622/wcnmodem.bin rename to scripts/bin/rockchip/linux-firmware/uwe5622/wcnmodem.bin diff --git a/scripts/bin/linux-firmware/uwe5622/wifi_2355b001_1ant.ini b/scripts/bin/rockchip/linux-firmware/uwe5622/wifi_2355b001_1ant.ini similarity index 100% rename from scripts/bin/linux-firmware/uwe5622/wifi_2355b001_1ant.ini rename to scripts/bin/rockchip/linux-firmware/uwe5622/wifi_2355b001_1ant.ini diff --git a/scripts/bin/qemu-user-static-aarch64-x86_64.rpm b/scripts/bin/rockchip/qemu-user-static-aarch64-x86_64.rpm similarity index 100% rename from scripts/bin/qemu-user-static-aarch64-x86_64.rpm rename to scripts/bin/rockchip/qemu-user-static-aarch64-x86_64.rpm diff --git a/scripts/bin/rk3399_loader.bin b/scripts/bin/rockchip/rk3399_loader.bin similarity index 100% rename from scripts/bin/rk3399_loader.bin rename to scripts/bin/rockchip/rk3399_loader.bin diff --git a/scripts/bin/rk3399_parameter.gpt b/scripts/bin/rockchip/rk3399_parameter.gpt similarity index 100% rename from scripts/bin/rk3399_parameter.gpt rename to scripts/bin/rockchip/rk3399_parameter.gpt diff --git a/scripts/bin/rk3588-pack/MiniLoaderAll.bin b/scripts/bin/rockchip/rk3588-pack/MiniLoaderAll.bin similarity index 100% rename from scripts/bin/rk3588-pack/MiniLoaderAll.bin rename to scripts/bin/rockchip/rk3588-pack/MiniLoaderAll.bin diff --git a/scripts/bin/rk3588-pack/afptool b/scripts/bin/rockchip/rk3588-pack/afptool similarity index 100% rename from scripts/bin/rk3588-pack/afptool rename to scripts/bin/rockchip/rk3588-pack/afptool diff --git a/scripts/bin/rk3588-pack/misc.img b/scripts/bin/rockchip/rk3588-pack/misc.img similarity index 100% rename from scripts/bin/rk3588-pack/misc.img rename to scripts/bin/rockchip/rk3588-pack/misc.img diff --git a/scripts/bin/rk3588-pack/oem.img b/scripts/bin/rockchip/rk3588-pack/oem.img similarity index 100% rename from scripts/bin/rk3588-pack/oem.img rename to scripts/bin/rockchip/rk3588-pack/oem.img diff --git a/scripts/bin/rk3588-pack/package-file b/scripts/bin/rockchip/rk3588-pack/package-file similarity index 100% rename from scripts/bin/rk3588-pack/package-file rename to scripts/bin/rockchip/rk3588-pack/package-file diff --git a/scripts/bin/rk3588-pack/parameter.txt b/scripts/bin/rockchip/rk3588-pack/parameter.txt similarity index 100% rename from scripts/bin/rk3588-pack/parameter.txt rename to scripts/bin/rockchip/rk3588-pack/parameter.txt diff --git a/scripts/bin/rk3588-pack/recovery.img b/scripts/bin/rockchip/rk3588-pack/recovery.img similarity index 100% rename from scripts/bin/rk3588-pack/recovery.img rename to scripts/bin/rockchip/rk3588-pack/recovery.img diff --git a/scripts/bin/rk3588-pack/rk3588-mkupdate.sh b/scripts/bin/rockchip/rk3588-pack/rk3588-mkupdate.sh similarity index 100% rename from scripts/bin/rk3588-pack/rk3588-mkupdate.sh rename to scripts/bin/rockchip/rk3588-pack/rk3588-mkupdate.sh diff --git a/scripts/bin/rk3588-pack/rkImageMaker b/scripts/bin/rockchip/rk3588-pack/rkImageMaker similarity index 100% rename from scripts/bin/rk3588-pack/rkImageMaker rename to scripts/bin/rockchip/rk3588-pack/rkImageMaker diff --git a/scripts/bin/rk3588-pack/uboot.img b/scripts/bin/rockchip/rk3588-pack/uboot.img similarity index 100% rename from scripts/bin/rk3588-pack/uboot.img rename to scripts/bin/rockchip/rk3588-pack/uboot.img diff --git a/scripts/bin/rk3588-pack/userdata.img b/scripts/bin/rockchip/rk3588-pack/userdata.img similarity index 100% rename from scripts/bin/rk3588-pack/userdata.img rename to scripts/bin/rockchip/rk3588-pack/userdata.img diff --git a/scripts/bin/rk3588_loader.bin b/scripts/bin/rockchip/rk3588_loader.bin similarity index 100% rename from scripts/bin/rk3588_loader.bin rename to scripts/bin/rockchip/rk3588_loader.bin diff --git a/scripts/bin/rk3588_parameter.gpt b/scripts/bin/rockchip/rk3588_parameter.gpt similarity index 100% rename from scripts/bin/rk3588_parameter.gpt rename to scripts/bin/rockchip/rk3588_parameter.gpt diff --git a/scripts/bin/u-boot/armsom-sige5/idbloader.img b/scripts/bin/rockchip/u-boot/armsom-sige5/idbloader.img similarity index 100% rename from scripts/bin/u-boot/armsom-sige5/idbloader.img rename to scripts/bin/rockchip/u-boot/armsom-sige5/idbloader.img diff --git a/scripts/bin/u-boot/armsom-sige5/u-boot.itb b/scripts/bin/rockchip/u-boot/armsom-sige5/u-boot.itb similarity index 100% rename from scripts/bin/u-boot/armsom-sige5/u-boot.itb rename to scripts/bin/rockchip/u-boot/armsom-sige5/u-boot.itb diff --git a/scripts/bin/u-boot/firefly-rk3566/idbloader.img b/scripts/bin/rockchip/u-boot/firefly-rk3566/idbloader.img similarity index 100% rename from scripts/bin/u-boot/firefly-rk3566/idbloader.img rename to scripts/bin/rockchip/u-boot/firefly-rk3566/idbloader.img diff --git a/scripts/bin/u-boot/firefly-rk3566/u-boot.itb b/scripts/bin/rockchip/u-boot/firefly-rk3566/u-boot.itb similarity index 100% rename from scripts/bin/u-boot/firefly-rk3566/u-boot.itb rename to scripts/bin/rockchip/u-boot/firefly-rk3566/u-boot.itb diff --git a/scripts/bin/u-boot/firefly-rk3568/idbloader.img b/scripts/bin/rockchip/u-boot/firefly-rk3568/idbloader.img similarity index 100% rename from scripts/bin/u-boot/firefly-rk3568/idbloader.img rename to scripts/bin/rockchip/u-boot/firefly-rk3568/idbloader.img diff --git a/scripts/bin/u-boot/firefly-rk3568/u-boot.itb b/scripts/bin/rockchip/u-boot/firefly-rk3568/u-boot.itb similarity index 100% rename from scripts/bin/u-boot/firefly-rk3568/u-boot.itb rename to scripts/bin/rockchip/u-boot/firefly-rk3568/u-boot.itb diff --git a/scripts/bin/u-boot/firefly-rk3588/idbloader.img b/scripts/bin/rockchip/u-boot/firefly-rk3588/idbloader.img similarity index 100% rename from scripts/bin/u-boot/firefly-rk3588/idbloader.img rename to scripts/bin/rockchip/u-boot/firefly-rk3588/idbloader.img diff --git a/scripts/bin/u-boot/firefly-rk3588/u-boot.itb b/scripts/bin/rockchip/u-boot/firefly-rk3588/u-boot.itb similarity index 100% rename from scripts/bin/u-boot/firefly-rk3588/u-boot.itb rename to scripts/bin/rockchip/u-boot/firefly-rk3588/u-boot.itb diff --git a/scripts/bin/u-boot/longanpi-3h/u-boot-sunxi-with-spl.bin b/scripts/bin/rockchip/u-boot/longanpi-3h/u-boot-sunxi-with-spl.bin similarity index 100% rename from scripts/bin/u-boot/longanpi-3h/u-boot-sunxi-with-spl.bin rename to scripts/bin/rockchip/u-boot/longanpi-3h/u-boot-sunxi-with-spl.bin diff --git a/scripts/bin/u-boot/orangepi-zero2/u-boot-sunxi-with-spl.bin b/scripts/bin/rockchip/u-boot/orangepi-zero2/u-boot-sunxi-with-spl.bin similarity index 100% rename from scripts/bin/u-boot/orangepi-zero2/u-boot-sunxi-with-spl.bin rename to scripts/bin/rockchip/u-boot/orangepi-zero2/u-boot-sunxi-with-spl.bin diff --git a/scripts/bin/u-boot/phytiumpi/env.txt b/scripts/bin/rockchip/u-boot/phytiumpi/env.txt similarity index 100% rename from scripts/bin/u-boot/phytiumpi/env.txt rename to scripts/bin/rockchip/u-boot/phytiumpi/env.txt diff --git a/scripts/bin/u-boot/phytiumpi/fip-all-sd-boot.bin b/scripts/bin/rockchip/u-boot/phytiumpi/fip-all-sd-boot.bin similarity index 100% rename from scripts/bin/u-boot/phytiumpi/fip-all-sd-boot.bin rename to scripts/bin/rockchip/u-boot/phytiumpi/fip-all-sd-boot.bin diff --git a/scripts/bin/u-boot/radxa-rock5b/idbloader.img b/scripts/bin/rockchip/u-boot/radxa-rock5b/idbloader.img similarity index 100% rename from scripts/bin/u-boot/radxa-rock5b/idbloader.img rename to scripts/bin/rockchip/u-boot/radxa-rock5b/idbloader.img diff --git a/scripts/bin/u-boot/radxa-rock5b/u-boot.itb b/scripts/bin/rockchip/u-boot/radxa-rock5b/u-boot.itb similarity index 100% rename from scripts/bin/u-boot/radxa-rock5b/u-boot.itb rename to scripts/bin/rockchip/u-boot/radxa-rock5b/u-boot.itb diff --git a/scripts/bin/wireless/enable_bt b/scripts/bin/rockchip/wireless/enable_bt similarity index 100% rename from scripts/bin/wireless/enable_bt rename to scripts/bin/rockchip/wireless/enable_bt diff --git a/scripts/bin/wireless/rcS.sh b/scripts/bin/rockchip/wireless/rcS.sh similarity index 100% rename from scripts/bin/wireless/rcS.sh rename to scripts/bin/rockchip/wireless/rcS.sh diff --git a/scripts/bin/wireless/system/etc/firmware/4343A0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/4343A0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/4343A0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/4343A0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4330B1.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4330B1.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4330B1.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4330B1.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4343B0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4343B0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4343B0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4343B0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4345C0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4345C0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4345C0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4345C0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4345C0_ap.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4345C0_ap.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4345C0_ap.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4345C0_ap.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4345C5.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4345C5.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4345C5.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4345C5.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4354A2.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4354A2.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4354A2.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4354A2.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4356A2.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4356A2.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4356A2.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4356A2.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/BCM4359C0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/BCM4359C0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/BCM4359C0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/BCM4359C0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/awnb108.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/awnb108.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/awnb108.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/awnb108.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm20710a1.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm20710a1.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm20710a1.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm20710a1.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm20710a1_24M.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm20710a1_24M.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm20710a1_24M.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm20710a1_24M.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm20710a1_26M.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm20710a1_26M.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm20710a1_26M.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm20710a1_26M.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm2076b1.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm2076b1.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm2076b1.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm2076b1.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm40183b2.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm40183b2.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm40183b2.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm40183b2.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm43241b4.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm43241b4.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm43241b4.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm43241b4.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm4329.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm4329.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm4329.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm4329.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm43341b0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm43341b0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm43341b0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm43341b0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm4339a0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm4339a0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm4339a0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm4339a0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm43438a0.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm43438a0.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm43438a0.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm43438a0.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm43438a1.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm43438a1.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm43438a1.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm43438a1.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/bcm4354a1.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/bcm4354a1.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/bcm4354a1.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/bcm4354a1.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/fw_awnb108.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_awnb108.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_awnb108.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_awnb108.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_awnb108_ap.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_awnb108_ap.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_awnb108_ap.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_awnb108_ap.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm40181a2.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40181a2.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm40181a2.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40181a2.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm40181a2_apsta.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40181a2_apsta.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm40181a2_apsta.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40181a2_apsta.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm40183b2.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40183b2.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm40183b2.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40183b2.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm40183b2_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40183b2_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm40183b2_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm40183b2_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43241b4_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43241b4_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43241b4_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43241b4_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm4330.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4330.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm4330.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4330.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43341b0_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43341b0_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43341b0_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43341b0_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm4334b1_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4334b1_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm4334b1_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4334b1_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm4339a0_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4339a0_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm4339a0_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4339a0_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43436b0.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43436b0.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43436b0.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43436b0.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43436b0_apsta.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43436b0_apsta.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43436b0_apsta.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43436b0_apsta.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43438a0.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43438a0.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43438a0.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43438a0.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43438a1.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43438a1.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43438a1.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43438a1.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43438a1_apsta.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43438a1_apsta.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43438a1_apsta.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43438a1_apsta.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43455c0_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43455c0_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43455c0_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43455c0_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm43456c5_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43456c5_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm43456c5_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm43456c5_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm4354a1_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4354a1_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm4354a1_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4354a1_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm4356a2_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4356a2_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm4356a2_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4356a2_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_bcm4359c0_ag.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4359c0_ag.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_bcm4359c0_ag.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_bcm4359c0_ag.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_cyw43438.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_cyw43438.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_cyw43438.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_cyw43438.bin diff --git a/scripts/bin/wireless/system/etc/firmware/fw_cyw43455.bin b/scripts/bin/rockchip/wireless/system/etc/firmware/fw_cyw43455.bin similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/fw_cyw43455.bin rename to scripts/bin/rockchip/wireless/system/etc/firmware/fw_cyw43455.bin diff --git a/scripts/bin/wireless/system/etc/firmware/nh660.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/nh660.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nh660.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/nh660.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_4330.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_4330.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_4330.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_4330.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_4330_oob.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_4330_oob.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_4330_oob.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_4330_oob.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6210.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6210.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6210.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6210.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6210_24M.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6210_24M.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6210_24M.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6210_24M.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6234.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6234.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6234.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6234.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6330.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6330.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6330.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6330.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6335.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6335.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6335.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6335.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6441.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6441.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6441.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6441.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6476.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6476.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6476.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6476.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_AP6493.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6493.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_AP6493.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_AP6493.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_B23.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_B23.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_B23.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_B23.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_RK901.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK901.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_RK901.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK901.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_RK903.cal b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK903.cal similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_RK903.cal rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK903.cal diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_RK903.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK903.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_RK903.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK903.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_RK903_26M.cal b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK903_26M.cal similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_RK903_26M.cal rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_RK903_26M.cal diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6181.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6181.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6181.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6181.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6212.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6212.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6212a.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212a.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6212a.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212a.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6212a_ap.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212a_ap.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6212a_ap.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212a_ap.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6212a_cy.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212a_cy.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6212a_cy.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6212a_cy.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6233f.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6233f.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6233f.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6233f.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6236.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6236.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6236.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6236.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6255.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6255.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6255.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6255.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6256.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6256.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6256.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6256.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap62x2.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap62x2.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap62x2.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap62x2.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6354.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6354.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6354.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6354.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6356.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6356.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6356.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6356.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6356s.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6356s.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6356s.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6356s.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6398s.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6398s.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6398s.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6398s.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_ap6452.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6452.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_ap6452.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_ap6452.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_awnb108.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_awnb108.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_awnb108.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_awnb108.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_cyw43438.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_cyw43438.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_cyw43438.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_cyw43438.txt diff --git a/scripts/bin/wireless/system/etc/firmware/nvram_cyw43455.txt b/scripts/bin/rockchip/wireless/system/etc/firmware/nvram_cyw43455.txt similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/nvram_cyw43455.txt rename to scripts/bin/rockchip/wireless/system/etc/firmware/nvram_cyw43455.txt diff --git a/scripts/bin/wireless/system/etc/firmware/rk903.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/rk903.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/rk903.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/rk903.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/rk903_26M.hcd b/scripts/bin/rockchip/wireless/system/etc/firmware/rk903_26M.hcd similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/rk903_26M.hcd rename to scripts/bin/rockchip/wireless/system/etc/firmware/rk903_26M.hcd diff --git a/scripts/bin/wireless/system/etc/firmware/wifi_efuse_8189e.map b/scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8189e.map similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/wifi_efuse_8189e.map rename to scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8189e.map diff --git a/scripts/bin/wireless/system/etc/firmware/wifi_efuse_8723bs-vq0.map b/scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8723bs-vq0.map similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/wifi_efuse_8723bs-vq0.map rename to scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8723bs-vq0.map diff --git a/scripts/bin/wireless/system/etc/firmware/wifi_efuse_8723cs.map b/scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8723cs.map similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/wifi_efuse_8723cs.map rename to scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8723cs.map diff --git a/scripts/bin/wireless/system/etc/firmware/wifi_efuse_8723ds.map b/scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8723ds.map similarity index 100% rename from scripts/bin/wireless/system/etc/firmware/wifi_efuse_8723ds.map rename to scripts/bin/rockchip/wireless/system/etc/firmware/wifi_efuse_8723ds.map diff --git a/scripts/build-image-docker.sh b/scripts/build-image-docker.sh index d043c90..47e27a1 100755 --- a/scripts/build-image-docker.sh +++ b/scripts/build-image-docker.sh @@ -101,9 +101,9 @@ make_cores=$(nproc) log_dir=${workdir}/log if [ ! -d ${log_dir} ];then mkdir -p ${log_dir}; fi if [ "x${board}" == "xraspberrypi" ]; then - config_dir=${cur_dir}/configs-rpi + config_dir=${cur_dir}/configs/raspberrypi else - config_dir=${cur_dir}/configs + config_dir=${cur_dir}/configs/rockchip fi parseargs "$@" || help $? diff --git a/scripts/build.sh b/scripts/build.sh index 7ee0642..f8c9f87 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -45,6 +45,7 @@ default_param() { branch=openEuler-20.03-LTS repo_file="https://gitee.com/src-openeuler/openEuler-repos/raw/openEuler-20.03-LTS/generic.repo" kernel_url="https://gitee.com/openeuler/rockchip-kernel.git" + nonfree_bin_dir=${cur_dir}/bin/rockchip workdir=${cur_dir}/build name=${branch}-${board}-aarch64-alpha1 make_cores=$(nproc) @@ -195,7 +196,7 @@ fi if [[ $(cat ${workdir}/.done | grep rootfs) != "rootfs" ]];then if [[ "${host_arch}" == "x86_64" && "${arch}" == "arm64" ]];then LOG "You are running this script on a ${host_arch} mechine, installing qemu-user-static...." - sudo rpm -ivh ${cur_dir}/bin/qemu-user-static-aarch64-x86_64.rpm + sudo rpm -ivh ${nonfree_bin_dir}/qemu-user-static-aarch64-x86_64.rpm fi LOG "You are running this script on a ${host_arch} mechine, start building rootfs...." bash ${cur_dir}/build_rootfs.sh diff --git a/scripts/build_rootfs.sh b/scripts/build_rootfs.sh index c2b1509..558e459 100755 --- a/scripts/build_rootfs.sh +++ b/scripts/build_rootfs.sh @@ -29,8 +29,8 @@ default_param() { tmp_dir=${workdir}/tmp branch=openEuler-20.03-LTS rootfs_arch=aarch64 - nonfree_bin_dir=${cur_dir}/bin - config_dir=${cur_dir}/configs + nonfree_bin_dir=${cur_dir}/bin/rockchip + config_dir=${cur_dir}/configs/rockchip rootfs_dir=${workdir}/rootfs log_dir=${workdir}/log rootfs_mnt=${workdir}/rootfs_tmp @@ -352,7 +352,7 @@ local_param parseargs "$@" || help $? if [ "x${board}" == "xraspberrypi" ]; then - config_dir=${cur_dir}/configs-rpi + config_dir=${cur_dir}/configs/raspberrypi fi CONFIG_RPM_LIST=${config_dir}/rpmlist diff --git a/scripts/build_u-boot.sh b/scripts/build_u-boot.sh index 4f36387..0f09ae3 100755 --- a/scripts/build_u-boot.sh +++ b/scripts/build_u-boot.sh @@ -25,7 +25,7 @@ default_param() { u_boot_url="https://gitlab.arm.com/systemready/firmware-build/u-boot.git" rk3399_bl31_url="https://github.com/rockchip-linux/rkbin/raw/master/bin/rk33/rk3399_bl31_v1.36.elf" log_dir=${workdir}/log - nonfree_bin_dir=${cur_dir}/bin + nonfree_bin_dir=${cur_dir}/bin/rockchip make_cores=$(nproc) } diff --git a/scripts/configs-rpi/Dockerfile b/scripts/configs-rpi/Dockerfile deleted file mode 120000 index ddb389f..0000000 --- a/scripts/configs-rpi/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../configs/Dockerfile \ No newline at end of file diff --git a/scripts/configs-rpi/Dockerfile_makeraspi b/scripts/configs-rpi/Dockerfile_makeraspi deleted file mode 100644 index 0ba1932..0000000 --- a/scripts/configs-rpi/Dockerfile_makeraspi +++ /dev/null @@ -1,13 +0,0 @@ -FROM openeuler-20.03-lts-sp1:latest - -RUN dnf clean expire-cache - -RUN dnf -y install cmake gdb gcc gcc-c++ libstdc++-static ncurses ncurses-devel make python bash coreutils && \ - dnf -y clean all - -RUN dnf -y install module-init-tools git openssl-devel bc bison flex dnf-plugins-core dosfstools parted wget device-mapper-multipath grep xz kpartx -RUN dnf -y install rsync passwd diffutils -ENV SHELL=/bin/bash - -ENTRYPOINT ["/bin/bash", "/work/build-image.sh"] - diff --git a/scripts/configs-rpi/ifcfg-eth0 b/scripts/configs-rpi/ifcfg-eth0 deleted file mode 120000 index 2e31118..0000000 --- a/scripts/configs-rpi/ifcfg-eth0 +++ /dev/null @@ -1 +0,0 @@ -../configs/ifcfg-eth0 \ No newline at end of file diff --git a/scripts/configs-rpi/resolv.conf b/scripts/configs-rpi/resolv.conf deleted file mode 120000 index 9896311..0000000 --- a/scripts/configs-rpi/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -../configs/resolv.conf \ No newline at end of file diff --git a/scripts/configs-rpi/99-com.rules b/scripts/configs/raspberrypi/99-com.rules similarity index 100% rename from scripts/configs-rpi/99-com.rules rename to scripts/configs/raspberrypi/99-com.rules diff --git a/scripts/configs/raspberrypi/Dockerfile b/scripts/configs/raspberrypi/Dockerfile new file mode 120000 index 0000000..383aff7 --- /dev/null +++ b/scripts/configs/raspberrypi/Dockerfile @@ -0,0 +1 @@ +../rockchip/Dockerfile \ No newline at end of file diff --git a/scripts/configs-rpi/LICENCE.raspberrypi-sys-mods b/scripts/configs/raspberrypi/LICENCE.raspberrypi-sys-mods similarity index 100% rename from scripts/configs-rpi/LICENCE.raspberrypi-sys-mods rename to scripts/configs/raspberrypi/LICENCE.raspberrypi-sys-mods diff --git a/scripts/configs-rpi/chroot.sh b/scripts/configs/raspberrypi/chroot.sh similarity index 100% rename from scripts/configs-rpi/chroot.sh rename to scripts/configs/raspberrypi/chroot.sh diff --git a/scripts/configs-rpi/config.txt b/scripts/configs/raspberrypi/config.txt similarity index 100% rename from scripts/configs-rpi/config.txt rename to scripts/configs/raspberrypi/config.txt diff --git a/scripts/configs-rpi/extend-root.sh b/scripts/configs/raspberrypi/extend-root.sh similarity index 100% rename from scripts/configs-rpi/extend-root.sh rename to scripts/configs/raspberrypi/extend-root.sh diff --git a/scripts/configs-rpi/hosts b/scripts/configs/raspberrypi/hosts similarity index 100% rename from scripts/configs-rpi/hosts rename to scripts/configs/raspberrypi/hosts diff --git a/scripts/configs/raspberrypi/ifcfg-eth0 b/scripts/configs/raspberrypi/ifcfg-eth0 new file mode 120000 index 0000000..a29ea54 --- /dev/null +++ b/scripts/configs/raspberrypi/ifcfg-eth0 @@ -0,0 +1 @@ +../rockchip/ifcfg-eth0 \ No newline at end of file diff --git a/scripts/configs/raspberrypi/resolv.conf b/scripts/configs/raspberrypi/resolv.conf new file mode 120000 index 0000000..8bc7426 --- /dev/null +++ b/scripts/configs/raspberrypi/resolv.conf @@ -0,0 +1 @@ +../rockchip/resolv.conf \ No newline at end of file diff --git a/scripts/configs-rpi/rpmlist b/scripts/configs/raspberrypi/rpmlist similarity index 100% rename from scripts/configs-rpi/rpmlist rename to scripts/configs/raspberrypi/rpmlist diff --git a/scripts/configs-rpi/rpmlist-dde b/scripts/configs/raspberrypi/rpmlist-dde similarity index 100% rename from scripts/configs-rpi/rpmlist-dde rename to scripts/configs/raspberrypi/rpmlist-dde diff --git a/scripts/configs-rpi/rpmlist-devstation b/scripts/configs/raspberrypi/rpmlist-devstation similarity index 100% rename from scripts/configs-rpi/rpmlist-devstation rename to scripts/configs/raspberrypi/rpmlist-devstation diff --git a/scripts/configs-rpi/rpmlist-devstation-24.03-LTS-SP2 b/scripts/configs/raspberrypi/rpmlist-devstation-24.03-LTS-SP2 similarity index 100% rename from scripts/configs-rpi/rpmlist-devstation-24.03-LTS-SP2 rename to scripts/configs/raspberrypi/rpmlist-devstation-24.03-LTS-SP2 diff --git a/scripts/configs-rpi/rpmlist-devstation-24.09 b/scripts/configs/raspberrypi/rpmlist-devstation-24.09 similarity index 100% rename from scripts/configs-rpi/rpmlist-devstation-24.09 rename to scripts/configs/raspberrypi/rpmlist-devstation-24.09 diff --git a/scripts/configs-rpi/rpmlist-devstation-25.03 b/scripts/configs/raspberrypi/rpmlist-devstation-25.03 similarity index 100% rename from scripts/configs-rpi/rpmlist-devstation-25.03 rename to scripts/configs/raspberrypi/rpmlist-devstation-25.03 diff --git a/scripts/configs-rpi/rpmlist-gnome b/scripts/configs/raspberrypi/rpmlist-gnome similarity index 100% rename from scripts/configs-rpi/rpmlist-gnome rename to scripts/configs/raspberrypi/rpmlist-gnome diff --git a/scripts/configs-rpi/rpmlist-ukui b/scripts/configs/raspberrypi/rpmlist-ukui similarity index 100% rename from scripts/configs-rpi/rpmlist-ukui rename to scripts/configs/raspberrypi/rpmlist-ukui diff --git a/scripts/configs-rpi/rpmlist-xfce b/scripts/configs/raspberrypi/rpmlist-xfce similarity index 100% rename from scripts/configs-rpi/rpmlist-xfce rename to scripts/configs/raspberrypi/rpmlist-xfce diff --git a/scripts/configs/Dockerfile b/scripts/configs/rockchip/Dockerfile similarity index 100% rename from scripts/configs/Dockerfile rename to scripts/configs/rockchip/Dockerfile diff --git a/scripts/configs/chroot.sh b/scripts/configs/rockchip/chroot.sh similarity index 100% rename from scripts/configs/chroot.sh rename to scripts/configs/rockchip/chroot.sh diff --git a/scripts/configs/extend-root.sh b/scripts/configs/rockchip/extend-root.sh similarity index 100% rename from scripts/configs/extend-root.sh rename to scripts/configs/rockchip/extend-root.sh diff --git a/scripts/configs/ifcfg-eth0 b/scripts/configs/rockchip/ifcfg-eth0 similarity index 100% rename from scripts/configs/ifcfg-eth0 rename to scripts/configs/rockchip/ifcfg-eth0 diff --git a/scripts/configs/resolv.conf b/scripts/configs/rockchip/resolv.conf similarity index 100% rename from scripts/configs/resolv.conf rename to scripts/configs/rockchip/resolv.conf diff --git a/scripts/configs/rpmlist b/scripts/configs/rockchip/rpmlist similarity index 100% rename from scripts/configs/rpmlist rename to scripts/configs/rockchip/rpmlist diff --git a/scripts/configs/rpmlist-dde b/scripts/configs/rockchip/rpmlist-dde similarity index 100% rename from scripts/configs/rpmlist-dde rename to scripts/configs/rockchip/rpmlist-dde diff --git a/scripts/configs/rpmlist-ukui b/scripts/configs/rockchip/rpmlist-ukui similarity index 100% rename from scripts/configs/rpmlist-ukui rename to scripts/configs/rockchip/rpmlist-ukui diff --git a/scripts/configs/rpmlist-xfce b/scripts/configs/rockchip/rpmlist-xfce similarity index 100% rename from scripts/configs/rpmlist-xfce rename to scripts/configs/rockchip/rpmlist-xfce diff --git a/scripts/gen_image-x86_64.sh b/scripts/gen_image-x86_64.sh index adef7a1..acd98f7 100755 --- a/scripts/gen_image-x86_64.sh +++ b/scripts/gen_image-x86_64.sh @@ -19,8 +19,8 @@ help() } default_param() { - workdir=$cur_dir/build - bindir=$cur_dir/bin/rk3588-pack + workdir=${cur_dir}/build + bindir=${cur_dir}/bin/rockchip/rk3588-pack outputdir=${workdir}/$(date +'%Y-%m-%d') name=openEuler-22.03-LTS-RK3588 rootfs_dir=${workdir}/rootfs diff --git a/scripts/gen_image.sh b/scripts/gen_image.sh index 5263e0f..3e0d3ef 100755 --- a/scripts/gen_image.sh +++ b/scripts/gen_image.sh @@ -26,8 +26,8 @@ default_param() { board=firefly-rk3399 soc_name=rk3399 platform=rockchip - nonfree_bin_dir=${cur_dir}/bin - config_dir=${cur_dir}/configs + nonfree_bin_dir=${cur_dir}/bin/rockchip + config_dir=${cur_dir}/configs/rockchip rootfs_dir=${workdir}/rootfs boot_dir=${workdir}/boot uboot_dir=${workdir}/u-boot @@ -328,7 +328,7 @@ default_param parseargs "$@" || help $? if [ "x${board}" == "xraspberrypi" ]; then - config_dir=${cur_dir}/configs-rpi + config_dir=${cur_dir}/configs-raspberrypi fi if [ ! -d ${workdir} ]; then