Skip to content

Commit 5e5f1a6

Browse files
committed
Finish DuoS EMMC Support
1 parent 60bf893 commit 5e5f1a6

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

configs/common/patches/u-boot/0001-enable-distroboot.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ index 12cdefac84..de5219eb49 100644
6767
+ #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run distro_bootcmd || run sdboot || run sdbootauto"
6868
#else
6969
- #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run norboot || run nandboot ||run emmcboot"
70-
+ #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run distro_bootcmd || cvi_update || run norboot || run nandboot ||run emmcboot"
70+
+ #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run distro_bootcmd || run norboot || run nandboot ||run emmcboot"
7171
#endif
7272

7373
#if defined(CONFIG_NAND_SUPPORT)

configs/duos/dts/cv181x_milkv_duos_sd.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/dts-v1/;
22
#include "cv181x_base_riscv.dtsi"
33
#include "cv181x_asic_bga.dtsi"
4-
//#include "cv181x_asic_sd.dtsi"
5-
#include "cv181x_asic_emmc.dtsi"
4+
#include "cv181x_asic_sd.dtsi"
65
#include "cv181x_default_memmap.dtsi"
76

87
#include "dt-bindings/leds/common.h"

configs/duos/u-boot/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="cv181x_asic"
55
CONFIG_IDENT_STRING=" cvitek_cv181x"
66
CONFIG_ARCH_RV64I=y
77
CONFIG_RISCV_SMODE=y
8+
CONFIG_TARGET_CVITEK_CV181X=y
89
CONFIG_DISTRO_DEFAULTS=y
910
# CONFIG_ANDROID_BOOT_IMAGE is not set
1011
CONFIG_FIT=y

configs/settings.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KERNELREV="1"
1+
KERNELREV="2"
22
FSBLVERSION=1.0.0
33
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"
44

scripts/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ _PACKAGES = $(patsubst "%,%,$(patsubst %",%,$(PACKAGES)))
2828

2929

3030
$(info $(blue)Board: $(BOARD)$(reset))
31+
$(info $(blue)Storage: $(STORAGE_TYPE)$(reset))
3132
$(info $(blue)Image Addons: $(IMAGE_ADDITIONS)$(reset))
3233
$(info $(blue)Packages: $(_PACKAGES)$(reset))
3334

@@ -37,8 +38,8 @@ NPROCS := $(shell nproc)
3738
$(BUILDDIR)/linux-prepare-checkout-stamp:
3839
@echo "$(COLOUR_GREEN)Checking out Kernel for $(BOARD)$(END_COLOUR)"
3940
@mkdir -p $(BUILDDIR)
40-
@git clone -b sg200x-dev --depth 1 https://github.com/sophgo/linux_5.10.git /build/kernel
41-
@cd $(BUILDDIR)/kernel && git checkout 25faa0d
41+
@git clone -b sg200x-dev --depth 5 https://github.com/sophgo/linux_5.10.git /build/kernel
42+
@cd $(BUILDDIR)/kernel && git checkout 8b8fbf8
4243
@touch $@
4344

4445
$(BUILDDIR)/linux-prepare-patch-stamp: $(BUILDDIR)/linux-prepare-checkout-stamp
@@ -203,7 +204,7 @@ $(BUILDDIR)/image-prepare-stamp:
203204

204205
$(BUILDDIR)/image-addons-stamp: $(BUILDDIR)/image-prepare-stamp $(BUILDDIR)/fsbl-package-stamp $(BUILDDIR)/linux-compile-stamp $(addon-targets)
205206
@echo "$(COLOUR_GREEN)Copying Deb files for installation on $(BOARD)$(END_COLOUR)"
206-
@cp /output/cvitek-fsbl-$(BOARD)-*.deb /rootfs/tmp/install/;
207+
@cp /output/cvitek-fsbl-$(BOARD)-*.deb /rootfs/tmp/install/
207208
@cp /output/linux-image-$(BOARD)-*.deb /rootfs/tmp/install/
208209
@cp /output/linux-headers-*.deb /rootfs/tmp/install/
209210
@cp /output/linux-libc-dev*.deb /rootfs/tmp/install/

0 commit comments

Comments
 (0)