[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Drew Fustini]

Update the commit id for u-boot to include fixes from the starfive-tech
u-boot repository:

494e5ef7b807 jh7100: Enable full 2M L2 cache
4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
abb06422a5cd Remove fdt_high and initrd_high for Starfive
93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
7c585978616b configs: earlycon=sbi is deprecated

The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
has removed the need for buildroot to patch the fdt_addr_r address.

Update linux from commit in the old 5.10 branch that Fedora image was 
using to head of esmil_starlight branch [1] which is currently based 
on 5.13-rc5 and represents the best kernel for this board [2].

In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
buildroot no longer needs to copy the dtb from u-boot.

[1] https://github.com/starfive-tech/linux/tree/esmil_starlight
[2] https://github.com/starfive-tech/linux/issues/26

Signed-off-by: Drew Fustini <drew@beagleboard.org>
---
 board/beaglev/extlinux.conf                   |  2 +-
 ...s-starfive-vic7100-adjust-fdt_addr_r.patch | 39 -------------------
 board/beaglev/post-build.sh                   |  6 ---
 configs/beaglev_defconfig                     | 15 +++----
 4 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch

diff --git a/board/beaglev/extlinux.conf b/board/beaglev/extlinux.conf
index c5444d094c82..9daf6a758142 100644
--- a/board/beaglev/extlinux.conf
+++ b/board/beaglev/extlinux.conf
@@ -1,4 +1,4 @@
 label linux
   kernel /boot/Image
-  devicetree /boot/starfive_vic7100_beagle_v.dtb
+  devicetree /boot/jh7100-beaglev-starlight.dtb
   append console=ttyS0,115200 earlyprintk root=PARTUUID=0fef845a-c6e1-45bc-82f7-002fa720f958 rootwait
diff --git a/board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch b/board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
deleted file mode 100644
index 74d70f2721ad..000000000000
--- a/board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2c4c813940c577590f3352cef0c49a8def17905d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Wed, 28 Apr 2021 22:58:45 +0200
-Subject: [PATCH] include/configs/starfive-vic7100: adjust fdt_addr_r
-
-The default fdt_addr_r of 0x88000000 doesn't work, the kernel never
-boots. Using 0x90000000 works fine.
-
-Since it would overlap with the kernel_comp_addr_r area, this one is
-moved 16 MB further, at 0x91000000.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- include/configs/starfive-vic7100.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/starfive-vic7100.h b/include/configs/starfive-vic7100.h
-index 8c5915a73c..7150a23873 100644
---- a/include/configs/starfive-vic7100.h
-+++ b/include/configs/starfive-vic7100.h
-@@ -111,13 +111,13 @@
- 	"fdt_high=0xffffffffffffffff\0" \
- 	"initrd_high=0xffffffffffffffff\0" \
- 	"kernel_addr_r=0x84000000\0" \
--	"fdt_addr_r=0x88000000\0" \
-+	"fdt_addr_r=0x90000000\0" \
- 	"scriptaddr=0x88100000\0" \
- 	"script_offset_f=0x1fff000\0" \
- 	"script_size_f=0x1000\0" \
- 	"pxefile_addr_r=0x88200000\0" \
- 	"ramdisk_addr_r=0x88300000\0" \
--	"kernel_comp_addr_r=0x90000000\0" \
-+	"kernel_comp_addr_r=0x91000000\0" \
- 	"kernel_comp_size=0x10000000\0" \
- 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
- 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
--- 
-2.30.2
-
diff --git a/board/beaglev/post-build.sh b/board/beaglev/post-build.sh
index b19b9bf6d06b..fe61fd33cc84 100755
--- a/board/beaglev/post-build.sh
+++ b/board/beaglev/post-build.sh
@@ -1,12 +1,6 @@
 #!/bin/sh
 BOARD_DIR=$(dirname $0)
 
-# The DTB to use is provided within the U-Boot source tree, so we grab
-# it from there, and install it to TARGET_DIR/boot/.
-eval $(make -C ${CONFIG_DIR} --no-print-directory QUOTED_VARS=YES VARS=UBOOT_DIR printvars)
-install -D -m0644 ${UBOOT_DIR}/arch/riscv/dts/starfive_vic7100_beagle_v.dtb \
-	${TARGET_DIR}/boot/starfive_vic7100_beagle_v.dtb
-
 # Bring the extlinux.conf file in.
 install -D -m 0644 ${BOARD_DIR}/extlinux.conf \
 	${TARGET_DIR}/boot/extlinux/extlinux.conf
diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig
index bbb69ca26814..895902a11a7c 100644
--- a/configs/beaglev_defconfig
+++ b/configs/beaglev_defconfig
@@ -4,16 +4,17 @@ BR2_RISCV_ISA_CUSTOM_RVM=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
-BR2_GLOBAL_PATCH_DIR="board/beaglev/patches/"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglev/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglev/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# HEAD of the Fedora branch
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,710cf052d6abda73584481d920b4b6befc7240ea)/linux-710cf052d6abda73584481d920b4b6befc7240ea.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="starfive_vic7100_evb_sd_net"
+# HEAD of the 5.13 branch (esmil_starlight)
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,83dba1f25dfc118cacec991c31a7a4cfa7405c89)/linux-83dba1f25dfc118cacec991c31a7a4cfa7405c89.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="starlight"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
@@ -31,8 +32,8 @@ BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-# HEAD of the Fedora branch
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,3f3ac01a29ad1cd5fa519d86f81daead2447f1d4)/uboot-3f3ac01a29ad1cd5fa519d86f81daead2447f1d4.tar.gz"
+# HEAD of the starfive-tech:Fedora_VIC_7100_2021.04 branch
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,494e5ef7b8071d0b2fba50616d97771e44cbcb7c)/uboot-494e5ef7b8071d0b2fba50616d97771e44cbcb7c.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_vic7100_beagle_v_smode"
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_JH71XX_TOOLS=y
-- 
2.27.0

[Buildroot] [PATCH 2/3] boot/beaglev-ddrinit: add LICENSE file

[Drew Fustini]

Update git commit ID to include recently added LICENSE file

Signed-off-by: Drew Fustini <drew@beagleboard.org>
---
 boot/beaglev-ddrinit/beaglev-ddrinit.hash | 3 ++-
 boot/beaglev-ddrinit/beaglev-ddrinit.mk   | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/beaglev-ddrinit/beaglev-ddrinit.hash b/boot/beaglev-ddrinit/beaglev-ddrinit.hash
index 7f433466964f..2aaab53a3b8a 100644
--- a/boot/beaglev-ddrinit/beaglev-ddrinit.hash
+++ b/boot/beaglev-ddrinit/beaglev-ddrinit.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256  df58c3da7a6f429095f4d56e7f1f5b7c855a0cbe82a2569586ce0c5fdd1bf256  beaglev-ddrinit-2e2f6faaf1059b61bb06ea00404199d1de55f201.tar.gz
+sha256  2d491f64bd77de9dfd4b8ae6c00e83670e80c205cc20917fefa6194b1dc1fe4e  beaglev-ddrinit-c0839f25246d9e308c23498d344ca13d8a7ad6ed.tar.gz
+sha256  284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813  LICENSE
diff --git a/boot/beaglev-ddrinit/beaglev-ddrinit.mk b/boot/beaglev-ddrinit/beaglev-ddrinit.mk
index 2f1ce3ee87a0..76406ed4c593 100644
--- a/boot/beaglev-ddrinit/beaglev-ddrinit.mk
+++ b/boot/beaglev-ddrinit/beaglev-ddrinit.mk
@@ -5,14 +5,13 @@
 ################################################################################
 
 # Commit on the 'starfive' branch
-BEAGLEV_DDRINIT_VERSION = 2e2f6faaf1059b61bb06ea00404199d1de55f201
+BEAGLEV_DDRINIT_VERSION = c0839f25246d9e308c23498d344ca13d8a7ad6ed
 BEAGLEV_DDRINIT_SITE = $(call github,starfive-tech,beagle_ddrinit,$(BEAGLEV_DDRINIT_VERSION))
 BEAGLEV_DDRINIT_INSTALL_TARGET = NO
 BEAGLEV_DDRINIT_INSTALL_IMAGES = YES
 BEAGLEV_DDRINIT_DEPENDENCIES = host-riscv64-elf-toolchain
-# unfortunately, no real license file, but several sources files are
-# under GPL-2.0+, making the whole work GPL-2.0+
 BEAGLEV_DDRINIT_LICENSE = GPL-2.0+
+BEAGLEV_DDRINIT_LICENSE_FILES = LICENSE
 
 define BEAGLEV_DDRINIT_BUILD_CMDS
 	$(MAKE) -C $(@D)/build \
-- 
2.27.0

[Buildroot] [PATCH 3/3] boot/beaglev-secondboot: add LICENSE file

[Drew Fustini]

Update git commit ID to include recently added LICENSE file

Signed-off-by: Drew Fustini <drew@beagleboard.org>
---
 boot/beaglev-secondboot/beaglev-secondboot.hash | 3 ++-
 boot/beaglev-secondboot/beaglev-secondboot.mk   | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/beaglev-secondboot/beaglev-secondboot.hash b/boot/beaglev-secondboot/beaglev-secondboot.hash
index e0ca0e149dab..efc93347b16c 100644
--- a/boot/beaglev-secondboot/beaglev-secondboot.hash
+++ b/boot/beaglev-secondboot/beaglev-secondboot.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256  56519b20a8ac2b68770cacd5158190dfcb2b3762a759b1c44582ca25ffbccc5d  beaglev-secondboot-e976d186e69a1a84884265b0689626fa254a950d.tar.gz
+sha256  fe4d37f3ff38e7f2da70a08f9cb1668c0b928e85d2e0935bd985f910b3ce30e9  beaglev-secondboot-2d20047960044308126117ad56bc08a1164e82b2.tar.gz
+sha256  284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813  LICENSE
diff --git a/boot/beaglev-secondboot/beaglev-secondboot.mk b/boot/beaglev-secondboot/beaglev-secondboot.mk
index 6d904b02ba31..a423c6c6a697 100644
--- a/boot/beaglev-secondboot/beaglev-secondboot.mk
+++ b/boot/beaglev-secondboot/beaglev-secondboot.mk
@@ -5,14 +5,13 @@
 ################################################################################
 
 # Commit on the 'starfive' branch
-BEAGLEV_SECONDBOOT_VERSION = e976d186e69a1a84884265b0689626fa254a950d
+BEAGLEV_SECONDBOOT_VERSION = 2d20047960044308126117ad56bc08a1164e82b2
 BEAGLEV_SECONDBOOT_SITE = $(call github,starfive-tech,beagle_secondBoot,$(BEAGLEV_SECONDBOOT_VERSION))
 BEAGLEV_SECONDBOOT_INSTALL_TARGET = NO
 BEAGLEV_SECONDBOOT_INSTALL_IMAGES = YES
 BEAGLEV_SECONDBOOT_DEPENDENCIES = host-riscv64-elf-toolchain
-# unfortunately, no real license file, but several sources files are
-# under GPL-2.0+, making the whole work GPL-2.0+
 BEAGLEV_SECONDBOOT_LICENSE = GPL-2.0+
+BEAGLEV_SECONDBOOT_LICENSE_FILES = LICENSE
 
 define BEAGLEV_SECONDBOOT_BUILD_CMDS
 	$(MAKE) -C $(@D)/build \
-- 
2.27.0

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Alistair Francis]

On Wed, Jun 9, 2021 at 5:15 PM Drew Fustini <drew@beagleboard.org> wrote:
>
> Update the commit id for u-boot to include fixes from the starfive-tech
> u-boot repository:
>
> 494e5ef7b807 jh7100: Enable full 2M L2 cache
> 4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
> abb06422a5cd Remove fdt_high and initrd_high for Starfive
> 93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
> bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
> 7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
> 7c585978616b configs: earlycon=sbi is deprecated
>
> The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
> has removed the need for buildroot to patch the fdt_addr_r address.
>
> Update linux from commit in the old 5.10 branch that Fedora image was
> using to head of esmil_starlight branch [1] which is currently based
> on 5.13-rc5 and represents the best kernel for this board [2].
>
> In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
> buildroot no longer needs to copy the dtb from u-boot.
>
> [1] https://github.com/starfive-tech/linux/tree/esmil_starlight
> [2] https://github.com/starfive-tech/linux/issues/26
>
> Signed-off-by: Drew Fustini <drew@beagleboard.org>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  board/beaglev/extlinux.conf                   |  2 +-
>  ...s-starfive-vic7100-adjust-fdt_addr_r.patch | 39 -------------------
>  board/beaglev/post-build.sh                   |  6 ---
>  configs/beaglev_defconfig                     | 15 +++----
>  4 files changed, 9 insertions(+), 53 deletions(-)
>  delete mode 100644 board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
>
> diff --git a/board/beaglev/extlinux.conf b/board/beaglev/extlinux.conf
> index c5444d094c82..9daf6a758142 100644
> --- a/board/beaglev/extlinux.conf
> +++ b/board/beaglev/extlinux.conf
> @@ -1,4 +1,4 @@
>  label linux
>    kernel /boot/Image
> -  devicetree /boot/starfive_vic7100_beagle_v.dtb
> +  devicetree /boot/jh7100-beaglev-starlight.dtb
>    append console=ttyS0,115200 earlyprintk root=PARTUUID=0fef845a-c6e1-45bc-82f7-002fa720f958 rootwait
> diff --git a/board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch b/board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
> deleted file mode 100644
> index 74d70f2721ad..000000000000
> --- a/board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 2c4c813940c577590f3352cef0c49a8def17905d Mon Sep 17 00:00:00 2001
> -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> -Date: Wed, 28 Apr 2021 22:58:45 +0200
> -Subject: [PATCH] include/configs/starfive-vic7100: adjust fdt_addr_r
> -
> -The default fdt_addr_r of 0x88000000 doesn't work, the kernel never
> -boots. Using 0x90000000 works fine.
> -
> -Since it would overlap with the kernel_comp_addr_r area, this one is
> -moved 16 MB further, at 0x91000000.
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ----
> - include/configs/starfive-vic7100.h | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/include/configs/starfive-vic7100.h b/include/configs/starfive-vic7100.h
> -index 8c5915a73c..7150a23873 100644
> ---- a/include/configs/starfive-vic7100.h
> -+++ b/include/configs/starfive-vic7100.h
> -@@ -111,13 +111,13 @@
> -       "fdt_high=0xffffffffffffffff\0" \
> -       "initrd_high=0xffffffffffffffff\0" \
> -       "kernel_addr_r=0x84000000\0" \
> --      "fdt_addr_r=0x88000000\0" \
> -+      "fdt_addr_r=0x90000000\0" \
> -       "scriptaddr=0x88100000\0" \
> -       "script_offset_f=0x1fff000\0" \
> -       "script_size_f=0x1000\0" \
> -       "pxefile_addr_r=0x88200000\0" \
> -       "ramdisk_addr_r=0x88300000\0" \
> --      "kernel_comp_addr_r=0x90000000\0" \
> -+      "kernel_comp_addr_r=0x91000000\0" \
> -       "kernel_comp_size=0x10000000\0" \
> -       "type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
> -       "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
> ---
> -2.30.2
> -
> diff --git a/board/beaglev/post-build.sh b/board/beaglev/post-build.sh
> index b19b9bf6d06b..fe61fd33cc84 100755
> --- a/board/beaglev/post-build.sh
> +++ b/board/beaglev/post-build.sh
> @@ -1,12 +1,6 @@
>  #!/bin/sh
>  BOARD_DIR=$(dirname $0)
>
> -# The DTB to use is provided within the U-Boot source tree, so we grab
> -# it from there, and install it to TARGET_DIR/boot/.
> -eval $(make -C ${CONFIG_DIR} --no-print-directory QUOTED_VARS=YES VARS=UBOOT_DIR printvars)
> -install -D -m0644 ${UBOOT_DIR}/arch/riscv/dts/starfive_vic7100_beagle_v.dtb \
> -       ${TARGET_DIR}/boot/starfive_vic7100_beagle_v.dtb
> -
>  # Bring the extlinux.conf file in.
>  install -D -m 0644 ${BOARD_DIR}/extlinux.conf \
>         ${TARGET_DIR}/boot/extlinux/extlinux.conf
> diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig
> index bbb69ca26814..895902a11a7c 100644
> --- a/configs/beaglev_defconfig
> +++ b/configs/beaglev_defconfig
> @@ -4,16 +4,17 @@ BR2_RISCV_ISA_CUSTOM_RVM=y
>  BR2_RISCV_ISA_CUSTOM_RVF=y
>  BR2_RISCV_ISA_CUSTOM_RVD=y
>  BR2_RISCV_ISA_CUSTOM_RVC=y
> -BR2_GLOBAL_PATCH_DIR="board/beaglev/patches/"
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
>  BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglev/post-build.sh"
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglev/genimage.cfg"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -# HEAD of the Fedora branch
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,710cf052d6abda73584481d920b4b6befc7240ea)/linux-710cf052d6abda73584481d920b4b6befc7240ea.tar.gz"
> -BR2_LINUX_KERNEL_DEFCONFIG="starfive_vic7100_evb_sd_net"
> +# HEAD of the 5.13 branch (esmil_starlight)
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,83dba1f25dfc118cacec991c31a7a4cfa7405c89)/linux-83dba1f25dfc118cacec991c31a7a4cfa7405c89.tar.gz"
> +BR2_LINUX_KERNEL_DEFCONFIG="starlight"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight"
>  BR2_LINUX_KERNEL_INSTALL_TARGET=y
>  BR2_TARGET_ROOTFS_EXT2=y
>  BR2_TARGET_ROOTFS_EXT2_4=y
> @@ -31,8 +32,8 @@ BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>  BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
> -# HEAD of the Fedora branch
> -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,3f3ac01a29ad1cd5fa519d86f81daead2447f1d4)/uboot-3f3ac01a29ad1cd5fa519d86f81daead2447f1d4.tar.gz"
> +# HEAD of the starfive-tech:Fedora_VIC_7100_2021.04 branch
> +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,494e5ef7b8071d0b2fba50616d97771e44cbcb7c)/uboot-494e5ef7b8071d0b2fba50616d97771e44cbcb7c.tar.gz"
>  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_vic7100_beagle_v_smode"
>  BR2_PACKAGE_HOST_GENIMAGE=y
>  BR2_PACKAGE_HOST_JH71XX_TOOLS=y
> --
> 2.27.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Bin Meng]

On Wed, Jun 9, 2021 at 3:15 PM Drew Fustini <drew@beagleboard.org> wrote:
>
> Update the commit id for u-boot to include fixes from the starfive-tech
> u-boot repository:
>
> 494e5ef7b807 jh7100: Enable full 2M L2 cache
> 4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
> abb06422a5cd Remove fdt_high and initrd_high for Starfive
> 93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
> bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
> 7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
> 7c585978616b configs: earlycon=sbi is deprecated
>
> The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
> has removed the need for buildroot to patch the fdt_addr_r address.
>
> Update linux from commit in the old 5.10 branch that Fedora image was
> using to head of esmil_starlight branch [1] which is currently based
> on 5.13-rc5 and represents the best kernel for this board [2].
>
> In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
> buildroot no longer needs to copy the dtb from u-boot.
>
> [1] https://github.com/starfive-tech/linux/tree/esmil_starlight
> [2] https://github.com/starfive-tech/linux/issues/26
>
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---
>  board/beaglev/extlinux.conf                   |  2 +-
>  ...s-starfive-vic7100-adjust-fdt_addr_r.patch | 39 -------------------
>  board/beaglev/post-build.sh                   |  6 ---
>  configs/beaglev_defconfig                     | 15 +++----
>  4 files changed, 9 insertions(+), 53 deletions(-)
>  delete mode 100644 board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

No switch to upstream OpenSBI yet?

[Buildroot] [PATCH 2/3] boot/beaglev-ddrinit: add LICENSE file

[Bin Meng]

On Wed, Jun 9, 2021 at 3:16 PM Drew Fustini <drew@beagleboard.org> wrote:
>
> Update git commit ID to include recently added LICENSE file
>
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---
>  boot/beaglev-ddrinit/beaglev-ddrinit.hash | 3 ++-
>  boot/beaglev-ddrinit/beaglev-ddrinit.mk   | 5 ++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[Buildroot] [PATCH 3/3] boot/beaglev-secondboot: add LICENSE file

[Bin Meng]

On Wed, Jun 9, 2021 at 3:16 PM Drew Fustini <drew@beagleboard.org> wrote:
>
> Update git commit ID to include recently added LICENSE file
>
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---
>  boot/beaglev-secondboot/beaglev-secondboot.hash | 3 ++-
>  boot/beaglev-secondboot/beaglev-secondboot.mk   | 5 ++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Robert Nelson]

On Wed, Jun 9, 2021 at 2:15 AM Drew Fustini <drew@beagleboard.org> wrote:
>
> Update the commit id for u-boot to include fixes from the starfive-tech
> u-boot repository:
>
> 494e5ef7b807 jh7100: Enable full 2M L2 cache
> 4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
> abb06422a5cd Remove fdt_high and initrd_high for Starfive
> 93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
> bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
> 7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
> 7c585978616b configs: earlycon=sbi is deprecated
>
> The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
> has removed the need for buildroot to patch the fdt_addr_r address.
>
> Update linux from commit in the old 5.10 branch that Fedora image was
> using to head of esmil_starlight branch [1] which is currently based
> on 5.13-rc5 and represents the best kernel for this board [2].
>
> In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
> buildroot no longer needs to copy the dtb from u-boot.
>
> [1] https://github.com/starfive-tech/linux/tree/esmil_starlight
> [2] https://github.com/starfive-tech/linux/issues/26
>
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---



> +# HEAD of the 5.13 branch (esmil_starlight)
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,83dba1f25dfc118cacec991c31a7a4cfa7405c89)/linux-83dba1f25dfc118cacec991c31a7a4cfa7405c89.tar.gz"
> +BR2_LINUX_KERNEL_DEFCONFIG="starlight"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight"

Careful, @Drew Fustini this branch get's rebased on every kernel rc..
Unless we manually create a tag, this sha will disappear next week..

https://github.com/starfive-tech/linux/tree/esmil_starlight

Regards,

-- 
Robert Nelson
https://rcn-ee.com/

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Drew Fustini]

On Wed, Jun 09, 2021 at 10:08:55AM -0500, Robert Nelson wrote:
> On Wed, Jun 9, 2021 at 2:15 AM Drew Fustini <drew@beagleboard.org> wrote:
> >
> > Update the commit id for u-boot to include fixes from the starfive-tech
> > u-boot repository:
> >
> > 494e5ef7b807 jh7100: Enable full 2M L2 cache
> > 4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
> > abb06422a5cd Remove fdt_high and initrd_high for Starfive
> > 93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
> > bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
> > 7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
> > 7c585978616b configs: earlycon=sbi is deprecated
> >
> > The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
> > has removed the need for buildroot to patch the fdt_addr_r address.
> >
> > Update linux from commit in the old 5.10 branch that Fedora image was
> > using to head of esmil_starlight branch [1] which is currently based
> > on 5.13-rc5 and represents the best kernel for this board [2].
> >
> > In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
> > buildroot no longer needs to copy the dtb from u-boot.
> >
> > [1] https://github.com/starfive-tech/linux/tree/esmil_starlight
> > [2] https://github.com/starfive-tech/linux/issues/26
> >
> > Signed-off-by: Drew Fustini <drew@beagleboard.org>
> > ---
> 
> 
> 
> > +# HEAD of the 5.13 branch (esmil_starlight)
> > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,83dba1f25dfc118cacec991c31a7a4cfa7405c89)/linux-83dba1f25dfc118cacec991c31a7a4cfa7405c89.tar.gz"
> > +BR2_LINUX_KERNEL_DEFCONFIG="starlight"
> > +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-beaglev-starlight"
> 
> Careful, @Drew Fustini this branch get's rebased on every kernel rc..
> Unless we manually create a tag, this sha will disappear next week..

I do not believe the commit [1] will ever go away as long as the repo
still exists. But to make sure, I created buildroot-20210609 tag [2] to
represent what is being used to indicate what is being used in upstream
buildroot.

-Drew

[1] https://github.com/starfive-tech/linux/commit/83dba1f25dfc118cacec991c31a7a4cfa7405c89
[2] https://github.com/starfive-tech/linux/releases/tag/buildroot-20210609

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Drew Fustini]

On Wed, Jun 09, 2021 at 08:24:35PM +0800, Bin Meng wrote:
> On Wed, Jun 9, 2021 at 3:15 PM Drew Fustini <drew@beagleboard.org> wrote:
> >
> > Update the commit id for u-boot to include fixes from the starfive-tech
> > u-boot repository:
> >
> > 494e5ef7b807 jh7100: Enable full 2M L2 cache
> > 4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
> > abb06422a5cd Remove fdt_high and initrd_high for Starfive
> > 93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
> > bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
> > 7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
> > 7c585978616b configs: earlycon=sbi is deprecated
> >
> > The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
> > has removed the need for buildroot to patch the fdt_addr_r address.
> >
> > Update linux from commit in the old 5.10 branch that Fedora image was
> > using to head of esmil_starlight branch [1] which is currently based
> > on 5.13-rc5 and represents the best kernel for this board [2].
> >
> > In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
> > buildroot no longer needs to copy the dtb from u-boot.
> >
> > [1] https://github.com/starfive-tech/linux/tree/esmil_starlight
> > [2] https://github.com/starfive-tech/linux/issues/26
> >
> > Signed-off-by: Drew Fustini <drew@beagleboard.org>
> > ---
> >  board/beaglev/extlinux.conf                   |  2 +-
> >  ...s-starfive-vic7100-adjust-fdt_addr_r.patch | 39 -------------------
> >  board/beaglev/post-build.sh                   |  6 ---
> >  configs/beaglev_defconfig                     | 15 +++----
> >  4 files changed, 9 insertions(+), 53 deletions(-)
> >  delete mode 100644 board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
> >
> 
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> 
> No switch to upstream OpenSBI yet?

I attempted switching to upstream OpenSBI and generic platform but I
could not get it to boot.  I do want to further troubleshoot that with
you but, for now, I did not feel it is that important in the context of
buildroot.

The urgency for this patch is to get buildroot pointing to the 5.13
kernel as it has fixes for several problems in the older 5.10 kernel
that buildroot currently points to.  A buildroot user looking at
upstream right now would not know that we have moved on to 5.13.

Another practical issue is that upstream OpensBI generates a much bigger
fw_payload.bin.out. Commit 2524b0e [1] in starfive-tech/opensbi makes it
easier for people doing uboot development as the xmodem transfer of
fw_payload.bin.out is much faster.

thanks,
drew

[1] https://github.com/starfive-tech/opensbi/commit/2524b0ecd8684b42bc7a4c69794f40f11cbbe2a5

[Buildroot] [PATCH 1/3] beaglev: update to new starfive linux and u-boot

[Arnout Vandecappelle]

On 09/06/2021 08:38, Drew Fustini wrote:
> Update the commit id for u-boot to include fixes from the starfive-tech
> u-boot repository:
> 
> 494e5ef7b807 jh7100: Enable full 2M L2 cache
> 4571f5a4e1e4 vic7100: enable cache ways (L2 cache)
> abb06422a5cd Remove fdt_high and initrd_high for Starfive
> 93099a61c7b0 starfive: beaglev: Disable SIFIVE_CLINT and enable RISCV_TIMER
> bfb5abac3d1f Revert "riscv: Enable the SiFive CLINT block driver in S-Mode(VIC7100 ONLY)"
> 7b70e1d44ba9 defconfig: enable cache_wayenable for better performance
> 7c585978616b configs: earlycon=sbi is deprecated
> 
> The commit abb06422a5cd ("Remove fdt_high and initrd_high for Starfive")
> has removed the need for buildroot to patch the fdt_addr_r address.
> 
> Update linux from commit in the old 5.10 branch that Fedora image was 
> using to head of esmil_starlight branch [1] which is currently based 
> on 5.13-rc5 and represents the best kernel for this board [2].
> 
> In addition, the updated kernel now has jh7100-beaglev-starlight.dtb so
> buildroot no longer needs to copy the dtb from u-boot.
> 
> [1] https://github.com/starfive-tech/linux/tree/esmil_starlight
> [2] https://github.com/starfive-tech/linux/issues/26
> 
> Signed-off-by: Drew Fustini <drew@beagleboard.org>

 Series applied to master, thanks.

 I've added a comment to refer to the tag you added to the linux repo, and I
changed the commit message of the other two to make it explicit in the Subject
line that it's a version bump.

 Regards,
 Arnout

[snip]