From 048c894b04310755241306d714e2e19302a15e0b Mon Sep 17 00:00:00 2001 From: Eddie Cai Date: Tue, 3 Jul 2018 17:50:49 +0800 Subject: [PATCH] rk3308: remove unused script Change-Id: If64104a741994da2206cc6158b21e0ba540cb5cc Signed-off-by: Eddie Cai --- rk3308/mk-buildroot.sh | 28 ------ rk3308/mk-pcba.sh | 52 ------------ rk3308/mk-recovery.sh | 55 ------------ rk3308/mk-yocto.sh | 23 ----- rk3308/mkfirmware.sh.bak | 141 ------------------------------- rk3308/script_bak/BoardConfig.mk | 42 --------- rk3308/script_bak/build_all.sh | 18 ---- rk3308/script_bak/mk-kernel.sh | 20 ----- rk3308/script_bak/mk-oem.sh | 43 ---------- rk3308/script_bak/mk-rootfs.sh | 28 ------ rk3308/script_bak/mk-uboot.sh | 20 ----- rk3308/script_bak/mke2img.sh | 7 -- 12 files changed, 477 deletions(-) delete mode 100755 rk3308/mk-buildroot.sh delete mode 100755 rk3308/mk-pcba.sh delete mode 100755 rk3308/mk-recovery.sh delete mode 100755 rk3308/mk-yocto.sh delete mode 100755 rk3308/mkfirmware.sh.bak delete mode 100755 rk3308/script_bak/BoardConfig.mk delete mode 100755 rk3308/script_bak/build_all.sh delete mode 100755 rk3308/script_bak/mk-kernel.sh delete mode 100755 rk3308/script_bak/mk-oem.sh delete mode 100755 rk3308/script_bak/mk-rootfs.sh delete mode 100755 rk3308/script_bak/mk-uboot.sh delete mode 100755 rk3308/script_bak/mke2img.sh diff --git a/rk3308/mk-buildroot.sh b/rk3308/mk-buildroot.sh deleted file mode 100755 index 4bed61b..0000000 --- a/rk3308/mk-buildroot.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -source $TOP_DIR/BoardConfig.mk -echo "buildroot config: $CFG_BUILDROOT" - -source $TOP_DIR/buildroot/build/envsetup.sh $CFG_BUILDROOT -BUILD_CONFIG=`get_defconfig_name` -echo "$BUILD_CONFIG" -ROOTFS_IMAGE=$TOP_DIR/buildroot/output/$BUILD_CONFIG/images/rootfs.img -# build rootfs -echo "====Start build rootfs====" -make -if [ $? -eq 0 ]; then - echo "====Build rootfs ok!====" -else - echo "====Build rootfs failed!====" - exit 1 -fi diff --git a/rk3308/mk-pcba.sh b/rk3308/mk-pcba.sh deleted file mode 100755 index 845f4f6..0000000 --- a/rk3308/mk-pcba.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -source $TOP_DIR/BoardConfig.mk -echo "pcba config: $CFG_PCBA" - -KERNEL_IMAGE=$TOP_DIR/kernel/arch/arm64/boot/Image -KERNEL_DTB=$TOP_DIR/kernel/resource.img -MK_KERNEL=$DEVICE_DIR/mk-kernel.sh - -source $TOP_DIR/buildroot/build/envsetup.sh $CFG_PCBA -BUILD_CONFIG=`get_defconfig_name` -echo "$BUILD_CONFIG" - -RAMDISK_IMAGE=$TOP_DIR/buildroot/output/$BUILD_CONFIG/images/rootfs.cpio -PCBA_IMAGE=$TOP_DIR/buildroot/output/$BUILD_CONFIG/images/pcba.img -# build kernel -if [ -f $KERNEL_IMAGE ] -then - echo "found kernel image" -else - echo "kernel image doesn't exist, now build kernel image" - $MK_KERNEL - if [ $? -eq 0 ]; then - echo "build kernel done" - else - exit 1 - fi -fi - -# build recovery -echo "====Start build pcba====" -make -if [ $? -eq 0 ]; then - echo "====Build pcba ok!====" -else - echo "====Build pcba failed!====" - exit 1 -fi - -echo -n "pack pcba image..." -$TOP_DIR/kernel/scripts/mkbootimg --kernel $KERNEL_IMAGE --ramdisk $RAMDISK_IMAGE --second $KERNEL_DTB -o $PCBA_IMAGE -echo "done." diff --git a/rk3308/mk-recovery.sh b/rk3308/mk-recovery.sh deleted file mode 100755 index f8b7467..0000000 --- a/rk3308/mk-recovery.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -source $TOP_DIR/BoardConfig.mk -echo "recovery config: $CFG_RECOVERY" -if [ $ARCH == arm64 ];then -KERNEL_IMAGE=$TOP_DIR/kernel/arch/arm64/boot/Image -elif [ $ARCH == arm ];then -KERNEL_IMAGE=$TOP_DIR/kernel/arch/arm/boot/zImage -fi -KERNEL_DTB=$TOP_DIR/kernel/resource.img -MK_KERNEL=$DEVICE_DIR/mk-kernel.sh - -source $TOP_DIR/buildroot/build/envsetup.sh $CFG_RECOVERY -BUILD_CONFIG=`get_defconfig_name` -echo "$BUILD_CONFIG" - -RAMDISK_IMAGE=$TOP_DIR/buildroot/output/$BUILD_CONFIG/images/rootfs.cpio.gz -RECOVERY_IMAGE=$TOP_DIR/buildroot/output/$BUILD_CONFIG/images/recovery.img -# build kernel -if [ -f $KERNEL_IMAGE ] -then - echo "found kernel image" -else - echo "kernel image doesn't exist, now build kernel image" - $MK_KERNEL - if [ $? -eq 0 ]; then - echo "build kernel done" - else - exit 1 - fi -fi - -# build recovery -echo "====Start build recovery====" -make -if [ $? -eq 0 ]; then - echo "====Build recovery ok!====" -else - echo "====Build recovery failed!====" - exit 1 -fi - -echo -n "pack recovery image..." -$TOP_DIR/kernel/scripts/mkbootimg --kernel $KERNEL_IMAGE --ramdisk $RAMDISK_IMAGE --second $KERNEL_DTB -o $RECOVERY_IMAGE -echo "done." diff --git a/rk3308/mk-yocto.sh b/rk3308/mk-yocto.sh deleted file mode 100755 index 40486f5..0000000 --- a/rk3308/mk-yocto.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) -CONF_PATH=$TOP_DIR/device/rockchip/rk3308/yocto/build/conf - -cd $TOP_DIR/kernel -git branch master 1>/dev/null 2>/dev/null -cd $TOP_DIR/yocto -. oe-init-build-env -cp $CONF_PATH/bblayers.conf $TOP_DIR/yocto/build/conf/ -cp $CONF_PATH/local.conf $TOP_DIR/yocto/build/conf/ -bitbake core-image-ros-roscore -c do_image_ext4 -rm -f $TOP_DIR/yocto/rootfs.img -ln -s $TOP_DIR/yocto/build/tmp/work/rockchip_rk3308_evb-poky-linux/core-image-ros-roscore/1.0-r0/deploy-core-image-ros-roscore-image-complete/core-image-ros-roscore-rockchip-rk3308-evb.ext4 $TOP_DIR/yocto/rootfs.img - diff --git a/rk3308/mkfirmware.sh.bak b/rk3308/mkfirmware.sh.bak deleted file mode 100755 index 222625d..0000000 --- a/rk3308/mkfirmware.sh.bak +++ /dev/null @@ -1,141 +0,0 @@ -#! /bin/bash -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -CFG_BUILDROOT=`sed -n '/CFG_BUILDROOT.*:=/p' $DEVICE_DIR/BoardConfig.mk | grep -v "^#"` -CFG_BUILDROOT=${CFG_BUILDROOT##*=} -CFG_BUILDROOT=${CFG_BUILDROOT%%#*} -CFG_BUILDROOT="`echo ${CFG_BUILDROOT}|tr -s ' '`" -echo "buildroot config: $CFG_BUILDROOT" - -CFG_RECOVERY=`sed -n '/CFG_RECOVERY.*:=/p' $DEVICE_DIR/BoardConfig.mk | grep -v "^#"` -CFG_RECOVERY=${CFG_RECOVERY##*=} -CFG_RECOVERY=${CFG_RECOVERY%%#*} -CFG_RECOVERY="`echo ${CFG_RECOVERY}|tr -s ' '`" -echo "recovery config: $CFG_RECOVERY" - -CFG_PCBA=`sed -n '/CFG_PCBA.*:=/p' $DEVICE_DIR/BoardConfig.mk | grep -v "^#"` -CFG_PCBA=${CFG_PCBA##*=} -CFG_PCBA=${CFG_PCBA%%#*} -CFG_PCBA="`echo ${CFG_PCBA}|tr -s ' '`" -echo "pcba config: $CFG_PCBA" - -ROCKDEV=$TOP_DIR/rockdev -KERNEL=$TOP_DIR/kernel -DEBIAN=$TOP_DIR/rootfs -YOCTO=$TOP_DIR/yocto -UBOOT=$TOP_DIR/u-boot -BUILDROOT=$TOP_DIR/buildroot -OEM_DIR=$DEVICE_DIR/oem -# oem image fs type, support ext2 squashfs -OEM_TYPE=ext2 -ROCKIMG=$DEVICE_DIR/rockimg -PARAMETER=$ROCKIMG/gpt-nand-aispeech.txt -USERDATA_IMG=$ROCKIMG/userdata.img -MISC_IMG=$ROCKIMG/misc.img -ROOTFS_IMG_BUILDROOT=$BUILDROOT/output/$CFG_BUILDROOT/images/rootfs.squashfs -ROOTFS_IMG_DEBIAN=$DEBIAN/linaro-rootfs.img -ROOTFS_IMG_YOCTO=$YOCTO/rootfs.img -RECOVERY_IMG=$BUILDROOT/output/$CFG_RECOVERY/images/recovery.img -PCBA_IMG=$BUILDROOT/output/$CFG_PCBA/images/pcba.img -TRUST_IMG=$UBOOT/trust.img -UBOOT_IMG=$UBOOT/uboot.img -BOOT_IMG=$KERNEL/boot.img -LOADER_BIN=$UBOOT/*_loader_*.bin -echo "buildroot rootfs: $ROOTFS_IMG_BUILDROOT" -echo "recovery image: $RECOVERY_IMG" -echo "pcba image: $PCBA_IMG" - -rm -rf $ROCKDEV -mkdir -p $ROCKDEV - -if [ ! -n "$1" ] -then - echo "build buildroot type rootfs as default" - ROOTFS_TYPE=buildroot -else - ROOTFS_TYPE="$1" -fi - -if [ $ROOTFS_TYPE = debian ] -then - echo -n "create rootfs.img and parameter.txt..." - ln -s -f $ROOTFS_IMG_DEBIAN $ROCKDEV/rootfs.img - ln -s -f $PARAMETER_DEBIAN $ROCKDEV/parameter.txt - echo "done." -fi - -if [ $ROOTFS_TYPE = buildroot ] -then - echo -n "create rootfs.img and parameter.txt..." - ln -s -f $ROOTFS_IMG_BUILDROOT $ROCKDEV/rootfs.img - ln -s -f $PARAMETER $ROCKDEV/parameter.txt - echo "done" -fi - -if [ $ROOTFS_TYPE = yocto ] -then - echo -n "create rootfs.img and parameter.txt..." - ln -s -f $ROOTFS_IMG_YOCTO $ROCKDEV/rootfs.img - ln -s -f $PARAMETER $ROCKDEV/parameter.txt - echo "done" - -fi - -if [ -f $RECOVERY_IMG ] -then - echo -n "create recovery.img..." - ln -s -f $RECOVERY_IMG $ROCKDEV/recovery.img - echo "done." -fi - -if [ -f $MISC_IMG ] -then - echo -n "create misc.img..." - ln -s -f $MISC_IMG $ROCKDEV/misc.img - echo "done." -fi - -if [ -f $OEM_DIR ] -then - echo -n "create oem.img..." - $DEVICE_DIR/mk-oem.sh $OEM_TYPE $OEM_DIR $ROCKDEV/oem.img - echo "done." -fi - -if [ -f $UBOOT_IMG ] -then - echo -n "create uboot.img..." - ln -s -f $UBOOT_IMG $ROCKDEV/uboot.img - echo "done." -fi - -if [ -f $TRUST_IMG ] -then - echo -n "create trust.img..." - ln -s -f $TRUST_IMG $ROCKDEV/trust.img - echo "done." -fi - -if [ -f $LOADER_BIN ] -then - echo -n "create loader..." - ln -s -f $LOADER_BIN $ROCKDEV/MiniLoaderAll.bin - echo "done." -fi - -if [ -f $BOOT_IMG ] -then - echo -n "create boot.img..." - ln -s -f $BOOT_IMG $ROCKDEV/boot.img - echo "done." -fi - -echo -e "\e[36m Image: image in $ROCKDEV is ready \e[0m" diff --git a/rk3308/script_bak/BoardConfig.mk b/rk3308/script_bak/BoardConfig.mk deleted file mode 100755 index 9c6317b..0000000 --- a/rk3308/script_bak/BoardConfig.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Set SDK root dir -SDK_ROOT := $(PWD)/../../.. - -# Set rootfs type, see buildroot. -# ext4 squashfs -ROOTFS_TYPE := squashfs - -# Set data partition type. -# ext2 squashfs -OEM_PARTITION_TYPE := ext2 - -# Set flash type. -# support -FLASH_TYPE := nand - -# Select Target Product Name -TARGET_PRODUCT := rk3308 - -DEVICE_DIR := $(PWD) - -#OEM config: /oem/dueros/aispeech/iflytekSDK/CaeDemo_VAD -OEM_PATH := oem - -# Buildroot config -CFG_BUILDROOT := rockchip_rk3308_release - -# Recovery config -CFG_RECOVERY := rockchip_rk3308_recovery - -# Pcba config -CFG_PCBA := rockchip_rk3308_pcba - - -BUILDROOT_PATH := ${SDK_ROOT}/buildroot - -RECOVERY_BUILD_OUTPUT := ${BUILDROOT_PATH}/output/recovery -RECOVERY_BUILD_OUTPUT_IMAGE := ${BUILDROOT_PATH}/output/recovery/images -RECOVERY_BUILD_OUTPUT_TARGET := ${BUILDROOT_PATH}/output/recovery/target - -PCBA_BUILD_OUTPUT := ${BUILDROOT_PATH}/output/pcba -PCBA_BUILD_OUTPUT_IMAGE := ${BUILDROOT_PATH}/output/pcba/images -PCBA_BUILD_OUTPUT_TARGET := ${BUILDROOT_PATH}/output/pcba/target diff --git a/rk3308/script_bak/build_all.sh b/rk3308/script_bak/build_all.sh deleted file mode 100755 index 3a2ff70..0000000 --- a/rk3308/script_bak/build_all.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -$DEVICE_DIR/mk-uboot.sh -$DEVICE_DIR/mk-kernel.sh -$DEVICE_DIR/mk-rootfs.sh -$DEVICE_DIR/mk-recovery.sh -$DEVICE_DIR/mk-pcba.sh - diff --git a/rk3308/script_bak/mk-kernel.sh b/rk3308/script_bak/mk-kernel.sh deleted file mode 100755 index f5edf50..0000000 --- a/rk3308/script_bak/mk-kernel.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -cd $TOP_DIR/kernel && make ARCH=arm64 rockchip_linux_defconfig && make ARCH=arm64 rk3308-evb-dmic-pdm-v11.img -j12 && cd - - -if [ $? -eq 0 ]; then - echo "====Build kernel ok!====" -else - echo "====Build kernel failed!====" - exit 1 -fi diff --git a/rk3308/script_bak/mk-oem.sh b/rk3308/script_bak/mk-oem.sh deleted file mode 100755 index 432c7e5..0000000 --- a/rk3308/script_bak/mk-oem.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -if [ ! -n "$1" ] -then - FS_TYPE=ext2 -else - FS_TYPE="$1" -fi - -if [ ! -n "$2" ] -then - OEM_DIR=$DEVICE_DIR/oem -else - OEM_DIR="$2" -fi - -if [ ! -n "$3" ] -then - OEM_IMG=$TOP_DIR/rockdev/oem.img -else - OEM_IMG="$3" -fi - -if [ $FS_TYPE = ext2 ] -then - $DEVICE_DIR/mke2img.sh $OEM_DIR $OEM_IMG - -fi - -if [ $FS_TYPE = squashfs ] -then - mksquashfs $OEM_DIR $OEM_IMG -noappend -comp gzip -fi diff --git a/rk3308/script_bak/mk-rootfs.sh b/rk3308/script_bak/mk-rootfs.sh deleted file mode 100755 index 03614e4..0000000 --- a/rk3308/script_bak/mk-rootfs.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -if [ ! -n "$1" ] -then -echo "build buildroot rootfs as default" -BUILD_TYPE=buildroot -else -BUILD_TYPE="$1" -fi - -if [ $BUILD_TYPE = buildroot ] -then -$DEVICE_DIR/mk-buildroot.sh -fi - -if [ $BUILD_TYPE = yocto ] -then -$DEVICE_DIR/mk-yocto.sh -fi diff --git a/rk3308/script_bak/mk-uboot.sh b/rk3308/script_bak/mk-uboot.sh deleted file mode 100755 index dd9013f..0000000 --- a/rk3308/script_bak/mk-uboot.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -DEVICE_DIR=$(cd `dirname $0`; pwd) -if [ -h $0 ] -then - CMD=$(readlink $0) - DEVICE_DIR=$(dirname $CMD) -fi -cd $DEVICE_DIR -cd ../../.. -TOP_DIR=$(pwd) - -cd $TOP_DIR/u-boot && ./make.sh evb-rk3308 && cd - - -if [ $? -eq 0 ]; then - echo "====Build uboot ok!====" -else - echo "====Build uboot failed!====" - exit 1 -fi diff --git a/rk3308/script_bak/mke2img.sh b/rk3308/script_bak/mke2img.sh deleted file mode 100755 index 5443d5c..0000000 --- a/rk3308/script_bak/mke2img.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -SRC=$1 -DST=$2 -dd if=/dev/zero of=$DST bs=1M count=1 -mke2fs -t ext2 $DST -mke2fs -F -d $SRC $DST