From 884e156e1db5f92555b04bd150f64392d4c47c1c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Feb 2022 05:50:09 +0100 Subject: sipeed-maix-bit: finetune, kernel boots, but helloworld segfauts --- target/config/Config.in.rootfs | 1 + target/config/Config.in.runtime | 5 ++++- target/linux/Config.in.kernelcfg | 2 ++ target/linux/Config.in.kernelversion | 2 ++ target/riscv64/Makefile | 3 +++ target/riscv64/systems/sipeed-maix-bit | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) (limited to 'target') diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 6af38406a..80baf4d02 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -103,6 +103,7 @@ config ADK_TARGET_ROOTFS_NFSROOT !ADK_TARGET_SIM && \ !ADK_TARGET_SYSTEM_ARANYM_M68K && \ !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + depends on ADK_TARGET_WITH_NETDEVICE help Root filesystem mounted via NFS. (DHCP) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 6d17102b8..00772c15b 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -15,10 +15,12 @@ prompt "init system" depends on !ADK_APPLIANCE_TOOLCHAIN default ADK_RUNTIME_INIT_SYSV if ADK_PACKAGE_BUSYBOX default ADK_RUNTIME_INIT_SIMPLEINIT if ADK_PACKAGE_TOOLBOX +default ADK_RUNTIME_INIT_SIMPLEINIT if ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_RUNTIME_INIT_SYSV bool "Use busybox init" - depends on ADK_PACKAGE_BUSYBOX + depends on ADK_PACKAGE_BUSYBOX && \ + !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_RUNTIME_INIT_SIMPLEINIT bool "Use a very simple init" @@ -355,6 +357,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH default "ttySC0" if ADK_TARGET_SYSTEM_SIM_H8300H default "ttySC2" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 + default "ttySIF0" if ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "ttymxc1" if ADK_TARGET_SYSTEM_PHYTEC_IMX6 default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index c025a42e5..749ed430f 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -4,6 +4,7 @@ choice prompt "Kernel configuration" if !ADK_TARGET_CHOOSE_ARCH depends on ADK_TARGET_OS_LINUX +default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && ADK_TARGET_LINUX_KERNEL_VERSION_GIT default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG && ADK_TARGET_LINUX_KERNEL_VERSION_GIT @@ -47,6 +48,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F429 default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F769 + default "nommu_k210_defconfig" if ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT default "" config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 8c846c317..228ddca35 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -49,6 +49,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_10 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_FRV depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 bool "5.4.179" @@ -57,6 +58,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_FRV depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 bool "4.19.213" diff --git a/target/riscv64/Makefile b/target/riscv64/Makefile index f7d493123..1ac351bf6 100644 --- a/target/riscv64/Makefile +++ b/target/riscv64/Makefile @@ -47,6 +47,9 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-riscv64 ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif +ifeq ($(ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT),y) + @echo 'sudo python3 scripts/kflash.py -p /dev/ttyUSB0 -b 1500000 -t $(FW_DIR)/$(TARGET_KERNEL)' +endif endif ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: diff --git a/target/riscv64/systems/sipeed-maix-bit b/target/riscv64/systems/sipeed-maix-bit index 8090c9c03..3199d4a33 100644 --- a/target/riscv64/systems/sipeed-maix-bit +++ b/target/riscv64/systems/sipeed-maix-bit @@ -1,6 +1,7 @@ config ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT bool "Sipeed MAiX Bit" select ADK_TARGET_CPU_RISCV64 + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_KERNEL_IMAGE help Sipeed MAiX Bit support. -- cgit v1.2.3