diff --git a/common/post-build.sh b/common/post-build.sh index 34af1be..0129867 100755 --- a/common/post-build.sh +++ b/common/post-build.sh @@ -77,8 +77,8 @@ function fixup_fstab() ${TARGET_DIR}/etc/fstab if echo $TARGET_DIR | grep -qE "_recovery/target/*$"; then - fixup_part "/dev/sda1:/mnt/usb_storage:vfat:defaults::" - fixup_part "/dev/mmcblk1p1:/mnt/external_sd:vfat:defaults::" + fixup_part "/dev/sda1:/mnt/udisk:auto:defaults::" + fixup_part "/dev/mmcblk1p1:/mnt/sdcard:auto:defaults::" fi for part in ${RK_EXTRA_PARTITIONS//@/ }; do @@ -101,10 +101,12 @@ function add_dirs_and_links() echo "Adding dirs and links..." cd ${TARGET_DIR} - mkdir -p mnt/sdcard mnt/usb0 - ln -sf mnt/usb0 mnt/usb_storage - ln -sf mnt/sdcard mnt/external_sd - ln -sf mnt/usb0 udisk + + rm -rf mnt/* udisk sdcard data + mkdir -p mnt/sdcard mnt/udisk + ln -sf udisk mnt/usb_storage + ln -sf sdcard mnt/external_sd + ln -sf mnt/udisk udisk ln -sf mnt/sdcard sdcard ln -sf userdata data } diff --git a/oem/oem_ipc/sysconfig-1080P.db b/oem/oem_ipc/sysconfig-1080P.db index 5c63597..0063292 100644 Binary files a/oem/oem_ipc/sysconfig-1080P.db and b/oem/oem_ipc/sysconfig-1080P.db differ diff --git a/oem/oem_ipc/sysconfig-2K.db b/oem/oem_ipc/sysconfig-2K.db index 5c917da..c29881d 100644 Binary files a/oem/oem_ipc/sysconfig-2K.db and b/oem/oem_ipc/sysconfig-2K.db differ diff --git a/oem/oem_ipc/sysconfig-4K.db b/oem/oem_ipc/sysconfig-4K.db index 8950e37..ac4b583 100644 Binary files a/oem/oem_ipc/sysconfig-4K.db and b/oem/oem_ipc/sysconfig-4K.db differ diff --git a/oem/oem_ipc/sysconfig-5M.db b/oem/oem_ipc/sysconfig-5M.db index 0b255a4..13bfd22 100644 Binary files a/oem/oem_ipc/sysconfig-5M.db and b/oem/oem_ipc/sysconfig-5M.db differ diff --git a/px30/BoardConfig-px30-evb-ddr4-v10-32bit.mk b/px30/BoardConfig-px30-evb-ddr4-v10-32bit.mk new file mode 100755 index 0000000..2431792 --- /dev/null +++ b/px30/BoardConfig-px30-evb-ddr4-v10-32bit.mk @@ -0,0 +1,53 @@ +#!/bin/bash + +# Target arch +export RK_ARCH=arm64 +# Uboot defconfig +export RK_UBOOT_DEFCONFIG=px30 +# Trust choose ignore bl32, including --ignore-bl32 +export TRUST_PACK_IGNORE_BL32= +# Kernel defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel dts +export RK_KERNEL_DTS=px30-evb-ddr4-v10-linux +# boot image type +export RK_BOOT_IMG=zboot.img +# kernel image path +export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image +export RK_KERNEL_ZIMG=kernel/arch/arm64/boot/Image.lz4 +# parameter for GPT table +export RK_PARAMETER=parameter.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_px30_32 +# Debian 10 config +export RK_DISTRO_DEFCONFIG=px30_defconfig +# Recovery config +export RK_CFG_RECOVERY=rockchip_px30_recovery +# ramboot config +export RK_CFG_RAMBOOT= +# Pcba config +export RK_CFG_PCBA=rockchip_px30_pcba +# Build jobs +export RK_JOBS=12 +# target chip +export RK_TARGET_PRODUCT=px30 +# Set rootfs type, including ext2 ext4 squashfs +export RK_ROOTFS_TYPE=ext4 +# Set debian version (debian10: buster, debian11: bullseye) +export RK_DEBIAN_VERSION=buster +# yocto machine +export RK_YOCTO_MACHINE=rockchip-px30-evb +# rootfs image path +export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE} +# Set oem partition type, including ext2 squashfs +export RK_OEM_FS_TYPE=ext2 +# Set userdata partition type, including ext2, fat +export RK_USERDATA_FS_TYPE=ext2 +#OEM config +export RK_OEM_DIR=oem_normal +#userdata config +export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/px30/BoardConfig-px30-evb-ddr4-v10.mk b/px30/BoardConfig-px30-evb-ddr4-v10.mk new file mode 100755 index 0000000..84044ac --- /dev/null +++ b/px30/BoardConfig-px30-evb-ddr4-v10.mk @@ -0,0 +1,53 @@ +#!/bin/bash + +# Target arch +export RK_ARCH=arm64 +# Uboot defconfig +export RK_UBOOT_DEFCONFIG=px30 +# Trust choose ignore bl32, including --ignore-bl32 +export TRUST_PACK_IGNORE_BL32= +# Kernel defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel dts +export RK_KERNEL_DTS=px30-evb-ddr4-v10-linux +# boot image type +export RK_BOOT_IMG=zboot.img +# kernel image path +export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image +export RK_KERNEL_ZIMG=kernel/arch/arm64/boot/Image.lz4 +# parameter for GPT table +export RK_PARAMETER=parameter.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_px30_64 +# Debian 10 config +export RK_DISTRO_DEFCONFIG=px30_defconfig +# Recovery config +export RK_CFG_RECOVERY=rockchip_px30_recovery +# ramboot config +export RK_CFG_RAMBOOT= +# Pcba config +export RK_CFG_PCBA=rockchip_px30_pcba +# Build jobs +export RK_JOBS=12 +# target chip +export RK_TARGET_PRODUCT=px30 +# Set rootfs type, including ext2 ext4 squashfs +export RK_ROOTFS_TYPE=ext4 +# Set debian version (debian10: buster, debian11: bullseye) +export RK_DEBIAN_VERSION=buster +# yocto machine +export RK_YOCTO_MACHINE=rockchip-px30-evb +# rootfs image path +export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE} +# Set oem partition type, including ext2 squashfs +export RK_OEM_FS_TYPE=ext2 +# Set userdata partition type, including ext2, fat +export RK_USERDATA_FS_TYPE=ext2 +#OEM config +export RK_OEM_DIR=oem_normal +#userdata config +export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk b/rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk index 6e0be6d..3973dc7 100755 --- a/rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk +++ b/rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk @@ -7,7 +7,9 @@ export RK_UBOOT_DEFCONFIG=rk3326 # Trust choose ignore bl32, including --ignore-bl32 export TRUST_PACK_IGNORE_BL32= # Kernel defconfig -export RK_KERNEL_DEFCONFIG=rk3326_linux_defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3326_linux.config # Kernel dts export RK_KERNEL_DTS=rk3326-evb-lp3-v10-linux # boot image type diff --git a/rk3326/BoardConfig-rk3326-evb-lp3-v10.mk b/rk3326/BoardConfig-rk3326-evb-lp3-v10.mk index 87d214a..506be26 100755 --- a/rk3326/BoardConfig-rk3326-evb-lp3-v10.mk +++ b/rk3326/BoardConfig-rk3326-evb-lp3-v10.mk @@ -7,7 +7,9 @@ export RK_UBOOT_DEFCONFIG=rk3326 # Trust choose ignore bl32, including --ignore-bl32 export TRUST_PACK_IGNORE_BL32= # Kernel defconfig -export RK_KERNEL_DEFCONFIG=rk3326_linux_defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3326_linux.config # Kernel dts export RK_KERNEL_DTS=rk3326-evb-lp3-v10-linux # boot image type diff --git a/rk3326/BoardConfig-rk3326-evb-lp3-v12-32bit.mk b/rk3326/BoardConfig-rk3326-evb-lp3-v12-32bit.mk index a368f68..ed3e93e 100755 --- a/rk3326/BoardConfig-rk3326-evb-lp3-v12-32bit.mk +++ b/rk3326/BoardConfig-rk3326-evb-lp3-v12-32bit.mk @@ -7,7 +7,9 @@ export RK_UBOOT_DEFCONFIG=rk3326 # Trust choose ignore bl32, including --ignore-bl32 export TRUST_PACK_IGNORE_BL32= # Kernel defconfig -export RK_KERNEL_DEFCONFIG=rk3326_linux_defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3326_linux.config # Kernel dts export RK_KERNEL_DTS=rk3326-evb-lp3-v12-linux # boot image type diff --git a/rk3326/BoardConfig-rk3326-evb-lp3-v12.mk b/rk3326/BoardConfig-rk3326-evb-lp3-v12.mk index 4b87d55..8c422f2 100755 --- a/rk3326/BoardConfig-rk3326-evb-lp3-v12.mk +++ b/rk3326/BoardConfig-rk3326-evb-lp3-v12.mk @@ -7,7 +7,9 @@ export RK_UBOOT_DEFCONFIG=rk3326 # Trust choose ignore bl32, including --ignore-bl32 export TRUST_PACK_IGNORE_BL32= # Kernel defconfig -export RK_KERNEL_DEFCONFIG=rk3326_linux_defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3326_linux.config # Kernel dts export RK_KERNEL_DTS=rk3326-evb-lp3-v12-linux # boot image type diff --git a/rk3358/BoardConfig-rk3358-evb-ddr3-v10.mk b/rk3358/BoardConfig-rk3358-evb-ddr3-v10.mk index 4dca331..61a15f4 100755 --- a/rk3358/BoardConfig-rk3358-evb-ddr3-v10.mk +++ b/rk3358/BoardConfig-rk3358-evb-ddr3-v10.mk @@ -7,11 +7,13 @@ export RK_UBOOT_DEFCONFIG=evb-px30 # Trust choose ignore bl32, including --ignore-bl32 export TRUST_PACK_IGNORE_BL32= # Kernel defconfig -export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3358_linux.config # Kernel dts export RK_KERNEL_DTS=rk3358-evb-ddr3-v10-linux # boot image type -export RK_BOOT_IMG=boot.img +export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image export RK_KERNEL_ZIMG=kernel/arch/arm64/boot/Image.lz4 diff --git a/rk3358/BoardConfig-rk3358m-vehicle-ddr3.mk b/rk3358/BoardConfig-rk3358m-vehicle-ddr3.mk new file mode 100755 index 0000000..8974bdf --- /dev/null +++ b/rk3358/BoardConfig-rk3358m-vehicle-ddr3.mk @@ -0,0 +1,47 @@ +#!/bin/bash + +# Target arch +export RK_ARCH=arm64 +# Uboot defconfig +export RK_UBOOT_DEFCONFIG=evb-px30 +# Trust choose ignore bl32, including --ignore-bl32 +export TRUST_PACK_IGNORE_BL32= +# Kernel defconfig +export RK_KERNEL_DEFCONFIG=px30_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3358_linux.config +# Kernel dts +export RK_KERNEL_DTS=rk3358m-vehicle-v10 +# boot image type +export RK_BOOT_IMG=zboot.img +# kernel image path +export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image +export RK_KERNEL_ZIMG=kernel/arch/arm64/boot/Image.lz4 +# parameter for GPT table +export RK_PARAMETER=parameter.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_rk3358 +# Recovery config +export RK_CFG_RECOVERY=rockchip_rk3358_recovery +# ramboot config +export RK_CFG_RAMBOOT= +# Pcba config +export RK_CFG_PCBA=rockchip_px30_pcba +# Build jobs +export RK_JOBS=12 +# target chip +export RK_TARGET_PRODUCT=rk3358 +# Set rootfs type, including ext2 ext4 squashfs +export RK_ROOTFS_TYPE=ext4 +# rootfs image path +export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE} +# Set oem partition type, including ext2 squashfs +export RK_OEM_FS_TYPE=ext2 +# Set userdata partition type, including ext2, fat +export RK_USERDATA_FS_TYPE=ext2 +#OEM config +export RK_OEM_DIR=oem_normal +#userdata config +export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img