Lubancat2/device_rockchip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.ebf.local/rockchip/linux/device_rockchip

Browse Source
This commit is contained in:
hejiawencc
2023-02-27 17:04:32 +08:00
parent 369f83c76b 4d38d21c01
commit 48e5bbcaca
25 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/build.sh
View File

@ -736,6 +736,12 @@ function build_extboot(){
cp ${TOP_DIR}/$RK_KERNEL_IMG $EXTBOOT_DIR/Image-$KERNEL_VERSION
mkdir -p $EXTBOOT_DIR/extlinux
echo -e "label kernel-$KERNEL_VERSION" >> $EXTBOOT_DIR/extlinux/extlinux.conf
echo -e "\tkernel /Image-$KERNEL_VERSION" >> $EXTBOOT_DIR/extlinux/extlinux.conf
echo -e "\tdevicetreedir /" >> $EXTBOOT_DIR/extlinux/extlinux.conf
echo -e "\tappend root=/dev/mmcblk0p3 earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1 switolb=1 coherent_pool=1m" >> $EXTBOOT_DIR/extlinux/extlinux.conf
if [ "$RK_ARCH" == "arm64" ];then
cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/*.dtb $EXTBOOT_DTB
cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/overlay/*.dtbo $EXTBOOT_DTB/overlay
@ -764,7 +770,7 @@ function build_extboot(){
# rm $EXTBOOT_DIR/lib/modules/$KERNEL_VERSION/source
rm -rf $EXTBOOT_IMG && truncate -s 128M $EXTBOOT_IMG
fakeroot mkfs.ext4 -F -L "boot" -d $EXTBOOT_DIR $EXTBOOT_IMG
fakeroot mkfs.ext2 -F -L "boot" -d $EXTBOOT_DIR $EXTBOOT_IMG
# fakeroot mkfs.fat -F 16 -n "boot" $EXTBOOT_IMG
# mkdir -p $EXTBOOT_DIR.tmp
@ -901,7 +907,7 @@ function build_ubuntu(){
ARCH=arm64 ./mk-base-$RK_ROOTFS_TARGET-ubuntu.sh
fi
VERSION=$RK_ROOTFS_DEBUG ARCH=$ARCH SOC=$RK_UBOOT_DEFCONFIG ./mk-$RK_ROOTFS_TARGET-rootfs.sh
VERSION=$RK_ROOTFS_DEBUG ARCH=$ARCH SOC=$RK_SOC ./mk-$RK_ROOTFS_TARGET-rootfs.sh
./mk-image.sh
else
@ -942,7 +948,7 @@ function build_debian(){
RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET ARCH=$ARCH ./mk-base-debian.sh
fi
RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET VERSION=$RK_ROOTFS_DEBUG SOC=$RK_UBOOT_DEFCONFIG ARCH=$ARCH ./mk-rootfs.sh
RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET VERSION=$RK_ROOTFS_DEBUG SOC=$RK_SOC ARCH=$ARCH ./mk-rootfs.sh
./mk-image.sh
else
echo "[ Already Exists IMG, Skip Make Debian Scripts ]"

2
rk356x/BoardConfig-LubanCat-Backup.mk
View File

@ -3,7 +3,7 @@
# Target arch
export RK_ARCH=arm64
# Uboot defconfig
export RK_UBOOT_DEFCONFIG=rk3566
export RK_UBOOT_DEFCONFIG=lubancat-rk356x
# Uboot image format type: fit(flattened image tree)
export RK_UBOOT_FORMAT_TYPE=fit
# Kernel defconfig

4
rk356x/BoardConfig-LubanCat-RK_series-debian-desktop.mk
View File

@ -1,9 +1,11 @@
#!/bin/bash
# SOC
export RK_SOC=rk356x
# Target arch
export RK_ARCH=arm64
# Uboot defconfig
export RK_UBOOT_DEFCONFIG=rk3566
export RK_UBOOT_DEFCONFIG=lubancat-rk356x
# Uboot image format type: fit(flattened image tree)
export RK_UBOOT_FORMAT_TYPE=fit
# Kernel defconfig

4
rk356x/BoardConfig-LubanCat-RK_series-debian-lite.mk
View File

@ -1,9 +1,11 @@
#!/bin/bash
# SOC
export RK_SOC=rk356x
# Target arch
export RK_ARCH=arm64
# Uboot defconfig
export RK_UBOOT_DEFCONFIG=rk3566
export RK_UBOOT_DEFCONFIG=lubancat-rk356x
# Uboot image format type: fit(flattened image tree)
export RK_UBOOT_FORMAT_TYPE=fit
# Kernel defconfig

4
rk356x/BoardConfig-LubanCat-RK_series-ubuntu-desktop.mk
View File

@ -1,9 +1,11 @@
#!/bin/bash
# SOC
export RK_SOC=rk356x
# Target arch
export RK_ARCH=arm64
# Uboot defconfig
export RK_UBOOT_DEFCONFIG=rk3566
export RK_UBOOT_DEFCONFIG=lubancat-rk356x
# Uboot image format type: fit(flattened image tree)
export RK_UBOOT_FORMAT_TYPE=fit
# Kernel defconfig

4
rk356x/BoardConfig-LubanCat-RK_series-ubuntu-lite.mk
View File

@ -1,9 +1,11 @@
#!/bin/bash
# SOC
export RK_SOC=rk356x
# Target arch
export RK_ARCH=arm64
# Uboot defconfig
export RK_UBOOT_DEFCONFIG=rk3566
export RK_UBOOT_DEFCONFIG=lubancat-rk356x
# Uboot image format type: fit(flattened image tree)
export RK_UBOOT_FORMAT_TYPE=fit
# Kernel defconfig

2
rk356x/BoardConfig-LubanCat-Zero-buildroot.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat-zero
export RK_KERNEL_DTS=rk3566-lubancat-0
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat-Zero-debian.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat-zero
export RK_KERNEL_DTS=rk3566-lubancat-0
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat-zero
export RK_KERNEL_DTS=rk3566-lubancat-0
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat1-buildroot.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat1
export RK_KERNEL_DTS=rk3566-lubancat-1
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat1-debian.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat1
export RK_KERNEL_DTS=rk3566-lubancat-1
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat1-ubuntu.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat1
export RK_KERNEL_DTS=rk3566-lubancat-1
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat1N-buildroot.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat1-n
export RK_KERNEL_DTS=rk3566-lubancat-1n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat1N-debian.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat1-n
export RK_KERNEL_DTS=rk3566-lubancat-1n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat1N-ubuntu.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3566-lubancat1-n
export RK_KERNEL_DTS=rk3566-lubancat-1n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2-buildroot.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_buildroot_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2
export RK_KERNEL_DTS=rk3568-lubancat-2
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2-debian.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2
export RK_KERNEL_DTS=rk3568-lubancat-2
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2-ubuntu.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2
export RK_KERNEL_DTS=rk3568-lubancat-2
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2IO-buildroot.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_buildroot_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-io
export RK_KERNEL_DTS=rk3568-lubancat-2io
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2IO-debian.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-io
export RK_KERNEL_DTS=rk3568-lubancat-2io
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2IO-ububtu.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-io
export RK_KERNEL_DTS=rk3568-lubancat-2io
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2N-buildroot.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_buildroot_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-n
export RK_KERNEL_DTS=rk3568-lubancat-2n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2N-debian.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-n
export RK_KERNEL_DTS=rk3568-lubancat-2n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

2
rk356x/BoardConfig-LubanCat2N-openwrt.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_openwrt_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-n
export RK_KERNEL_DTS=rk3568-lubancat-2n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path

4
rk356x/BoardConfig-LubanCat2N-ubuntu.mk
View File

@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
# Kernel defconfig fragment
export RK_KERNEL_DEFCONFIG_FRAGMENT=
# Kernel dts
export RK_KERNEL_DTS=rk3568-lubancat2-n
export RK_KERNEL_DTS=rk3568-lubancat-2n
# boot image type
export RK_BOOT_IMG=boot.img
# kernel image path
@ -53,7 +53,7 @@ export RK_OEM_DIR=oem_normal
#userdata config
export RK_USERDATA_DIR=userdata_normal
#misc image
export RK_MISC=parameter-buildroot-fit.txt
export RK_MISC=wipe_all-misc.img
#choose enable distro module
export RK_DISTRO_MODULE=
# Define pre-build script for this board