@@ -2604,7 +2604,7 @@ N: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
F: arch/Config.in.arm
F: board/beaglev/
F: board/stmicroelectronics/stm32mp157c-dk2/
-F: boot/beaglev-ddrlnit/
+F: boot/beaglev-ddrinit/
F: boot/beaglev-secondboot/
F: boot/boot-wrapper-aarch64/
F: boot/grub2/
similarity index 61%
rename from boot/beaglev-ddrlnit/Config.in
rename to boot/beaglev-ddrinit/Config.in
@@ -1,9 +1,9 @@
-config BR2_TARGET_BEAGLEV_DDRLNIT
- bool "beaglev-ddrlnit"
+config BR2_TARGET_BEAGLEV_DDRINIT
+ bool "beaglev-ddrinit"
depends on BR2_riscv
depends on BR2_HOSTARCH = "x86_64" # host-riscv64-elf-toolchain
help
This package builds the DDRinit firmware used on the BeagleV
platform.
- https://github.com/starfive-tech/beagle_ddrlnit
+ https://github.com/starfive-tech/beagle_ddrinit
new file mode 100644
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 0809b72e1e8e40f82acdcfd4c8a6a120e14bd9ed395592e075bb54acc8c07271 beaglev-ddrinit-15b80de81263996affb2a29332aa681925709983.tar.gz
similarity index 55%
rename from boot/beaglev-ddrlnit/beaglev-ddrlnit.mk
rename to boot/beaglev-ddrinit/beaglev-ddrinit.mk
@@ -1,27 +1,27 @@
################################################################################
#
-# beaglev-ddrlnit
+# beaglev-ddrinit
#
################################################################################
# Commit on the 'starfive' branch
-BEAGLEV_DDRLNIT_VERSION = 15b80de81263996affb2a29332aa681925709983
-BEAGLEV_DDRLNIT_SITE = $(call github,starfive-tech,beagle_ddrlnit,$(BEAGLEV_DDRLNIT_VERSION))
-BEAGLEV_DDRLNIT_INSTALL_TARGET = NO
-BEAGLEV_DDRLNIT_INSTALL_IMAGES = YES
-BEAGLEV_DDRLNIT_DEPENDENCIES = host-riscv64-elf-toolchain
+BEAGLEV_DDRINIT_VERSION = 15b80de81263996affb2a29332aa681925709983
+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_DDRLNIT_LICENSE = GPL-2.0+
+BEAGLEV_DDRINIT_LICENSE = GPL-2.0+
-define BEAGLEV_DDRLNIT_BUILD_CMDS
+define BEAGLEV_DDRINIT_BUILD_CMDS
$(MAKE) -C $(@D)/build \
CROSSCOMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \
SUFFIX=buildroot \
- GIT_VERSION=$(BEAGLEV_DDRLNIT_VERSION)
+ GIT_VERSION=$(BEAGLEV_DDRINIT_VERSION)
endef
-define BEAGLEV_DDRLNIT_INSTALL_IMAGES_CMDS
+define BEAGLEV_DDRINIT_INSTALL_IMAGES_CMDS
$(INSTALL) -D -m 0644 $(@D)/build/ddrinit-2133-buildroot.bin.out \
$(BINARIES_DIR)/ddrinit-2133-buildroot.bin.out
endef
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 dee7f8003ee02d7799d07b598dd5823e10b42f50fae6135b2320a8d7e1fa77bf beaglev-ddrlnit-15b80de81263996affb2a29332aa681925709983.tar.gz
@@ -18,7 +18,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_BEAGLEV_DDRLNIT=y
+BR2_TARGET_BEAGLEV_DDRINIT=y
BR2_TARGET_BEAGLEV_SECONDBOOT=y
BR2_TARGET_OPENSBI=y
BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y
And adjust DEVELOPERS and beaglev_defconfig to match. The typo in the repo name has now been fixed: https://github.com/starfive-tech/beagle_ddrinit/issues/6 Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- DEVELOPERS | 2 +- .../Config.in | 6 +++--- boot/beaglev-ddrinit/beaglev-ddrinit.hash | 2 ++ .../beaglev-ddrinit.mk} | 20 +++++++++---------- boot/beaglev-ddrlnit/beaglev-ddrlnit.hash | 2 -- configs/beaglev_defconfig | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) rename boot/{beaglev-ddrlnit => beaglev-ddrinit}/Config.in (61%) create mode 100644 boot/beaglev-ddrinit/beaglev-ddrinit.hash rename boot/{beaglev-ddrlnit/beaglev-ddrlnit.mk => beaglev-ddrinit/beaglev-ddrinit.mk} (55%) delete mode 100644 boot/beaglev-ddrlnit/beaglev-ddrlnit.hash