diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/aarch64/Makefile | 2 | ||||
-rw-r--r-- | target/aarch64/uclibc-ng.config | 3 | ||||
-rw-r--r-- | target/arm/systems/st-stm32f746g | 1 | ||||
-rw-r--r-- | target/arm/uclibc-ng.config | 3 | ||||
-rw-r--r-- | target/config/Config.in.qemuopts | 1 | ||||
-rw-r--r-- | target/linux/Config.in.kernelcfg | 3 | ||||
-rw-r--r-- | target/linux/Config.in.kernelversion | 26 | ||||
-rw-r--r-- | target/linux/patches/dd03775ac7638ec56fb6aec35e7932755f282f60/defconfig.patch | 38 | ||||
-rw-r--r-- | target/riscv64/Makefile | 3 | ||||
-rw-r--r-- | target/riscv64/kernel/sipeed-maixduino | 9 | ||||
-rw-r--r-- | target/riscv64/systems/sipeed-maixduino | 7 |
11 files changed, 66 insertions, 30 deletions
diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index a461cf4d3..e81b4dec5 100644 --- a/target/aarch64/Makefile +++ b/target/aarch64/Makefile @@ -9,9 +9,7 @@ KERNEL:=${LINUX_DIR}/arch/arm64/boot/Image QEMU_ARGS:=${ADK_QEMU_ARGS} QEMU_ARGS+=-M virt -cpu cortex-a57 -smp 1 -ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -endif ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-device virtio-blk-device,drive=vda -drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=none,id=vda,format=raw endif diff --git a/target/aarch64/uclibc-ng.config b/target/aarch64/uclibc-ng.config index 4d75e41c8..91f23e688 100644 --- a/target/aarch64/uclibc-ng.config +++ b/target/aarch64/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.47 C Library Configuration +# uClibc-ng 1.0.51 C Library Configuration # TARGET_aarch64=y # TARGET_alpha is not set @@ -60,6 +60,7 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y DO_XSI_MATH=y +UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y diff --git a/target/arm/systems/st-stm32f746g b/target/arm/systems/st-stm32f746g index 4b87b9340..eb68dbfe4 100644 --- a/target/arm/systems/st-stm32f746g +++ b/target/arm/systems/st-stm32f746g @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F746G select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M7 select ADK_TARGET_ARCH_ARM_WITH_THUMB + select ADK_TARGET_SOFT_FLOAT select ADK_TARGET_WITH_SERIAL select ADK_TARGET_UCLINUX select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arm/uclibc-ng.config b/target/arm/uclibc-ng.config index 64accdcd0..f4b47ffaa 100644 --- a/target/arm/uclibc-ng.config +++ b/target/arm/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.47 C Library Configuration +# uClibc-ng 1.0.51 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -60,6 +60,7 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y DO_XSI_MATH=y +UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index df7128efa..177fa6756 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -40,7 +40,6 @@ depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \ || ADK_TARGET_SYSTEM_QEMU_RISCV64 \ || ADK_TARGET_SYSTEM_QEMU_CSKY \ || ADK_TARGET_SYSTEM_QEMU_X86 \ - || ADK_TARGET_SYSTEM_QEMU_AARCH64 \ || ADK_TARGET_SYSTEM_QEMU_ARC \ || ADK_TARGET_SYSTEM_QEMU_M68K_VIRT \ || ADK_TARGET_SYSTEM_QEMU_SPARC64) diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index 718731f20..facc5c9da 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -7,7 +7,7 @@ depends on ADK_TARGET_OS_LINUX default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_CPU_ARC_ARC32 default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_CPU_ARC_ARC64 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_SIPEED_MAIX_BIT +default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SIPEED_MAIXDUINO 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 @@ -57,6 +57,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F769 default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F746G default "nommu_k210_defconfig" if ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT + default "nommu_k210_defconfig" if ADK_TARGET_SYSTEM_SIPEED_MAIXDUINO default "loongson3_defconfig" if ADK_TARGET_SYSTEM_QEMU_LOONGARCH default "defconfig" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "rockpi4_defconfig" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS && ADK_TARGET_LINUX_KERNEL_VERSION_GIT diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index e07d3c03c..f9d8036df 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -5,7 +5,6 @@ choice prompt "Linux Kernel version" if !ADK_TARGET_CHOOSE_ARCH depends on ADK_TARGET_OS_LINUX default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_BOARD_BCM28XX -default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_ADSP_BF537 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_PHYTEC_WEGA @@ -38,11 +37,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT depends on !ADK_TARGET_ARCH_IA64 depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 - select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT - select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK config ADK_TARGET_LINUX_KERNEL_VERSION_6_13 bool "6.13.6" @@ -228,13 +223,9 @@ config ADK_TARGET_LINUX_KERNEL_GIT_REPO default "https://github.com/raspberrypi/linux.git" if ADK_TARGET_BOARD_BCM28XX default "git://git.code.sf.net/p/adi-linux/code" if ADK_TARGET_SYSTEM_ADSP_BF537 default "https://github.com/EmcraftSystems/linux-emcraft.git" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "https://github.com/SolidRun/linux-fslc.git" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "https://github.com/SolidRun/linux-armada38x.git" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "https://github.com/beagleboard/linux.git" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "https://git.phytec.de/git/linux-ti.git" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "https://github.com/kalray/linux_coolidge.git" if ADK_TARGET_ARCH_KVX default "https://github.com/m-labs/linux-milkymist.git" if ADK_TARGET_ARCH_LM32 - default "https://github.com/radxa/kernel.git" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" help GIT repository to use. @@ -247,12 +238,8 @@ config ADK_TARGET_LINUX_KERNEL_GIT_REPO_NAME default "lm32" if ADK_TARGET_ARCH_LM32 default "rpi" if ADK_TARGET_BOARD_BCM28XX default "ad" if ADK_TARGET_SYSTEM_ADSP_BF537 - default "bb" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "emcraft" if ADK_TARGET_SYSTEM_KINETIS_K70 default "phytec" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "clearfog" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "fslc" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "radxa" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "linus" config ADK_TARGET_LINUX_KERNEL_GIT @@ -261,25 +248,18 @@ config ADK_TARGET_LINUX_KERNEL_GIT default "f6e9dab9d1dc1e8fa2acb75504bf5ff86b885b8e" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "a320d39840745502d420f56b3d49b3723a12058f" if ADK_TARGET_BOARD_BCM28XX + default "dd03775ac7638ec56fb6aec35e7932755f282f60" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "c85fbc86c61a8c8fd45ab1fe3d1bdd2df12f7962" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "v6.6.32-ti-arm32-r7" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - default "stable-4.4-rockpi4" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "v4.4.52-phy" if ADK_TARGET_SYSTEM_PHYTEC_WEGA config ADK_TARGET_LINUX_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "6.6.74" if ADK_TARGET_BOARD_BCM28XX + default "6.12.21" if ADK_TARGET_BOARD_BCM28XX default "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 - default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS - default "6.6.32" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "3.6.0" if ADK_TARGET_SYSTEM_QEMU_LM32 default "5.8.12" if ADK_TARGET_ARCH_KVX @@ -288,8 +268,6 @@ config ADK_TARGET_LINUX_KERNEL_GIT_TYPE depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "branch" if ADK_TARGET_LINUX_ARCH_LM32 default "branch" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "branch" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS - default "branch" if ADK_TARGET_SYSTEM_BEAGLEBONE_BACK default "hash" config ADK_TARGET_LINUX_KERNEL_NO_MIRROR diff --git a/target/linux/patches/dd03775ac7638ec56fb6aec35e7932755f282f60/defconfig.patch b/target/linux/patches/dd03775ac7638ec56fb6aec35e7932755f282f60/defconfig.patch new file mode 100644 index 000000000..1bd5e00ed --- /dev/null +++ b/target/linux/patches/dd03775ac7638ec56fb6aec35e7932755f282f60/defconfig.patch @@ -0,0 +1,38 @@ +diff -Nur linux-dd03775ac7638ec56fb6aec35e7932755f282f60.orig/arch/arm64/configs/bcm2711_defconfig linux-dd03775ac7638ec56fb6aec35e7932755f282f60/arch/arm64/configs/bcm2711_defconfig +--- linux-dd03775ac7638ec56fb6aec35e7932755f282f60.orig/arch/arm64/configs/bcm2711_defconfig 2025-04-01 05:59:45.000000000 +0200 ++++ linux-dd03775ac7638ec56fb6aec35e7932755f282f60/arch/arm64/configs/bcm2711_defconfig 2025-04-01 18:37:38.341421368 +0200 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v8" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -78,8 +78,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS=y +-CONFIG_MODULE_COMPRESS_XZ=y ++# CONFIG_MODULE_COMPRESS is not set + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y +diff -Nur linux-dd03775ac7638ec56fb6aec35e7932755f282f60.orig/arch/arm64/configs/bcm2712_defconfig linux-dd03775ac7638ec56fb6aec35e7932755f282f60/arch/arm64/configs/bcm2712_defconfig +--- linux-dd03775ac7638ec56fb6aec35e7932755f282f60.orig/arch/arm64/configs/bcm2712_defconfig 2025-04-01 05:59:45.000000000 +0200 ++++ linux-dd03775ac7638ec56fb6aec35e7932755f282f60/arch/arm64/configs/bcm2712_defconfig 2025-04-01 18:37:14.313420820 +0200 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v8-16k" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -81,8 +81,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS=y +-CONFIG_MODULE_COMPRESS_XZ=y ++# CONFIG_MODULE_COMPRESS is not set + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y diff --git a/target/riscv64/Makefile b/target/riscv64/Makefile index 55134d24e..ba5a7749e 100644 --- a/target/riscv64/Makefile +++ b/target/riscv64/Makefile @@ -54,6 +54,9 @@ 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 +ifeq ($(ADK_TARGET_SYSTEM_SIPEED_MAIXDUINO),y) + @echo 'sudo python3 scripts/kflash.py -p /dev/ttyUSB0 -b 1500000 -t $(FW_DIR)/$(TARGET_KERNEL)' +endif endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: diff --git a/target/riscv64/kernel/sipeed-maixduino b/target/riscv64/kernel/sipeed-maixduino new file mode 100644 index 000000000..713afd415 --- /dev/null +++ b/target/riscv64/kernel/sipeed-maixduino @@ -0,0 +1,9 @@ +CONFIG_RISCV=y +CONFIG_SOC_CANAAN=y +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maixduino" +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_CMDLINE="earlycon console=ttySIF0" +CONFIG_CMDLINE_FORCE=y +CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/riscv64/systems/sipeed-maixduino b/target/riscv64/systems/sipeed-maixduino new file mode 100644 index 000000000..e3261d66a --- /dev/null +++ b/target/riscv64/systems/sipeed-maixduino @@ -0,0 +1,7 @@ +config ADK_TARGET_SYSTEM_SIPEED_MAIXDUINO + bool "Sipeed MAiXDUiNO" + select ADK_TARGET_CPU_RISCV64 + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_KERNEL_IMAGE + help + Sipeed MAiXDUiNO support. |