mirror of
https://github.com/LuckfoxTECH/luckfox-pico.git
synced 2026-01-18 03:28:19 +01:00
Pullrequest mis5001 clear patch 0305 (#242)
* project/app : Add uvc_app_tiny application Signed-off-by: luckfox-eng29 <eng29@luckfox.com> * project/cfg/BoardConfig_IPC/overlay : Add Ubuntu system support for Rockit and RKNN libraries Signed-off-by: luckfox-eng29 <eng29@luckfox.com> * sysdrv/source/kernel/drivers/of : Add support for dynamic device tree Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/drivers/usb/serial : Add CH343 driver support Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/drivers/staging : Disable partial logging of fbtft Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/drivers/pinctrl/pinctrl-rockchip.h : Fix pinctrl configuration failure issue Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/include/dt-bindings/soc/rockchip,boot-mode.h : Add support for the reboot U-Boot command in the BusyBox system Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/drivers/video : Add logo display support for LF40-480480-ARK and LF40-720720-ARK Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/arch/arm/boot/dts : Add device tree files for the Luckfox RV1103/RV1106 series boards Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/arch/arm/configs : Add device tree files for the Luckfox RV1103/RV1106 series boards Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/uboot/u-boot/drivers/mmc/mmc.c : Fix the issue where some Micro SD cards fail to boot Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/uboot/u-boot/common/image-fit.c : Add U-Boot support for luckfox-config Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/uboot/rkbin/bin/rv11 : Add firmware with a serial baud rate of 115200 and back up the original firmware Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/uboot/u-boot/arch/arm/dts : Add device tree files for the Luckfox RV1103/RV1106 series boards Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/uboot/u-boot/configs : Add defconfig files for the Luckfox RV1103/RV1106 series boards Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/uboot/u-boot : Add support for the reboot U-Boot command in the BusyBox system Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/drivers/media/i2c : Add MIS5001 driver support Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/source/kernel/arch/arm : Add default support for MIS5001 on Luckfox RV1106 series boards Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/tools/board : Delete irrelevant overwrite files and patch files Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/drv_ko/insmod_ko.sh : Register mis5001 driver during boot process Signed-off-by: luckfox-eng29 <eng29@luckfox.com> * media/isp/release_camera_engine_rkaiq_rv1106_arm-rockchip830-linux-uclibcgnueabihf/isp_iqfiles : Add mis5001 iqfile Signed-off-by: luckfox-eng29 <eng29@luckfox.com> * project/app/rkipc/rkipc/src/rv1106_ipc : Add rkipc application support for mis5001 sensor Signed-off-by: eng29 <eng29@luckfox.com> * project/cfg/BoardConfig_IPC : Enable default retrieval of mis5001 iqfile and include ROCKIT and RKNN libraries of RV1106 series board Signed-off-by: luckfox-eng29 <eng29@luckfox.com> * project/build.sh : Remove operations related to applying and deleting patches Signed-off-by: eng29 <eng29@luckfox.com> * project/build.sh : Modify build system menu description; Apply lightweight system processing only during Buildroot and BusyBox system compilation Signed-off-by: eng29 <eng29@luckfox.com> * sysdrv/tools/board/buildroot/luckfox_pico_w_defconfig : Add pppd and pgrep for 4G module Signed-off-by: luckfox-eng29 <eng29@luckfox.com> * sysdrv/tools/board/kernel/rv1106-luckfox-pico-ultra-ipc.dtsi : Add uart4m1 support for lastest luckfox-config tool Signed-off-by: eng29 <eng29@luckfox.com> --------- Signed-off-by: luckfox-eng29 <eng29@luckfox.com> Signed-off-by: eng29 <eng29@luckfox.com>
This commit is contained in:
@@ -312,12 +312,12 @@ function choose_target_board() {
|
||||
echo -e "${C_GREEN} "${space8}选择系统版本:"${C_NORMAL}"
|
||||
|
||||
if (("$BM_INDEX" == 1)); then
|
||||
echo "${space8}${space8}[0] Buildroot(Support Rockchip official features) "
|
||||
echo "${space8}${space8}[0] Buildroot "
|
||||
read -p "Which would you like? [0~1][default:0]: " SYS_INDEX
|
||||
MAX_SYS_INDEX=0
|
||||
elif (("$BM_INDEX" == 0)); then
|
||||
echo "${space8}${space8}[0] Buildroot(Support Rockchip official features) "
|
||||
echo "${space8}${space8}[1] Ubuntu(Support for the apt package management tool)"
|
||||
echo "${space8}${space8}[0] Buildroot "
|
||||
echo "${space8}${space8}[1] Ubuntu "
|
||||
read -p "Which would you like? [0~1][default:0]: " SYS_INDEX
|
||||
MAX_SYS_INDEX=1
|
||||
fi
|
||||
@@ -689,24 +689,6 @@ function build_uboot() {
|
||||
echo "TARGET_UBOOT_CONFIG=$RK_UBOOT_DEFCONFIG $RK_UBOOT_DEFCONFIG_FRAGMENT"
|
||||
echo "========================================="
|
||||
|
||||
#Apply patch
|
||||
if [ ! -f ${SDK_SYSDRV_DIR}/source/.uboot_patch ]; then
|
||||
echo "============Apply Uboot Patch============"
|
||||
cd ${SDK_ROOT_DIR}
|
||||
git apply ${SDK_SYSDRV_DIR}/tools/board/uboot/*.patch
|
||||
if [ $? -eq 0 ]; then
|
||||
msg_info "Patch applied successfully."
|
||||
touch ${SDK_SYSDRV_DIR}/source/.uboot_patch
|
||||
else
|
||||
msg_error "Failed to apply the patch."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/uboot/*_defconfig ${SDK_SYSDRV_DIR}/source/uboot/u-boot/configs
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/uboot/*.dts ${SDK_SYSDRV_DIR}/source/uboot/u-boot/arch/arm/dts
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/uboot/*.dtsi ${SDK_SYSDRV_DIR}/source/uboot/u-boot/arch/arm/dts
|
||||
|
||||
local uboot_rkbin_ini tempfile target_ini_dir
|
||||
tempfile="$SDK_SYSDRV_DIR/source/uboot/rkbin/$RK_UBOOT_RKBIN_INI_OVERLAY"
|
||||
if [ -f "$tempfile" ]; then
|
||||
@@ -841,24 +823,6 @@ function build_sysdrv() {
|
||||
}
|
||||
|
||||
function build_kernel() {
|
||||
#Apply patch
|
||||
if [ ! -f ${SDK_SYSDRV_DIR}/source/.kernel_patch ]; then
|
||||
echo "============Apply Kernel Patch============"
|
||||
cd ${SDK_ROOT_DIR}
|
||||
git apply --verbose ${SDK_SYSDRV_DIR}/tools/board/kernel/*.patch
|
||||
if [ $? -eq 0 ]; then
|
||||
msg_info "Patch applied successfully."
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*_defconfig ${KERNEL_PATH}/arch/arm/configs/
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*.config ${KERNEL_PATH}/arch/arm/configs/
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/kernel-drivers-video-logo_linux_clut224.ppm ${KERNEL_PATH}/drivers/video/logo/logo_linux_clut224.ppm
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*.dts ${KERNEL_PATH}/arch/arm/boot/dts
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*.dtsi ${KERNEL_PATH}/arch/arm/boot/dts
|
||||
touch ${SDK_SYSDRV_DIR}/source/.kernel_patch
|
||||
else
|
||||
msg_error "Failed to apply the patch."
|
||||
fi
|
||||
fi
|
||||
|
||||
check_config RK_KERNEL_DTS RK_KERNEL_DEFCONFIG || return 0
|
||||
|
||||
echo "============Start building kernel============"
|
||||
@@ -1318,25 +1282,6 @@ function build_clean() {
|
||||
recovery)
|
||||
make kernel_clean -C ${SDK_SYSDRV_DIR} SYSDRV_BUILD_RECOVERY=y
|
||||
;;
|
||||
patch)
|
||||
cd ${SDK_ROOT_DIR}
|
||||
make uboot_clean -C ${SDK_SYSDRV_DIR}
|
||||
if [ -f ${SDK_SYSDRV_DIR}/source/.uboot_patch ]; then
|
||||
git apply -R --verbose ${SDK_SYSDRV_DIR}/tools/board/uboot/*.patch
|
||||
rm -rf ${SDK_SYSDRV_DIR}/source/uboot/u-boot/arch/arm/dts/*luckfox*
|
||||
rm -rf ${SDK_SYSDRV_DIR}/source/uboot/u-boot/configs/*luckfox*
|
||||
rm ${SDK_SYSDRV_DIR}/source/.uboot_patch
|
||||
fi
|
||||
|
||||
make kernel_clean -C ${SDK_SYSDRV_DIR}
|
||||
if [ -f ${SDK_SYSDRV_DIR}/source/.kernel_patch ]; then
|
||||
git apply -R --verbose ${SDK_SYSDRV_DIR}/tools/board/kernel/*.patch
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/logo_linux_clut224.ppm ${SDK_SYSDRV_DIR}/source/kernel/drivers/video/logo/logo_linux_clut224.ppm
|
||||
rm -rf ${SDK_SYSDRV_DIR}/source/kernel/arch/arm/configs/*luckfox*
|
||||
rm -rf ${SDK_SYSDRV_DIR}/source/kernel/arch/arm/boot/dts/*luckfox*
|
||||
rm ${SDK_SYSDRV_DIR}/source/.kernel_patch
|
||||
fi
|
||||
;;
|
||||
all)
|
||||
make distclean -C ${SDK_SYSDRV_DIR}
|
||||
make distclean -C ${SDK_MEDIA_DIR}
|
||||
@@ -2212,23 +2157,6 @@ __LINK_DEFCONFIG_FROM_BOARD_CFG() {
|
||||
sudo chmod a+rw $SDK_CONFIG_DIR
|
||||
fi
|
||||
|
||||
if [ ! -f ${SDK_SYSDRV_DIR}/source/.kernel_patch ]; then
|
||||
echo "============Apply Kernel Patch============"
|
||||
cd ${SDK_ROOT_DIR}
|
||||
git apply ${SDK_SYSDRV_DIR}/tools/board/kernel/*.patch
|
||||
if [ $? -eq 0 ]; then
|
||||
msg_info "Patch applied successfully."
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*_defconfig ${KERNEL_PATH}/arch/arm/configs/
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*.config ${KERNEL_PATH}/arch/arm/configs/
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/kernel-drivers-video-logo_linux_clut224.ppm ${KERNEL_PATH}/drivers/video/logo/logo_linux_clut224.ppm
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*.dts ${KERNEL_PATH}/arch/arm/boot/dts
|
||||
cp ${SDK_SYSDRV_DIR}/tools/board/kernel/*.dtsi ${KERNEL_PATH}/arch/arm/boot/dts
|
||||
touch ${SDK_SYSDRV_DIR}/source/.kernel_patch
|
||||
else
|
||||
msg_error "Failed to apply the patch."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$RK_KERNEL_DTS" ]; then
|
||||
rm -f $DTS_CONFIG
|
||||
ln -rfs $SDK_SYSDRV_DIR/source/kernel/arch/arm/boot/dts/$RK_KERNEL_DTS $DTS_CONFIG
|
||||
@@ -2295,7 +2223,9 @@ function build_mkimg() {
|
||||
fs_type="\$${fs_type}"
|
||||
fs_type=$(eval "echo ${fs_type}")
|
||||
|
||||
__RELEASE_FILESYSTEM_FILES $src
|
||||
if [ "$LF_TARGET_ROOTFS" == "buildroot" ] || [ "$LF_TARGT_ROOTFS" == "busybox" ]; then
|
||||
__RELEASE_FILESYSTEM_FILES $src
|
||||
fi
|
||||
|
||||
msg_info "src=$src"
|
||||
msg_info "dst=$dst"
|
||||
|
||||
Reference in New Issue
Block a user