export the variable in BoardConfig and add prefix to these variable

we need the make these variable to be environment variable. that will
allow us to use these variable in Makefile.
ie. we need to know the oem and userdata file system type when we
mount it. and that is defined in BoardConifg

Change-Id: I1c816214c60aba4761c34ad8b3d8f5611f81cfbb
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
This commit is contained in:
Eddie Cai
2018-08-17 17:33:42 +08:00
parent b45dc3ac46
commit bd9781f339
34 changed files with 365 additions and 436 deletions

View File

@ -1,40 +1,34 @@
#!/bin/bash
#=========================
# Compile Config
#=========================
# Target arch
ARCH=arm
export RK_ARCH=arm
# Uboot defconfig
UBOOT_DEFCONFIG=kylin-rk3036
export RK_UBOOT_DEFCONFIG=kylin-rk3036
# Kernel defconfig
KERNEL_DEFCONFIG=rockchip_linux_defconfig
export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig
# Kernel dts
KERNEL_DTS=rk3036-kylin
export RK_KERNEL_DTS=rk3036-kylin
# boot image type
export RK_BOOT_IMG=zboot.img
# Buildroot config
CFG_BUILDROOT=rockchip_rk3036
export RK_CFG_BUILDROOT=rockchip_rk3036
# Recovery config
CFG_RECOVERY=rockchip_rk3036_recovery
export RK_CFG_RECOVERY=rockchip_rk3036_recovery
# Pcba config
CFG_PCBA=rockchip_rk3036_pcba
export RK_CFG_PCBA=rockchip_rk3036_pcba
# Build jobs
JOBS=12
#=========================
# Platform Target
#=========================
TARGET_PRODUCT=rk3036
# Set rootfs type, see buildroot.
# ext4 squashfs
ROOTFS_TYPE=ext4
# Set data partition type.
# ext2 squashfs
OEM_PARTITION_TYPE=ext2
# Set flash type.
# support <emmc, nand, spi_nand, spi_nor>
FLASH_TYPE=emmc
export RK_JOBS=12
# target chip
export RK_TARGET_PRODUCT=rk3036
# Set rootfs type, including ext2 ext4 squashfs
export RK_ROOTFS_TYPE=ext4
# 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
# Set flash type. support <emmc, nand, spi_nand, spi_nor>
export RK_STORAGE_TYPE=emmc
#OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD/smart_voice
OEM_PATH=oem
export RK_OEM_DIR=oem_normal
#userdata config
export RK_USERDATA_DIR=userdata_normal

View File

@ -15,14 +15,14 @@ ROCKDEV=$TOP_DIR/rockdev
ROOTFS_PATH=$(pwd)/rootfs
PARAMETER_DEBIAN=$TOP_DIR/$DEVICE_DIR/parameter-debian.txt
PARAMETER_BUILDROOT=$TOP_DIR/$DEVICE_DIR/parameter-buildroot.txt
OEM_DIR=$TOP_DIR/device/rockchip/oem/oem_normal
USER_DATA_DIR=$TOP_DIR/device/rockchip/userdata/userdata_normal
OEM_DIR=$TOP_DIR/device/rockchip/oem/$RK_OEM_DIR
USER_DATA_DIR=$TOP_DIR/device/rockchip/userdata/$RK_USERDATA_DIR
MISC_IMG=$TOP_DIR/device/rockchip/rockimg/wipe_all-misc.img
BUILDROOT_IMG=$TOP_DIR/buildroot/output/$CFG_BUILDROOT/images/rootfs.ext4
RECOVERY_IMG=$TOP_DIR/buildroot/output/$CFG_RECOVERY/images/recovery.img
BUILDROOT_IMG=$TOP_DIR/buildroot/output/$RK_CFG_BUILDROOT/images/rootfs.$RK_ROOTFS_TYPE
RECOVERY_IMG=$TOP_DIR/buildroot/output/$RK_CFG_RECOVERY/images/recovery.img
TRUST_IMG=$TOP_DIR/u-boot/trust.img
UBOOT_IMG=$TOP_DIR/u-boot/uboot.img
BOOT_IMG=$TOP_DIR/kernel/boot.img
BOOT_IMG=$TOP_DIR/kernel/$RK_BOOT_IMG
LOADER=$TOP_DIR/u-boot/*_loader_v*.bin
#SPINOR_LOADER=$TOP_DIR/u-boot/*_loader_spinor_v*.bin
MKOEM=$TOP_DIR/device/rockchip/common/mk-oem.sh

View File

@ -1,3 +1,4 @@
#!/bin/bash
UPGRADETOOL=$(pwd)/tools/linux/Linux_Upgrade_Tool/Linux_Upgrade_Tool/upgrade_tool
ROCKDEV_DIR=$(pwd)/rockdev
@ -22,7 +23,7 @@ fi
if [ $FLASH_TYPE = all ]
then
sudo $UPGRADETOOL ul $LOADER
sudo $UPGRADETOOL ul $LOADER
sudo $UPGRADETOOL di -p $PARAMETER
sudo $UPGRADETOOL di -uboot $UBOOT
sudo $UPGRADETOOL di -trust $TRUST
@ -37,6 +38,7 @@ fi
if [ $FLASH_TYPE = loader ]
then
sudo $UPGRADETOOL ul $LOADER
exit 0
fi
if [ $FLASH_TYPE = parameter ]