diff --git a/configs/common/patches/u-boot/0001-enable-distroboot.patch b/configs/common/patches/u-boot/0001-enable-distroboot.patch index 6ddc8b7..3aac139 100644 --- a/configs/common/patches/u-boot/0001-enable-distroboot.patch +++ b/configs/common/patches/u-boot/0001-enable-distroboot.patch @@ -67,7 +67,7 @@ index 12cdefac84..de5219eb49 100644 + #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run distro_bootcmd || run sdboot || run sdbootauto" #else - #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run norboot || run nandboot ||run emmcboot" -+ #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run distro_bootcmd || cvi_update || run norboot || run nandboot ||run emmcboot" ++ #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run distro_bootcmd || run norboot || run nandboot ||run emmcboot" #endif #if defined(CONFIG_NAND_SUPPORT) diff --git a/configs/duos/dts/cv181x_milkv_duos_sd.dts b/configs/duos/dts/cv181x_milkv_duos_sd.dts index e6afae6..2c1e903 100644 --- a/configs/duos/dts/cv181x_milkv_duos_sd.dts +++ b/configs/duos/dts/cv181x_milkv_duos_sd.dts @@ -1,8 +1,7 @@ /dts-v1/; #include "cv181x_base_riscv.dtsi" #include "cv181x_asic_bga.dtsi" -//#include "cv181x_asic_sd.dtsi" -#include "cv181x_asic_emmc.dtsi" +#include "cv181x_asic_sd.dtsi" #include "cv181x_default_memmap.dtsi" #include "dt-bindings/leds/common.h" diff --git a/configs/duos/u-boot/defconfig b/configs/duos/u-boot/defconfig index dc322e3..591ee6c 100644 --- a/configs/duos/u-boot/defconfig +++ b/configs/duos/u-boot/defconfig @@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="cv181x_asic" CONFIG_IDENT_STRING=" cvitek_cv181x" CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y +CONFIG_TARGET_CVITEK_CV181X=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y diff --git a/configs/settings.mk b/configs/settings.mk index f275b18..58ce76d 100644 --- a/configs/settings.mk +++ b/configs/settings.mk @@ -1,4 +1,4 @@ -KERNELREV="1" +KERNELREV="2" FSBLVERSION=1.0.0 PACKAGES="ca-certificates debian-archive-keyring dosfstools binutils file tree sudo bash-completion u-boot-menu openssh-server network-manager dnsmasq-base libpam-systemd ppp libengine-pkcs11-openssl iptables systemd-timesyncd vim usbutils parted exfatprogs systemd-sysv i2c-tools net-tools ethtool avahi-utils sudo gnupg rsync gpiod u-boot-tools libubootenv-tool" diff --git a/scripts/Makefile b/scripts/Makefile index 2fb00db..24a59c7 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -28,6 +28,7 @@ _PACKAGES = $(patsubst "%,%,$(patsubst %",%,$(PACKAGES))) $(info $(blue)Board: $(BOARD)$(reset)) +$(info $(blue)Storage: $(STORAGE_TYPE)$(reset)) $(info $(blue)Image Addons: $(IMAGE_ADDITIONS)$(reset)) $(info $(blue)Packages: $(_PACKAGES)$(reset)) @@ -37,8 +38,8 @@ NPROCS := $(shell nproc) $(BUILDDIR)/linux-prepare-checkout-stamp: @echo "$(COLOUR_GREEN)Checking out Kernel for $(BOARD)$(END_COLOUR)" @mkdir -p $(BUILDDIR) - @git clone -b sg200x-dev --depth 1 https://github.com/sophgo/linux_5.10.git /build/kernel - @cd $(BUILDDIR)/kernel && git checkout 25faa0d + @git clone -b sg200x-dev --depth 5 https://github.com/sophgo/linux_5.10.git /build/kernel + @cd $(BUILDDIR)/kernel && git checkout 8b8fbf8 @touch $@ $(BUILDDIR)/linux-prepare-patch-stamp: $(BUILDDIR)/linux-prepare-checkout-stamp @@ -203,7 +204,7 @@ $(BUILDDIR)/image-prepare-stamp: $(BUILDDIR)/image-addons-stamp: $(BUILDDIR)/image-prepare-stamp $(BUILDDIR)/fsbl-package-stamp $(BUILDDIR)/linux-compile-stamp $(addon-targets) @echo "$(COLOUR_GREEN)Copying Deb files for installation on $(BOARD)$(END_COLOUR)" - @cp /output/cvitek-fsbl-$(BOARD)-*.deb /rootfs/tmp/install/; + @cp /output/cvitek-fsbl-$(BOARD)-*.deb /rootfs/tmp/install/ @cp /output/linux-image-$(BOARD)-*.deb /rootfs/tmp/install/ @cp /output/linux-headers-*.deb /rootfs/tmp/install/ @cp /output/linux-libc-dev*.deb /rootfs/tmp/install/