From 5ffa97b6d924dbb1baa6ba7a2b0cdf79963887eb Mon Sep 17 00:00:00 2001
From: Caesar Wang <wxt@rock-chips.com>
Date: Thu, 3 Dec 2020 06:19:46 +0000
Subject: [PATCH] rk3326: update configure

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Icc31b332af1ff8c07e4f67c50375d5abb2e45e31
---
 ...> BoardConfig-rk3326-evb-lp3-v10-32bit.mk} |  4 ++
 ...bot64.mk => BoardConfig-rk3326-robot64.mk} |  0
 ...k => BoardConfig-rk3326-robot64_no_gpu.mk} |  0
 rk3326/BoardConfig.mk                         | 52 +------------------
 rk3326/parameter-robot.txt                    |  2 +-
 rk3326/parameter.txt                          |  2 +-
 6 files changed, 7 insertions(+), 53 deletions(-)
 rename rk3326/{BoardConfig_32bit.mk => BoardConfig-rk3326-evb-lp3-v10-32bit.mk} (91%)
 rename rk3326/{BoardConfig_robot64.mk => BoardConfig-rk3326-robot64.mk} (100%)
 rename rk3326/{BoardConfig_robot64_no_gpu.mk => BoardConfig-rk3326-robot64_no_gpu.mk} (100%)
 mode change 100755 => 120000 rk3326/BoardConfig.mk

diff --git a/rk3326/BoardConfig_32bit.mk b/rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk
similarity index 91%
rename from rk3326/BoardConfig_32bit.mk
rename to rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk
index f3281f0..f1ba78a 100755
--- a/rk3326/BoardConfig_32bit.mk
+++ b/rk3326/BoardConfig-rk3326-evb-lp3-v10-32bit.mk
@@ -19,6 +19,8 @@ export RK_KERNEL_ZIMG=kernel/arch/arm64/boot/Image.lz4
 export RK_PARAMETER=parameter.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3326_32
+# Debian 10 config
+export RK_DISTRO_DEFCONFIG=rk3326_defconfig
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk3326_recovery
 # ramboot config
@@ -31,6 +33,8 @@ export RK_JOBS=12
 export RK_TARGET_PRODUCT=rk3326
 # Set rootfs type, including ext2 ext4 squashfs
 export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3326-evb
 # rootfs image path
 export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 # Set oem partition type, including ext2 squashfs
diff --git a/rk3326/BoardConfig_robot64.mk b/rk3326/BoardConfig-rk3326-robot64.mk
similarity index 100%
rename from rk3326/BoardConfig_robot64.mk
rename to rk3326/BoardConfig-rk3326-robot64.mk
diff --git a/rk3326/BoardConfig_robot64_no_gpu.mk b/rk3326/BoardConfig-rk3326-robot64_no_gpu.mk
similarity index 100%
rename from rk3326/BoardConfig_robot64_no_gpu.mk
rename to rk3326/BoardConfig-rk3326-robot64_no_gpu.mk
diff --git a/rk3326/BoardConfig.mk b/rk3326/BoardConfig.mk
deleted file mode 100755
index 7fd2c63..0000000
--- a/rk3326/BoardConfig.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Target arch
-export RK_ARCH=arm64
-# Uboot defconfig
-export RK_UBOOT_DEFCONFIG=evb-rk3326
-# Trust choose ignore bl32, including --ignore-bl32
-export TRUST_PACK_IGNORE_BL32=
-# Kernel defconfig
-export RK_KERNEL_DEFCONFIG=rk3326_linux_defconfig
-# Kernel dts
-export RK_KERNEL_DTS=rk3326-evb-lp3-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_rk3326_64
-# Debian 10 config
-export RK_DISTRO_DEFCONFIG=rk3326_defconfig
-# Recovery config
-export RK_CFG_RECOVERY=rockchip_rk3326_recovery
-# ramboot config
-export RK_CFG_RAMBOOT=
-# Pcba config
-export RK_CFG_PCBA=rockchip_rk3326_pcba
-# Build jobs
-export RK_JOBS=12
-# target chip
-export RK_TARGET_PRODUCT=rk3326
-# Set rootfs type, including ext2 ext4 squashfs
-export RK_ROOTFS_TYPE=ext4
-# yocto machine
-export RK_YOCTO_MACHINE=rockchip-rk3326-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.mk b/rk3326/BoardConfig.mk
new file mode 120000
index 0000000..100406c
--- /dev/null
+++ b/rk3326/BoardConfig.mk
@@ -0,0 +1 @@
+BoardConfig-rk3326-evb-lp3-v10.mk
\ No newline at end of file
diff --git a/rk3326/parameter-robot.txt b/rk3326/parameter-robot.txt
index 629f97a..5c5447d 100644
--- a/rk3326/parameter-robot.txt
+++ b/rk3326/parameter-robot.txt
@@ -1,4 +1,4 @@
-FIRMWARE_VER: 8.1
+FIRMWARE_VER: 1.4.0
 MACHINE_MODEL: PX30
 MACHINE_ID: 007
 MANUFACTURER: PX30
diff --git a/rk3326/parameter.txt b/rk3326/parameter.txt
index fb81c9a..0aa698c 100644
--- a/rk3326/parameter.txt
+++ b/rk3326/parameter.txt
@@ -1,4 +1,4 @@
-FIRMWARE_VER: 8.1
+FIRMWARE_VER: 1.4.0
 MACHINE_MODEL: PX30
 MACHINE_ID: 007
 MANUFACTURER: PX30