Browse Source

dubhe: Honister upgrade

Removed auto.conf and porting_starfive.conf, and updated some syntax in
setup script and manifest file for Yocto Honister.

Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
Jun Yuan Tan 2 years ago
parent
commit
6d9764bee2
5 changed files with 15 additions and 153 deletions
  1. 0 69
      conf/auto.conf
  2. 1 1
      conf/layer.conf
  3. 0 71
      conf/machine/porting_starfive.conf
  4. 7 6
      setup.sh
  5. 7 6
      tools/manifests/starfive.xml

+ 0 - 69
conf/auto.conf

@@ -1,69 +0,0 @@
-MACHINE ?= "dubhe"
-#IMAGE_FEATURES += "tools-debug"
-#IMAGE_FEATURES += "tools-tweaks"
-#IMAGE_FEATURES += "dbg-pkgs"
-# rootfs for debugging
-#IMAGE_GEN_DEBUGFS = "1"
-#IMAGE_FSTYPES_DEBUGFS = "tar.gz"
-#EXTRA_IMAGE_FEATURES_append = " ssh-server-dropbear"
-EXTRA_IMAGE_FEATURES_append = " package-management"
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-USER_CLASSES ?= "buildstats buildhistory buildstats-summary image-prelink"
-
-require conf/distro/include/no-static-libs.inc
-require conf/distro/include/yocto-uninative.inc
-require conf/distro/include/security_flags.inc
-
-INHERIT += "uninative"
-
-DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam  systemd "
-##DISTRO_FEATURES_append = " largefile opengl ptest multiarch pam systemd vulkan "
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-##VIRTUAL-RUNTIME_initscripts = ""
-##VIRTUAL-RUNTIME_syslog = ""
-##VIRTUAL-RUNTIME_login_manager = "shadow-base"
-HOSTTOOLS_NONFATAL_append = " ssh"
-
-##PREFERRED_PROVIDER_base-utils = "packagegroup-core-base-utils"
-##VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
-##VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
-##VIRTUAL-RUNTIME_base-utils-syslog = ""
-
-# Use full features vim instead of vim-tiny
-##VIRTUAL-RUNTIME_vim = "vim"
-
-# We use NetworkManager instead
-##PACKAGECONFIG_remove_pn-systemd = "networkd"
-
-##SECURITY_CFLAGS_pn-opensbi = ""
-##SECURITY_LDFLAGS_pn-opensbi = ""
-
-# Add r600 drivers for AMD GPU
-##PACKAGECONFIG_append_pn-mesa = " r600"
-
-# Add support for modern AMD GPU (e.g. RX550 / POLARIS)
-#PACKAGECONFIG_append_pn-mesa = " radeonsi"
-#PACKAGECONFIG_append_pn-mesa = " gallium-llvm"
-#PACKAGECONFIG_append_pn-mesa = " va"
-#PACKAGECONFIG_append_pn-mesa = " vdpau"
-#
-#PACKAGECONFIG_append_pn-gdb = " python"
-#PACKAGECONFIG_append_pn-gdb = " tui"
-#PACKAGECONFIG_append_pn-gdb = " xz"
-#
-#PACKAGECONFIG_append_pn-elfutils = " bzip2"
-#PACKAGECONFIG_append_pn-elfutils = " xz"
-#
-#PACKAGECONFIG_append_pn-pulseaudio = " autospawn-for-root"
-#
-#QEMU_TARGETS = "riscv64 x86_64"
-#
-#CLANGSDK = "1"
-#
-#FORTRAN_forcevariable = ",fortran"
-#
-#DISTRO_NAME = "FreedomUSDK"
-#DISTRO_VERSION = "2021.05.00"
-#DISTRO_CODENAME = "2021May"

+ 1 - 1
conf/layer.conf

@@ -8,4 +8,4 @@ BBFILE_PATTERN_meta-starfive = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-starfive = "7"
 LAYERVERSION_meta-starfive = "1"
 
-LAYERSERIES_COMPAT_meta-starfive = "hardknott"
+LAYERSERIES_COMPAT_meta-starfive = "honister"

+ 0 - 71
conf/machine/porting_starfive.conf

@@ -1,71 +0,0 @@
-#@TYPE: Machine
-#@NAME: starfive-dubhe
-#@SOC: Dubhe default
-#@DESCRIPTION: Machine configuration for the beta Dubhe default config
-
-require conf/machine/include/riscv/qemuriscv.inc
-
-XVISOR_PLAT = "riscv/virt64"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-UBOOT_MACHINE = "qemu-riscv64_smode_defconfig"
-UBOOT_ELF = "u-boot"
-
-
-#require conf/machine/include/qemu.inc
-# qemuboot options
-#QB_MACHINE = "-machine virt"
-#QB_DEFAULT_KERNEL = "fw_jump.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"
-#QB_SYSTEM_NAME = "qemu-riscv64"
-
-
-require conf/machine/include/riscv/tune-riscv.inc
-
-MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
-
-#KERNEL_CLASSES = "kernel-fitimage"
-#KERNEL_IMAGETYPE = "fitImage"
-
-KERNEL_IMAGETYPE = "Image"
-KEEPUIMAGE = "no"
-INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma"
-KERNEL_IMAGETYPE += "uImage"
-
-KERNEL_IMAGETYPE = "Image"
-#UBOOT_ENV ?= "boot"
-#UBOOT_ENV_SUFFIX = "scr.uimg"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-starfive-dev"
-#PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-starfive"
-#PREFERRED_PROVIDER_virtual/bootloader = "opensbifsajdflsjflj"
-#EXTRA_IMAGEDEPENDS += "u-boot"
-EXTRA_IMAGEDEPENDS += "opensbi"
-RISCV_SBI_PLAT ?= "generic"
-RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
-#
-IMAGE_FSTYPES += "wic.gz wic.bmap ext4 cpio"
-
-#UBOOT_CONFIG = "defconfig"
-
-## Do not update fstab file when using wic images
-WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
-
-
-## wic default support
-WKS_FILE_DEPENDS ?= " \
-    opensbi \
-    e2fsprogs-native \
-    bmap-tools-native \
-"
-
-
-IMAGE_BOOT_FILES ?= " \
-    fw_payload.bin \
-    ${KERNEL_IMAGETYPE} \
-    ${RISCV_SBI_FDT}  \
-#    boot.scr.uimg \
-"
-WKS_FILE ?= "beaglev.wks"
-

+ 7 - 6
setup.sh

@@ -48,6 +48,7 @@ bitbake-layers add-layer ../meta-openembedded/meta-filesystems
 bitbake-layers add-layer ../meta-openembedded/meta-networking
 bitbake-layers add-layer ../meta-riscv
 bitbake-layers add-layer ../meta-starfive
+bitbake-layers add-layer ../meta-clang
 
 # fix the configuration
 echo "Creating auto.conf"
@@ -63,10 +64,10 @@ MACHINE ?= "${MACHINE}"
 # rootfs for debugging
 #IMAGE_GEN_DEBUGFS = "1"
 #IMAGE_FSTYPES_DEBUGFS = "tar.gz"
-#EXTRA_IMAGE_FEATURES_append = " ssh-server-dropbear"
-EXTRA_IMAGE_FEATURES_append = " package-management"
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+#EXTRA_IMAGE_FEATURES:append = " ssh-server-dropbear"
+EXTRA_IMAGE_FEATURES:append = " package-management"
+PACKAGECONFIG:append:pn-qemu-native = " sdl"
+PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
 USER_CLASSES ?= "buildstats buildhistory buildstats-summary image-prelink"
 
 require conf/distro/include/no-static-libs.inc
@@ -75,12 +76,12 @@ require conf/distro/include/security_flags.inc
 
 INHERIT += "uninative"
 
-DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam  systemd "
+DISTRO_FEATURES:append = " largefile opengl ptest multiarch wayland pam  systemd "
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 ##VIRTUAL-RUNTIME_initscripts = ""
 ##VIRTUAL-RUNTIME_syslog = ""
-HOSTTOOLS_NONFATAL_append = " ssh"
+HOSTTOOLS_NONFATAL:append = " ssh"
 
 DISTRO_NAME = "StarFive Linux SDK"
 #DISTRO_VERSION = ""

+ 7 - 6
tools/manifests/starfive.xml

@@ -4,13 +4,14 @@
   <remote name="openembedded" fetch="git://github.com/openembedded/" />
   <remote name="riscv" fetch="git://github.com/riscv/" />
   <default remote="openembedded" revision="master" />
-  <remote name="starfive" fetch="git://github.com/thloh85-starfivetech/" />
+  <remote name="starfive" fetch="git://github.com/starfive-tech/" />
+  <remote name="kraj" fetch="git://github.com/kraj" />
 
   <project name="meta-riscv" remote="riscv" 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-starfive" remote="starfive" path="meta-starfive" revision="master" />
+  <project name="openembedded-core" remote="openembedded" path="openembedded-core" revision="honister" />
+  <project name="bitbake" remote="openembedded" path="openembedded-core/bitbake" revision="1.52" />
+  <project name="meta-openembedded" remote="openembedded" path="meta-openembedded" revision="honister" />
+  <project name="meta-starfive" remote="starfive" path="meta-starfive" revision="starfive-honister" />
+  <project name="meta-clang" remote="kraj" path="meta-clang" revision="honister" />
 
 </manifest>
-