diff --git a/README.md b/README.md index 68aef28745ccdbf5859c55439d0669323df20684..202920ede2e826bda81616e750fdec254136ef26 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,7 @@ And here is a list for verified operating systems for references: | Deepin | 15.11 | 18.09.6 | Linux 4.15 | Mac OS X | 10.15.5 | 19.03.8 | Darwin 19.5.0 | Windows | 10 PRO, WSL2 | 19.03.8 | MINGW64_NT-10.0-17134 +| Manjaro | | 19.03.11 | Linux 5.8.3 Welcome to take a look at [the systems running Linux Lab](https://github.com/tinyclub/linux-lab/issues/5) and share yours, for example: @@ -1802,6 +1803,10 @@ If cpu supports, we also need to make sure it is enabled in bios features, simpl Both of the `poweroff` and `reboot` commands not work on these boards currently (LINUX=v5.1): * mipsel/malta (exclude LINUX=v2.6.36) + * mipsel/ls232 + * mipsel/ls1b + * mips64el/ls2k + * mips64el/ls3a7a * aarch64/raspi3 * arm/versatilepb diff --git a/README_zh.md b/README_zh.md index c17449b81abd73d9ad91e6554997b528f1edc1e5..8d4d561d19f01865cc3d795bf08153c98b8834c1 100644 --- a/README_zh.md +++ b/README_zh.md @@ -300,6 +300,7 @@ Linux Lab 是一套完备的嵌入式 Linux 开发环境，需要预留足够的 | Deepin | 15.11 | 18.09.6 | Linux 4.15 | Mac OS X | 10.15.5 | 19.03.8 | Darwin 19.5.0 | Windows | 10 PRO, WSL2 | 19.03.8 | MINGW64_NT-10.0-17134 +| Manjaro | | 19.03.11 | Linux 5.8.3 请查看其他同学 [成功运行过 Linux Lab 的系统](https://gitee.com/tinylab/linux-lab/issues/I1FZBJ)，并分享你的情况，例如： @@ -1851,6 +1852,10 @@ KVM 当前仅支持 `qemu-system-i386` 和 `qemu-system-x86_64`，并且还需 当前对以下开发板，基于内核版本 5.1（LINUX=v5.1），`poweroff` 和 `reboot` 命令无法正常工作： * mipsel/malta (exclude `LINUX=v2.6.36`) + * mipsel/ls1b + * mipsel/ls232 + * mips64el/ls2k + * mips64el/ls3a7a * aarch64/raspi3 * arm/versatilepb diff --git a/boards/aarch64/raspi3/bsp b/boards/aarch64/raspi3/bsp index e6c2a8da9cca9c126cf8f967617420f59c7d09b1..98f15c0cc27ec3dda3e31c9fbca952963f08ddcc 160000 --- a/boards/aarch64/raspi3/bsp +++ b/boards/aarch64/raspi3/bsp @@ -1 +1 @@ -Subproject commit e6c2a8da9cca9c126cf8f967617420f59c7d09b1 +Subproject commit 98f15c0cc27ec3dda3e31c9fbca952963f08ddcc diff --git a/boards/aarch64/virt/bsp b/boards/aarch64/virt/bsp index b2d22ae4079162cf8200e71a10170b98843a91af..24f4067de820b84705cb3e5fa7127ff516388f48 160000 --- a/boards/aarch64/virt/bsp +++ b/boards/aarch64/virt/bsp @@ -1 +1 @@ -Subproject commit b2d22ae4079162cf8200e71a10170b98843a91af +Subproject commit 24f4067de820b84705cb3e5fa7127ff516388f48 diff --git a/boards/arm/mcimx6ul-evk/bsp b/boards/arm/mcimx6ul-evk/bsp index c60b736f29cd3f2856f56c07bd7393d3f377bd2b..4f2550a3b886587fa21f10df4c02a4445f99a15a 160000 --- a/boards/arm/mcimx6ul-evk/bsp +++ b/boards/arm/mcimx6ul-evk/bsp @@ -1 +1 @@ -Subproject commit c60b736f29cd3f2856f56c07bd7393d3f377bd2b +Subproject commit 4f2550a3b886587fa21f10df4c02a4445f99a15a diff --git a/boards/arm/versatilepb/bsp b/boards/arm/versatilepb/bsp index 7251f1c002075361a9b710aacdc5a0357702bb00..2c004ce035edaf6b861294c18890b3aada60f0a6 160000 --- a/boards/arm/versatilepb/bsp +++ b/boards/arm/versatilepb/bsp @@ -1 +1 @@ -Subproject commit 7251f1c002075361a9b710aacdc5a0357702bb00 +Subproject commit 2c004ce035edaf6b861294c18890b3aada60f0a6 diff --git a/boards/arm/vexpress-a9/bsp b/boards/arm/vexpress-a9/bsp index 76b9a135db8afce9150f53f41b40525fc133bb18..8e29123cf5f5777dd4beb08230fb4a4b6dc85a3b 160000 --- a/boards/arm/vexpress-a9/bsp +++ b/boards/arm/vexpress-a9/bsp @@ -1 +1 @@ -Subproject commit 76b9a135db8afce9150f53f41b40525fc133bb18 +Subproject commit 8e29123cf5f5777dd4beb08230fb4a4b6dc85a3b diff --git a/boards/mips64el/ls2k/Makefile b/boards/mips64el/ls2k/Makefile index 07a4789e6747f0fec0033a5ff8184fd1810917b4..7644f5d4d5e8f668eaf9fdbd6b1c35ec0773c616 100644 --- a/boards/mips64el/ls2k/Makefile +++ b/boards/mips64el/ls2k/Makefile @@ -31,7 +31,7 @@ HROOTFS ?= $(BSP_ROOT)/$(BUILDROOT)/rootfs.$(FSTYPE) # From https://gitee.com/loongsonlab/qemu QEMU_GIT:= https://gitee.com/loongsonlab/qemu QEMU_SRC:= loongsonlab-qemu -QEMU ?= loongson-v1.0 +QEMU ?= loongson-v1.1 QTOOL ?= $(BSP_QEMU)/$(QEMU)/bin/qemu-system-$(XARCH) XOPTS ?= -device usb-mouse -device usb-kbd -show-cursor diff --git a/boards/mips64el/ls3a7a/Makefile b/boards/mips64el/ls3a7a/Makefile index 2bf71609014eb8d2ecb9802b5cc3b5b675b537e7..9d322e4c5e5ae194ae612e7269614335916fac02 100644 --- a/boards/mips64el/ls3a7a/Makefile +++ b/boards/mips64el/ls3a7a/Makefile @@ -35,7 +35,7 @@ HROOTFS ?= $(BSP_ROOT)/$(BUILDROOT)/rootfs.$(FSTYPE) # From https://gitee.com/loongsonlab/qemu QEMU_GIT:= https://gitee.com/loongsonlab/qemu QEMU_SRC:= loongsonlab-qemu -QEMU ?= loongson-v1.0 +QEMU ?= loongson-v1.1 QTOOL ?= $(BSP_QEMU)/$(QEMU)/bin/qemu-system-$(XARCH) XOPTS ?= -device usb-mouse -device usb-kbd -show-cursor diff --git a/boards/mipsel/ls1b/Makefile b/boards/mipsel/ls1b/Makefile index 8ee78d8cc3c92114646f8cc25de280d791bb536a..e935827b8f6871431e2b9c6245e23b2ebaabd291 100644 --- a/boards/mipsel/ls1b/Makefile +++ b/boards/mipsel/ls1b/Makefile @@ -27,7 +27,7 @@ HROOTFS ?= $(BSP_ROOT)/$(BUILDROOT)/rootfs.$(FSTYPE) # From https://gitee.com/loongsonlab/qemu QEMU_GIT:= https://gitee.com/loongsonlab/qemu QEMU_SRC:= loongsonlab-qemu -QEMU ?= loongson-v1.0 +QEMU ?= loongson-v1.1 QTOOL ?= $(BSP_QEMU)/$(QEMU)/bin/qemu-system-$(XARCH) CCORI ?= internal diff --git a/boards/mipsel/ls1b/bsp b/boards/mipsel/ls1b/bsp index 1e37426e5a255985cdcae957825877521a52f33f..424f728024d692a54ee89784f599e7dda68c9c6f 160000 --- a/boards/mipsel/ls1b/bsp +++ b/boards/mipsel/ls1b/bsp @@ -1 +1 @@ -Subproject commit 1e37426e5a255985cdcae957825877521a52f33f +Subproject commit 424f728024d692a54ee89784f599e7dda68c9c6f diff --git a/boards/mipsel/ls232/Makefile b/boards/mipsel/ls232/Makefile index 3bde91f4749b24ee67bb7611a4cecacd4db906cc..2a6d8f8a52c77d6ae0f4a46d157623fd934d3755 100644 --- a/boards/mipsel/ls232/Makefile +++ b/boards/mipsel/ls232/Makefile @@ -29,7 +29,7 @@ HROOTFS ?= $(BSP_ROOT)/$(BUILDROOT)/rootfs.$(FSTYPE) # From https://gitee.com/loongsonlab/qemu QEMU_GIT:= https://gitee.com/loongsonlab/qemu QEMU_SRC:= loongsonlab-qemu -QEMU ?= loongson-v1.0 +QEMU ?= loongson-v1.1 QTOOL ?= $(BSP_QEMU)/$(QEMU)/bin/qemu-system-$(XARCH) XOPTS ?= diff --git a/boards/mipsel/ls232/bsp b/boards/mipsel/ls232/bsp index 8d679ae4ca74d01f382435cad19e3875ffda5c49..835a0c6866e6bbf2b367f078b8096e3dfdc05ead 160000 --- a/boards/mipsel/ls232/bsp +++ b/boards/mipsel/ls232/bsp @@ -1 +1 @@ -Subproject commit 8d679ae4ca74d01f382435cad19e3875ffda5c49 +Subproject commit 835a0c6866e6bbf2b367f078b8096e3dfdc05ead diff --git a/boards/mipsel/malta/Makefile b/boards/mipsel/malta/Makefile index c86ae31f8e409b10b3edf1daf4e6f5fd99373515..08ba63e6e838a6e989e9b96d966258bd2fbcb31f 100644 --- a/boards/mipsel/malta/Makefile +++ b/boards/mipsel/malta/Makefile @@ -3,7 +3,6 @@ _BASE = 1 ARCH = mips XARCH = mipsel CPU ?= mips32r2 -#LINUX ?= v4.6.7 LINUX ?= v5.1 # FIXME: need to work with mipsel gcc 9 diff --git a/boards/mipsel/malta/bsp b/boards/mipsel/malta/bsp index ec328a9c907923956f61348d76ccdcf957680bc4..9edfe366812f985a65fc70ffa04c78aac489558a 160000 --- a/boards/mipsel/malta/bsp +++ b/boards/mipsel/malta/bsp @@ -1 +1 @@ -Subproject commit ec328a9c907923956f61348d76ccdcf957680bc4 +Subproject commit 9edfe366812f985a65fc70ffa04c78aac489558a diff --git a/boards/x86_64/pc/bsp b/boards/x86_64/pc/bsp index a1c040c22c655b469a5a49c5533485d1d28f29bf..62826c9b6397c488ccf393a2ef9383b4101af8dc 160000 --- a/boards/x86_64/pc/bsp +++ b/boards/x86_64/pc/bsp @@ -1 +1 @@ -Subproject commit a1c040c22c655b469a5a49c5533485d1d28f29bf +Subproject commit 62826c9b6397c488ccf393a2ef9383b4101af8dc diff --git a/loongsonlab-qemu b/loongsonlab-qemu new file mode 160000 index 0000000000000000000000000000000000000000..0abbd5bebb43d598fd468ac6caac844316790a4e --- /dev/null +++ b/loongsonlab-qemu @@ -0,0 +1 @@ +Subproject commit 0abbd5bebb43d598fd468ac6caac844316790a4e diff --git a/prebuilt/toolchains/mipsel/Makefile b/prebuilt/toolchains/mipsel/Makefile index eaaa9153e7b07ac22db47f22f905422a115a600a..ab2e84b9e48bb0d853975e2b7022a05b987928d4 100644 --- a/prebuilt/toolchains/mipsel/Makefile +++ b/prebuilt/toolchains/mipsel/Makefile @@ -33,6 +33,6 @@ ifeq ($(CCORI), loongnix) CCBASE ?= opt/gcc-$(CCVER)-ls232 CCPATH ?= $(TOOLCHAIN)/$(CCBASE)/bin LLPATH ?= $(TOOLCHAIN)/$(CCBASE)/i486-pc-linux-gnu/mipsel-linux/lib:$(TOOLCHAIN)/$(CCBASE)/lib:$(TOOLCHAIN)/$(CCBASE)/mipsel-linux/lib:$(TOOLCHAIN)/$(CCBASE)/sysroot/lib::$(TOOLCHAIN)/$(CCBASE)/sysroot/usr/lib - _CCBASE ?= opt/gcc-$(CCVER)-ls232 + _CCBASE ?= gcc-$(CCVER)-ls232 CCURL ?= http://ftp.loongnix.org/toolchain/gcc/release/$(_CCBASE).tar.gz endif