Browse Source

Add ice conf, add thead-image.

等闲 3 years ago
parent
commit
e663a0b9e1

+ 0 - 22
conf/machine/baremetal-riscv32.conf

@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: generic riscv32 baremetal machine
-#@DESCRIPTION: Machine configuration for running a generic riscv32
-
-DEFAULTTUNE = "riscv32"
-require conf/machine/include/qemu.inc
-require conf/machine/include/riscv/tune-riscv.inc
-
-PREFERRED_VERSION_openocd-native = "riscv"
-PREFERRED_VERSION_openocd = "riscv"
-
-# qemuboot options
-QB_MACHINE = "-machine virt"
-QB_DEFAULT_KERNEL = "fw_payload.elf"
-QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
-QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
-QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
-
-# Prelink does not yet work
-USER_CLASSES_remove = "image-prelink"
-
-TCLIBC = "baremetal"

+ 0 - 22
conf/machine/baremetal-riscv64.conf

@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: generic riscv64 baremetal machine
-#@DESCRIPTION: Machine configuration for running a generic riscv64
-
-DEFAULTTUNE = "riscv64"
-require conf/machine/include/qemu.inc
-require conf/machine/include/riscv/tune-riscv.inc
-
-PREFERRED_VERSION_openocd-native = "riscv"
-PREFERRED_VERSION_openocd = "riscv"
-
-# qemuboot options
-QB_MACHINE = "-machine virt"
-QB_DEFAULT_KERNEL = "fw_payload.elf"
-QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
-QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
-QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
-
-# Prelink does not yet work
-USER_CLASSES_remove = "image-prelink"
-
-TCLIBC = "baremetal"

+ 1 - 1
conf/machine/qemu64.conf → conf/machine/ice.conf

@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: qemu64
+#@NAME: xuantie
 #@SOC: XuanTie Light
 #@DESCRIPTION: Machine configuration for the HiFive Unleashed development board
 

+ 0 - 17
conf/machine/qemuriscv32.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: generic riscv32 machine
-#@DESCRIPTION: Machine configuration for running a generic riscv32
-
-require conf/machine/include/riscv/qemuriscv.inc
-
-DEFAULTTUNE = "riscv32"
-
-PREFERRED_VERSION_openocd-native = "riscv"
-PREFERRED_VERSION_openocd = "riscv"
-
-XVISOR_PLAT = "riscv/virt32"
-
-# u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules"
-# EXTRA_IMAGEDEPENDS += "u-boot"
-# UBOOT_MACHINE = "qemu-riscv32_smode_defconfig"
-# UBOOT_ELF = "u-boot"

+ 13 - 0
recipes-core/images/thead-image.bb

@@ -0,0 +1,13 @@
+SUMMARY = "A very basic Wayland image with a terminal"
+
+
+IMAGE_FEATURES += "package-management ssh-server-dropbear hwcodecs"
+
+CORE_IMAGE_EXTRA_INSTALL += "\
+    packagegroup-core-boot \
+    packagegroup-core-full-cmdline \
+    "
+
+CORE_IMAGE_EXTRA_INSTALL += "vim python3"
+
+inherit core-image

+ 4 - 4
setup.sh

@@ -36,10 +36,10 @@ export BASH_SOURCE="openembedded-core/oe-init-build-env"
 
 # add the missing layers
 echo "Adding layers"
-#bitbake-layers add-layer ../meta-openembedded/meta-oe
-#bitbake-layers add-layer ../meta-openembedded/meta-python
-#bitbake-layers add-layer ../meta-openembedded/meta-multimedia
-#bitbake-layers add-layer ../meta-openembedded/meta-networking
+bitbake-layers add-layer ../meta-openembedded/meta-oe
+bitbake-layers add-layer ../meta-openembedded/meta-python
+bitbake-layers add-layer ../meta-openembedded/meta-multimedia
+bitbake-layers add-layer ../meta-openembedded/meta-networking
 bitbake-layers add-layer ../meta-external-toolchain
 bitbake-layers add-layer ../meta-riscv
 

+ 5 - 5
tools/manifests/riscv-yocto.xml

@@ -6,11 +6,11 @@
   <default remote="aone" revision="master" />
   
 
-  <project name="meta-riscv" remote="openembedded" path="meta-riscv" revision="master" />
-  <project name="openembedded-core" remote="openembedded" path="openembedded-core" revision="master" />
-  <project name="bitbake" remote="openembedded" path="openembedded-core/bitbake" revision="master" />
-  <project name="meta-openembedded" remote="openembedded" path="meta-openembedded" revision="master" />
-  <project name="meta-external-toolchain" remote="openembedded" path="meta-external-toolchain" revision="master" />
+  <project name="meta-riscv" remote="aone" path="meta-riscv" revision="master" />
+  <project name="openembedded-core" remote="aone" path="openembedded-core" revision="master" />
+  <project name="bitbake" remote="aone" path="openembedded-core/bitbake" revision="master" />
+  <project name="meta-openembedded" remote="aone" path="meta-openembedded" revision="master" />
+  <project name="meta-external-toolchain" remote="aone" path="meta-external-toolchain" revision="master" />
 
 </manifest>