From 32fd04b396f8f298c53a32f381c0b5cb4351303f Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 27 Dec 2023 17:03:26 -0600 Subject: [PATCH] u-boot: switch to our v2023.02-BeagleV-Fire branch Signed-off-by: Robert Nelson --- 01_git_sync.sh | 7 ++++--- 03_build_u-boot.sh | 11 ----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/01_git_sync.sh b/01_git_sync.sh index cf3e230..a3c91eb 100755 --- a/01_git_sync.sh +++ b/01_git_sync.sh @@ -7,9 +7,10 @@ HSS_BRANCH="v2023.02" HSS_REPO="https://github.com/polarfire-soc/hart-software-services.git" #UBOOT_BRANCH="mpfs-uboot-2022.01" -UBOOT_BRANCH="linux4microchip+fpga-2023.02" -UBOOT_REPO="https://github.com/polarfire-soc/u-boot.git" -#UBOOT_REPO="https://git.beagleboard.org/beaglev-fire/beaglev-fire-u-boot.git" +#UBOOT_BRANCH="linux4microchip+fpga-2023.02" +#UBOOT_REPO="https://github.com/polarfire-soc/u-boot.git" +UBOOT_BRANCH="v2023.02-BeagleV-Fire" +UBOOT_REPO="https://git.beagleboard.org/beaglev-fire/beaglev-fire-u-boot.git" #UBOOT_REPO="git@git.beagleboard.org:beaglev-fire/beaglev-fire-u-boot.git" DT_BRANCH="v6.1.x-Beagle" diff --git a/03_build_u-boot.sh b/03_build_u-boot.sh index 7b96f87..d2f276d 100755 --- a/03_build_u-boot.sh +++ b/03_build_u-boot.sh @@ -6,17 +6,6 @@ CC=${CC:-"${wdir}/riscv-toolchain/bin/riscv64-linux-"} make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} distclean -cd ./u-boot/ -#cp -v include/configs/microchip_mpfs_icicle.h ../patches/u-boot/original/ -#cp -v arch/riscv/dts/microchip-mpfs-icicle-kit.dts ../patches/u-boot/original/ -#cp -v configs/microchip_mpfs_icicle_defconfig ../patches/u-boot/original/ -#exit 2 - -cp -v ../patches/u-boot/beaglev-fire/microchip_mpfs_icicle.h include/configs/microchip_mpfs_icicle.h -cp -v ../patches/u-boot/beaglev-fire/microchip-mpfs-icicle-kit.dts arch/riscv/dts/ -cp -v ../patches/u-boot/beaglev-fire/microchip_mpfs_icicle_defconfig configs/microchip_mpfs_icicle_defconfig -cd ../ - make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} microchip_mpfs_icicle_defconfig #make -C u-boot ARCH=riscv CROSS_COMPILE=${CC} menuconfig