From 1a698978450ae849e358de36977990db5ffc3b7b Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Fri, 11 Sep 2020 15:06:56 +0800 Subject: [PATCH] device/rockchip: update rk3288/rk3399/rk3399pro Signed-off-by: Caesar Wang Change-Id: Ib8a3376a6d60a4212b2286c30566d6fadc8ad087 --- rk3288/BoardConfig-default.mk | 1 + ...fig.mk => BoardConfig-rk3288-evb-rk808.mk} | 0 ...refly.mk => BoardConfig-rk3288-firefly.mk} | 0 rk3288/BoardConfig_8846_debian.mk | 46 ------------------ rk3288/BoardConfig_debian.mk | 46 ------------------ ...6.mk => BoardConfig_rk3288-evb-act8846.mk} | 0 rk3399/BoardConfig-default.mk | 1 + ...k => BoardConfig-rk3399-evb-ind-lpddr4.mk} | 0 .../BoardConfig-rk3399-firefly.mk | 22 +++++---- ... BoardConfig-rk3399-sapphire-excavator.mk} | 4 ++ rk3399/BoardConfig-sapphire-excavator-lp4.mk | 48 +++++++++++++++++++ rk3399pro-npu/parameter-buildroot.txt | 11 ----- rk3399pro/BoardConfig-default.mk | 1 + ...dConfig-rk3399pro_evb_lpd4_v11_v12-usb.mk} | 0 ...k => BoardConfig-rk3399pro_evb_v10-usb.mk} | 4 +- ... BoardConfig-rk3399pro_evb_v11_v12-usb.mk} | 6 +-- .../BoardConfig-rk3399pro_npu-pcie.mk | 0 .../BoardConfig-rk3399pro_npu-usb.mk | 0 ... => BoardConfig_rk3399pro_evb_v13_pcie.mk} | 0 ... BoardConfig_rk3399pro_evb_v14-combine.mk} | 0 .../parameter-npu.txt | 0 21 files changed, 72 insertions(+), 118 deletions(-) create mode 120000 rk3288/BoardConfig-default.mk rename rk3288/{BoardConfig.mk => BoardConfig-rk3288-evb-rk808.mk} (100%) rename rk3288/{BoardConfig_firefly.mk => BoardConfig-rk3288-firefly.mk} (100%) delete mode 100755 rk3288/BoardConfig_8846_debian.mk delete mode 100755 rk3288/BoardConfig_debian.mk rename rk3288/{BoardConfig_8846.mk => BoardConfig_rk3288-evb-act8846.mk} (100%) create mode 120000 rk3399/BoardConfig-default.mk rename rk3399/{BoardConfig.mk => BoardConfig-rk3399-evb-ind-lpddr4.mk} (100%) rename rk3288/BoardConfig_firefly_debian.mk => rk3399/BoardConfig-rk3399-firefly.mk (66%) rename rk3399/{BoardConfig_debian.mk => BoardConfig-rk3399-sapphire-excavator.mk} (89%) create mode 100755 rk3399/BoardConfig-sapphire-excavator-lp4.mk delete mode 100644 rk3399pro-npu/parameter-buildroot.txt create mode 120000 rk3399pro/BoardConfig-default.mk rename rk3399pro/{BoardConfig_rk3399pro_usb.mk => BoardConfig-rk3399pro_evb_lpd4_v11_v12-usb.mk} (100%) rename rk3399pro/{BoardConfig_rk3399pro_combine.mk => BoardConfig-rk3399pro_evb_v10-usb.mk} (92%) rename rk3399pro/{BoardConfig_debian.mk => BoardConfig-rk3399pro_evb_v11_v12-usb.mk} (89%) rename rk3399pro-npu-multi-cam/BoardConfig.mk => rk3399pro/BoardConfig-rk3399pro_npu-pcie.mk (100%) rename rk3399pro-npu/BoardConfig.mk => rk3399pro/BoardConfig-rk3399pro_npu-usb.mk (100%) rename rk3399pro/{BoardConfig_rk3399pro_multi_cam_pcie.mk => BoardConfig_rk3399pro_evb_v13_pcie.mk} (100%) rename rk3399pro/{BoardConfig.mk => BoardConfig_rk3399pro_evb_v14-combine.mk} (100%) rename rk3399pro-npu-multi-cam/parameter-buildroot.txt => rk3399pro/parameter-npu.txt (100%) diff --git a/rk3288/BoardConfig-default.mk b/rk3288/BoardConfig-default.mk new file mode 120000 index 0000000..a45e595 --- /dev/null +++ b/rk3288/BoardConfig-default.mk @@ -0,0 +1 @@ +BoardConfig-rk3288-evb-rk808.mk \ No newline at end of file diff --git a/rk3288/BoardConfig.mk b/rk3288/BoardConfig-rk3288-evb-rk808.mk similarity index 100% rename from rk3288/BoardConfig.mk rename to rk3288/BoardConfig-rk3288-evb-rk808.mk diff --git a/rk3288/BoardConfig_firefly.mk b/rk3288/BoardConfig-rk3288-firefly.mk similarity index 100% rename from rk3288/BoardConfig_firefly.mk rename to rk3288/BoardConfig-rk3288-firefly.mk diff --git a/rk3288/BoardConfig_8846_debian.mk b/rk3288/BoardConfig_8846_debian.mk deleted file mode 100755 index 4f56cb9..0000000 --- a/rk3288/BoardConfig_8846_debian.mk +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Target arch -export RK_ARCH=arm -# Uboot defconfig -export RK_UBOOT_DEFCONFIG=rk3288 -# Kernel defconfig -export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig -# Kernel dts -export RK_KERNEL_DTS=rk3288-evb-act8846 -# boot image type -export RK_BOOT_IMG=zboot.img -# kernel image path -export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage -# parameter for GPT table -export RK_PARAMETER=parameter.txt -# Buildroot config -export RK_CFG_BUILDROOT=rockchip_rk3288 -# Debian 10 config -export RK_DISTRO_DEFCONFIG=rk3288_defconfig -# Recovery config -export RK_CFG_RECOVERY=rockchip_rk3288_recovery -# ramboot config -export RK_CFG_RAMBOOT= -# Pcba config -export RK_CFG_PCBA=rockchip_rk3288_pcba -# Build jobs -export RK_JOBS=12 -# target chip -export RK_TARGET_PRODUCT=rk3288 -# 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 -#choose enable distro module -export RK_DISTRO_MODULE= diff --git a/rk3288/BoardConfig_debian.mk b/rk3288/BoardConfig_debian.mk deleted file mode 100755 index 2863058..0000000 --- a/rk3288/BoardConfig_debian.mk +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Target arch -export RK_ARCH=arm -# Uboot defconfig -export RK_UBOOT_DEFCONFIG=rk3288 -# Kernel defconfig -export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig -# Kernel dts -export RK_KERNEL_DTS=rk3288-evb-rk808-linux -# boot image type -export RK_BOOT_IMG=zboot.img -# kernel image path -export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage -# parameter for GPT table -export RK_PARAMETER=parameter.txt -# Buildroot config -export RK_CFG_BUILDROOT=rockchip_rk3288 -# Debian 10 config -export RK_DISTRO_DEFCONFIG=rk3288_defconfig -# Recovery config -export RK_CFG_RECOVERY=rockchip_rk3288_recovery -# ramboot config -export RK_CFG_RAMBOOT= -# Pcba config -export RK_CFG_PCBA=rockchip_rk3288_pcba -# Build jobs -export RK_JOBS=12 -# target chip -export RK_TARGET_PRODUCT=rk3288 -# 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 -#choose enable distro module -export RK_DISTRO_MODULE= diff --git a/rk3288/BoardConfig_8846.mk b/rk3288/BoardConfig_rk3288-evb-act8846.mk similarity index 100% rename from rk3288/BoardConfig_8846.mk rename to rk3288/BoardConfig_rk3288-evb-act8846.mk diff --git a/rk3399/BoardConfig-default.mk b/rk3399/BoardConfig-default.mk new file mode 120000 index 0000000..7068874 --- /dev/null +++ b/rk3399/BoardConfig-default.mk @@ -0,0 +1 @@ +BoardConfig-rk3399-evb-ind-lpddr4.mk \ No newline at end of file diff --git a/rk3399/BoardConfig.mk b/rk3399/BoardConfig-rk3399-evb-ind-lpddr4.mk similarity index 100% rename from rk3399/BoardConfig.mk rename to rk3399/BoardConfig-rk3399-evb-ind-lpddr4.mk diff --git a/rk3288/BoardConfig_firefly_debian.mk b/rk3399/BoardConfig-rk3399-firefly.mk similarity index 66% rename from rk3288/BoardConfig_firefly_debian.mk rename to rk3399/BoardConfig-rk3399-firefly.mk index 88d5181..8779363 100755 --- a/rk3288/BoardConfig_firefly_debian.mk +++ b/rk3399/BoardConfig-rk3399-firefly.mk @@ -1,35 +1,37 @@ #!/bin/bash # Target arch -export RK_ARCH=arm +export RK_ARCH=arm64 # Uboot defconfig -export RK_UBOOT_DEFCONFIG=rk3288 +export RK_UBOOT_DEFCONFIG=rk3399 # Kernel defconfig export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel dts -export RK_KERNEL_DTS=rk3288-firefly +export RK_KERNEL_DTS=rk3399-firefly-linux # boot image type -export RK_BOOT_IMG=zboot.img +export RK_BOOT_IMG=boot.img # kernel image path -export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage +export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image # parameter for GPT table export RK_PARAMETER=parameter.txt # Buildroot config -export RK_CFG_BUILDROOT=rockchip_rk3288 +export RK_CFG_BUILDROOT=rockchip_rk3399 # Debian 10 config -export RK_DISTRO_DEFCONFIG=rk3288_defconfig +export RK_DISTRO_DEFCONFIG=rk3399_defconfig # Recovery config -export RK_CFG_RECOVERY=rockchip_rk3288_recovery +export RK_CFG_RECOVERY=rockchip_rk3399_recovery # ramboot config export RK_CFG_RAMBOOT= # Pcba config -export RK_CFG_PCBA=rockchip_rk3288_pcba +export RK_CFG_PCBA=rockchip_rk3399_pcba # Build jobs export RK_JOBS=12 # target chip -export RK_TARGET_PRODUCT=rk3288 +export RK_TARGET_PRODUCT=rk3399 # Set rootfs type, including ext2 ext4 squashfs export RK_ROOTFS_TYPE=ext4 +# yocto machine +export RK_YOCTO_MACHINE=rockchip-rk3399-sapphire-excavator # rootfs image path export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE} # Set oem partition type, including ext2 squashfs diff --git a/rk3399/BoardConfig_debian.mk b/rk3399/BoardConfig-rk3399-sapphire-excavator.mk similarity index 89% rename from rk3399/BoardConfig_debian.mk rename to rk3399/BoardConfig-rk3399-sapphire-excavator.mk index 4bdad45..4d6e73f 100755 --- a/rk3399/BoardConfig_debian.mk +++ b/rk3399/BoardConfig-rk3399-sapphire-excavator.mk @@ -16,6 +16,8 @@ export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3399 +# Debian 10 config +export RK_DISTRO_DEFCONFIG=rk3399_defconfig # Recovery config export RK_CFG_RECOVERY=rockchip_rk3399_recovery # ramboot config @@ -28,6 +30,8 @@ export RK_JOBS=12 export RK_TARGET_PRODUCT=rk3399 # Set rootfs type, including ext2 ext4 squashfs export RK_ROOTFS_TYPE=ext4 +# yocto machine +export RK_YOCTO_MACHINE=rockchip-rk3399-sapphire-excavator # rootfs image path export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE} # Set oem partition type, including ext2 squashfs diff --git a/rk3399/BoardConfig-sapphire-excavator-lp4.mk b/rk3399/BoardConfig-sapphire-excavator-lp4.mk new file mode 100755 index 0000000..4b26d9e --- /dev/null +++ b/rk3399/BoardConfig-sapphire-excavator-lp4.mk @@ -0,0 +1,48 @@ +#!/bin/bash + +# Target arch +export RK_ARCH=arm64 +# Uboot defconfig +export RK_UBOOT_DEFCONFIG=rk3399 +# Kernel defconfig +export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig +# Kernel dts +export RK_KERNEL_DTS=rk3399-sapphire-excavator-lp4-linux +# boot image type +export RK_BOOT_IMG=boot.img +# kernel image path +export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image +# parameter for GPT table +export RK_PARAMETER=parameter.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_rk3399 +# Debian 10 config +export RK_DISTRO_DEFCONFIG=rk3399_defconfig +# Recovery config +export RK_CFG_RECOVERY=rockchip_rk3399_recovery +# ramboot config +export RK_CFG_RAMBOOT= +# Pcba config +export RK_CFG_PCBA=rockchip_rk3399_pcba +# Build jobs +export RK_JOBS=12 +# target chip +export RK_TARGET_PRODUCT=rk3399 +# Set rootfs type, including ext2 ext4 squashfs +export RK_ROOTFS_TYPE=ext4 +# yocto machine +export RK_YOCTO_MACHINE=rockchip-rk3399-sapphire-excavator +# 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/rk3399pro-npu/parameter-buildroot.txt b/rk3399pro-npu/parameter-buildroot.txt deleted file mode 100644 index bffa92b..0000000 --- a/rk3399pro-npu/parameter-buildroot.txt +++ /dev/null @@ -1,11 +0,0 @@ -FIRMWARE_VER: 8.1 -MACHINE_MODEL: RK3399PRO_NPU -MACHINE_ID: 007 -MANUFACTURER: RK3399PRO_NPU -MAGIC: 0x5041524B -ATAG: 0x00200800 -MACHINE: 3399pro_npu -CHECK_MASK: 0x80 -PWR_HLD: 0,0,A,0,1 -TYPE: GPT -CMDLINE:mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00002000@0x00006000(trust),0x00002000@0x00008000(misc),0x00008000@0x0000a000(resource),0x00010000@0x00012000(kernel),0x00010000@0x00022000(boot) diff --git a/rk3399pro/BoardConfig-default.mk b/rk3399pro/BoardConfig-default.mk new file mode 120000 index 0000000..1571e2f --- /dev/null +++ b/rk3399pro/BoardConfig-default.mk @@ -0,0 +1 @@ +BoardConfig_rk3399pro_evb_v14-combine.mk \ No newline at end of file diff --git a/rk3399pro/BoardConfig_rk3399pro_usb.mk b/rk3399pro/BoardConfig-rk3399pro_evb_lpd4_v11_v12-usb.mk similarity index 100% rename from rk3399pro/BoardConfig_rk3399pro_usb.mk rename to rk3399pro/BoardConfig-rk3399pro_evb_lpd4_v11_v12-usb.mk diff --git a/rk3399pro/BoardConfig_rk3399pro_combine.mk b/rk3399pro/BoardConfig-rk3399pro_evb_v10-usb.mk similarity index 92% rename from rk3399pro/BoardConfig_rk3399pro_combine.mk rename to rk3399pro/BoardConfig-rk3399pro_evb_v10-usb.mk index b74d1c1..4196875 100755 --- a/rk3399pro/BoardConfig_rk3399pro_combine.mk +++ b/rk3399pro/BoardConfig-rk3399pro_evb_v10-usb.mk @@ -7,7 +7,7 @@ export RK_UBOOT_DEFCONFIG=rk3399pro # Kernel defconfig export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel dts -export RK_KERNEL_DTS=rk3399pro-evb-v14-linux +export RK_KERNEL_DTS=rk3399pro-evb-v10-linux # boot image type export RK_BOOT_IMG=boot.img # kernel image path @@ -15,7 +15,7 @@ export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image # parameter for GPT table export RK_PARAMETER=parameter.txt # Buildroot config -export RK_CFG_BUILDROOT=rockchip_rk3399pro_combine +export RK_CFG_BUILDROOT=rockchip_rk3399pro # Debian 10 config export RK_DISTRO_DEFCONFIG=rk3399pro_defconfig # Recovery config diff --git a/rk3399pro/BoardConfig_debian.mk b/rk3399pro/BoardConfig-rk3399pro_evb_v11_v12-usb.mk similarity index 89% rename from rk3399pro/BoardConfig_debian.mk rename to rk3399pro/BoardConfig-rk3399pro_evb_v11_v12-usb.mk index 1daed8e..b21a91a 100755 --- a/rk3399pro/BoardConfig_debian.mk +++ b/rk3399pro/BoardConfig-rk3399pro_evb_v11_v12-usb.mk @@ -7,7 +7,7 @@ export RK_UBOOT_DEFCONFIG=rk3399pro # Kernel defconfig export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel dts -export RK_KERNEL_DTS=rk3399pro-evb-v14-linux +export RK_KERNEL_DTS=rk3399pro-evb-v11-linux # boot image type export RK_BOOT_IMG=boot.img # kernel image path @@ -15,7 +15,7 @@ export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image # parameter for GPT table export RK_PARAMETER=parameter.txt # Buildroot config -export RK_CFG_BUILDROOT=rockchip_rk3399pro_combine +export RK_CFG_BUILDROOT=rockchip_rk3399pro # Debian 10 config export RK_DISTRO_DEFCONFIG=rk3399pro_defconfig # Recovery config @@ -33,7 +33,7 @@ export RK_ROOTFS_TYPE=ext4 # yocto machine export RK_YOCTO_MACHINE=rockchip-rk3399pro-evb # rootfs image path -export RK_ROOTFS_IMG=debian/linaro-rootfs.img +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 diff --git a/rk3399pro-npu-multi-cam/BoardConfig.mk b/rk3399pro/BoardConfig-rk3399pro_npu-pcie.mk similarity index 100% rename from rk3399pro-npu-multi-cam/BoardConfig.mk rename to rk3399pro/BoardConfig-rk3399pro_npu-pcie.mk diff --git a/rk3399pro-npu/BoardConfig.mk b/rk3399pro/BoardConfig-rk3399pro_npu-usb.mk similarity index 100% rename from rk3399pro-npu/BoardConfig.mk rename to rk3399pro/BoardConfig-rk3399pro_npu-usb.mk diff --git a/rk3399pro/BoardConfig_rk3399pro_multi_cam_pcie.mk b/rk3399pro/BoardConfig_rk3399pro_evb_v13_pcie.mk similarity index 100% rename from rk3399pro/BoardConfig_rk3399pro_multi_cam_pcie.mk rename to rk3399pro/BoardConfig_rk3399pro_evb_v13_pcie.mk diff --git a/rk3399pro/BoardConfig.mk b/rk3399pro/BoardConfig_rk3399pro_evb_v14-combine.mk similarity index 100% rename from rk3399pro/BoardConfig.mk rename to rk3399pro/BoardConfig_rk3399pro_evb_v14-combine.mk diff --git a/rk3399pro-npu-multi-cam/parameter-buildroot.txt b/rk3399pro/parameter-npu.txt similarity index 100% rename from rk3399pro-npu-multi-cam/parameter-buildroot.txt rename to rk3399pro/parameter-npu.txt