From ac84734859feb7db4994868dee6b74f73942380b Mon Sep 17 00:00:00 2001 From: David Phillips <david@yeah.nah.nz> Date: Sat, 27 Jul 2019 21:36:51 +1200 Subject: Change kernel, U-Boot to stock, strip down image, add wic/wks --- conf/machine/include/de10-nano-common.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/include/de10-nano-common.inc b/conf/machine/include/de10-nano-common.inc index 72fd21a..307cd12 100644 --- a/conf/machine/include/de10-nano-common.inc +++ b/conf/machine/include/de10-nano-common.inc @@ -1,8 +1,9 @@ -PREFERRED_PROVIDER_virtual/kernel ?= "linux-altera-ltsi" -PREFERRED_VERSION_linux-altera-ltsi ?= "4.1%" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "5.0%" +#PREFERRED_VERSION_linux-altera-ltsi ?= "4.1%" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga" -PREFERRED_VERSION_u-boot-socfpga = "v2017.03%" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +#PREFERRED_VERSION_u-boot-socfpga = "v2017.03%" UBOOT_CONFIG ??= "de10-nano" UBOOT_CONFIG[de0-nano-soc] = "socfpga_de0_nano_soc_defconfig" @@ -10,15 +11,20 @@ UBOOT_CONFIG[de10-nano] = "socfpga_de10_nano_defconfig" SPL_BINARY = "u-boot-with-spl.sfp" -IMAGE_CLASSES += "sdcard_image-socfpga" +WKS_FILE = "sdimage-cyclone5-arria5.wks" -IMAGE_FSTYPES = "cpio ext3 tar.gz socfpga-sdimg" +IMAGE_CLASSES += "image_types_wic" + +IMAGE_FSTYPES = "cpio ext3 tar.gz wic.gz" IMAGE_OVERHEAD_FACTOR = "3" require conf/machine/include/socfpga.inc -SOCFPGA_SDIMG_EXTRA_FILES = "de10-nano.rbf de0-nano.rbf LICENSE.de10-nano.rbf LICENSE.de0-nano.rbf de10_nano_hdmi_config.bin dump_adv7513_edid.bin dump_adv7513_regs.bin STARTUP.BMP STARTUP.BMP.LICENSE" +#SOCFPGA_SDIMG_EXTRA_FILES = "de10-nano.rbf de0-nano.rbf LICENSE.de10-nano.rbf LICENSE.de0-nano.rbf de10_nano_hdmi_config.bin dump_adv7513_edid.bin dump_adv7513_regs.bin " + +# Favour IMAGE_BOOT_FILES because that's what WIC uses +IMAGE_BOOT_FILES = "de10-nano.rbf LICENSE.de10-nano.rbf " INHERIT += " rootfs_ipk " @@ -41,3 +47,4 @@ EXTRA_USERS_PARAMS = "usermod -p U6aMy0wojraho root;" require conf/distro/include/security_flags.inc # with security flags, some packages fail SECURITY_CFLAGS_pn-libvncserver = "" + -- cgit v1.1