From 6866d0eba299070163e12ecc5bb43923c779690b Mon Sep 17 00:00:00 2001 From: Jack Ma Date: Mon, 8 Jan 2018 15:15:49 +0800 Subject: [PATCH 1/8] Add rock960 build boards config Change-Id: I9c6dafb026fa246e3ef5819e2280976195094b11 --- board_configs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board_configs.sh b/board_configs.sh index 60556c758..9528f6896 100755 --- a/board_configs.sh +++ b/board_configs.sh @@ -20,6 +20,14 @@ case ${BOARD} in export CROSS_COMPILE=aarch64-linux-gnu- CHIP="rk3399" ;; + "rock960") + DEFCONFIG=rockchip_linux_defconfig + UBOOT_DEFCONFIG=evb-rk3399_defconfig + DTB=rock960-linux.dtb + export ARCH=arm64 + export CROSS_COMPILE=aarch64-linux-gnu- + CHIP="rk3399" + ;; "rk3399-firefly") DEFCONFIG=rockchip_linux_defconfig UBOOT_DEFCONFIG=firefly-rk3399_defconfig From 3178f70bbb3707fe106d4da60a0c4ac6adfcd325 Mon Sep 17 00:00:00 2001 From: Jack Ma Date: Mon, 8 Jan 2018 15:18:47 +0800 Subject: [PATCH 2/8] Do not force use kernel defconfig all the time Change-Id: Ic6b1a4a8cf0cb6c6df54dc4c95590607678bc8f3 --- mk-kernel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk-kernel.sh b/mk-kernel.sh index 13b5d55f3..0af88f7c7 100755 --- a/mk-kernel.sh +++ b/mk-kernel.sh @@ -27,10 +27,10 @@ if [ $? -ne 0 ]; then fi echo -e "\e[36m Building kernel for ${BOARD} board! \e[0m" -echo -e "\e[36m Using ${DEFCONFIG} \e[0m" cd ${LOCALPATH}/kernel -make ${DEFCONFIG} +[ ! -e .config ] && echo -e "\e[36m Using ${DEFCONFIG} \e[0m" && make ${DEFCONFIG} + make -j8 cd ${LOCALPATH} From c76c17cc299c2527a80aae84e7fdb23f5fb7fd44 Mon Sep 17 00:00:00 2001 From: Jack Ma Date: Mon, 2 Apr 2018 16:13:23 +0800 Subject: [PATCH 3/8] Add ficus build boards config --- board_configs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board_configs.sh b/board_configs.sh index 9528f6896..eeca7f413 100755 --- a/board_configs.sh +++ b/board_configs.sh @@ -28,6 +28,14 @@ case ${BOARD} in export CROSS_COMPILE=aarch64-linux-gnu- CHIP="rk3399" ;; + "ficus") + DEFCONFIG=rockchip_linux_defconfig + UBOOT_DEFCONFIG=evb-rk3399_defconfig + DTB=ficus-linux.dtb + export ARCH=arm64 + export CROSS_COMPILE=aarch64-linux-gnu- + CHIP="rk3399" + ;; "rk3399-firefly") DEFCONFIG=rockchip_linux_defconfig UBOOT_DEFCONFIG=firefly-rk3399_defconfig From 53a9d13c723e8186782e3916007219acaa00562a Mon Sep 17 00:00:00 2001 From: Jack Ma Date: Mon, 16 Jul 2018 14:33:48 +0800 Subject: [PATCH 4/8] add rock960 model C support --- board_configs.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/board_configs.sh b/board_configs.sh index eeca7f413..93ffb49c4 100755 --- a/board_configs.sh +++ b/board_configs.sh @@ -20,10 +20,18 @@ case ${BOARD} in export CROSS_COMPILE=aarch64-linux-gnu- CHIP="rk3399" ;; - "rock960") + "rock960ab") DEFCONFIG=rockchip_linux_defconfig UBOOT_DEFCONFIG=evb-rk3399_defconfig - DTB=rock960-linux.dtb + DTB=rock960-model-ab-linux.dtb + export ARCH=arm64 + export CROSS_COMPILE=aarch64-linux-gnu- + CHIP="rk3399" + ;; + "rock960c") + DEFCONFIG=rockchip_linux_defconfig + UBOOT_DEFCONFIG=evb-rk3399_defconfig + DTB=rock960-model-c-linux.dtb export ARCH=arm64 export CROSS_COMPILE=aarch64-linux-gnu- CHIP="rk3399" From aad6b4efc0870fa195973593d7e82d8757fd25af Mon Sep 17 00:00:00 2001 From: Jack Ma Date: Mon, 16 Jul 2018 14:34:12 +0800 Subject: [PATCH 5/8] update loader to v1.2 --- mk-uboot.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk-uboot.sh b/mk-uboot.sh index 0447461ab..0c3b0234e 100755 --- a/mk-uboot.sh +++ b/mk-uboot.sh @@ -79,10 +79,10 @@ EOF elif [ "${CHIP}" == "rk3399" ]; then $TOOLPATH/loaderimage --pack --uboot ./u-boot-dtb.bin uboot.img 0x200000 - tools/mkimage -n rk3399 -T rksd -d ../rkbin/rk33/rk3399_ddr_800MHz_v1.08.bin idbloader.img - cat ../rkbin/rk33/rk3399_miniloader_v1.06.bin >> idbloader.img + tools/mkimage -n rk3399 -T rksd -d ../rkbin/bin/rk33/rk3399_ddr_800MHz_v1.12.bin idbloader.img + cat ../rkbin/bin/rk33/rk3399_miniloader_v1.12.bin >> idbloader.img cp idbloader.img ${OUT}/u-boot/ - cp ../rkbin/rk33/rk3399_loader_v1.08.106.bin ${OUT}/u-boot/ + cp ../rkbin/bin/rk33/rk3399_miniloader_v1.12.bin ${OUT}/u-boot/ cat >trust.ini < Date: Mon, 23 Jul 2018 14:23:15 +0800 Subject: [PATCH 6/8] update bl31 to v1.17 --- mk-uboot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk-uboot.sh b/mk-uboot.sh index 0c3b0234e..b9d06b918 100755 --- a/mk-uboot.sh +++ b/mk-uboot.sh @@ -92,7 +92,7 @@ MINOR=0 SEC=0 [BL31_OPTION] SEC=1 -PATH=../rkbin/bin/rk33/rk3399_bl31_v1.16.elf +PATH=../rkbin/bin/rk33/rk3399_bl31_v1.17.elf ADDR=0x10000 [BL32_OPTION] SEC=0 From 711cf19698db1cffe1419bf78c5685bab6c30524 Mon Sep 17 00:00:00 2001 From: Jack Ma Date: Thu, 20 Sep 2018 20:09:57 +0800 Subject: [PATCH 7/8] fix the wrong loader copy to out Signed-off-by: Jack Ma --- mk-uboot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk-uboot.sh b/mk-uboot.sh index b9d06b918..a1b8ff6af 100755 --- a/mk-uboot.sh +++ b/mk-uboot.sh @@ -82,7 +82,7 @@ elif [ "${CHIP}" == "rk3399" ]; then tools/mkimage -n rk3399 -T rksd -d ../rkbin/bin/rk33/rk3399_ddr_800MHz_v1.12.bin idbloader.img cat ../rkbin/bin/rk33/rk3399_miniloader_v1.12.bin >> idbloader.img cp idbloader.img ${OUT}/u-boot/ - cp ../rkbin/bin/rk33/rk3399_miniloader_v1.12.bin ${OUT}/u-boot/ + cp ../rkbin/bin/rk33/rk3399_loader_v1.12.112.bin ${OUT}/u-boot/ cat >trust.ini < Date: Fri, 12 Oct 2018 13:57:28 +0530 Subject: [PATCH 8/8] extlinux: Modify rk3399.conf file for Rock960 board Modify the configuration file to use new dtb. Signed-off-by: Manivannan Sadhasivam --- extlinux/rk3399.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extlinux/rk3399.conf b/extlinux/rk3399.conf index 1c826e2a5..cc7cebb91 100644 --- a/extlinux/rk3399.conf +++ b/extlinux/rk3399.conf @@ -1,4 +1,4 @@ label kernel-4.4 kernel /Image - fdt /rk3399-sapphire-excavator-linux.dtb + fdt /rock960-model-ab-linux.dtb append earlyprintk console=ttyFIQ0,1500000n8 rw root=PARTUUID=b921b045-1d rootfstype=ext4 init=/sbin/init rootwait