From ac84734859feb7db4994868dee6b74f73942380b Mon Sep 17 00:00:00 2001 From: David Phillips 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 +++++++---- files/supported-recipes-de10-nano.txt | 1 - recipes-bsp/u-boot/u-boot-socfpga_v2017.03.bb | 2 ++ recipes-images/angstrom/de10-nano-image.bb | 52 ++++++--------------------- recipes-kernel/linux/linux-yocto_5%.bbappend | 38 ++++++++++++++++++++ 5 files changed, 64 insertions(+), 50 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto_5%.bbappend 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 = "" + diff --git a/files/supported-recipes-de10-nano.txt b/files/supported-recipes-de10-nano.txt index f8c16d3..135cfc0 100644 --- a/files/supported-recipes-de10-nano.txt +++ b/files/supported-recipes-de10-nano.txt @@ -219,7 +219,6 @@ libxt@core libxtst@core libxv@core lighttpd@core -linux-altera-ltsi@meta-altera linux-firmware@core linux-firmware/iwlwifi-19@core linux-libc-headers@core diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2017.03.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2017.03.bb index 47065f8..4da4f66 100644 --- a/recipes-bsp/u-boot/u-boot-socfpga_v2017.03.bb +++ b/recipes-bsp/u-boot/u-boot-socfpga_v2017.03.bb @@ -15,6 +15,8 @@ SRCREV_FORMAT = "hardware" # Build:03-22-17_01.32.46 QUARTUS:Version=16.1.2.203 SRCREV_hardware = "d03450606b22a5f4f0d39da79fe169745ceffbec" +LICENSE = "dummy" + SRC_URI_append = "\ file://0001-arm-socfpga-Move-CONFIG_EXTRA_ENV_SETTINGS-to-common.patch \ file://0002-arm-socfpga-Update-DE0-Nano-SoC-to-support-distro-bo.patch \ diff --git a/recipes-images/angstrom/de10-nano-image.bb b/recipes-images/angstrom/de10-nano-image.bb index d14b530..454db09 100644 --- a/recipes-images/angstrom/de10-nano-image.bb +++ b/recipes-images/angstrom/de10-nano-image.bb @@ -1,68 +1,36 @@ -require recipes-images/angstrom/console-image.bb +inherit image + +#require recipes-images/angstrom/console-image.bb +LICENSE = "closed" PV = '1.0' PR = 'r0' DEPENDS += "bash perl gcc i2c-tools" +# FIXME put these in distro conf +VIRTUAL-RUNTIME_init_manager = "systemd" +VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" + IMAGE_INSTALL += " \ kernel-image \ kernel-modules \ kernel-dev \ linux-firmware \ - vim vim-vimrc \ + systemd \ gcc \ gdb gdbserver \ lighttpd \ lighttpd-module-cgi \ bash gcc i2c-tools ethtool \ - packagegroup-xfce-base \ - packagegroup-sdk-target \ - packagegroup-core-x11-xserver \ - x11vnc \ - xserver-xorg-xvfb \ - xterm \ - synergy \ - imagemagick \ - ne10 \ - ne10-dev \ - qtbase \ - bluez5 \ - epiphany \ - vim \ - gedit \ curl \ e2fsprogs \ - nodejs \ - nodejs-npm \ - mraa \ - mraa-dev \ - node-mraa \ - python-mraa \ - upm \ - upm-dev \ - node-upm \ - python-upm \ - python-multiprocessing \ - python-compiler \ - python-misc \ - packagegroup-tools-bluetooth \ - de10-nano-xfce-pointers \ - de10-nano-adxl-apps \ - de10-nano-x11vnc-init \ - de10-nano-lighttpd-conf \ - de10-nano-webcontent \ de10-nano-gpio-apps \ de10-nano-fpga-init \ de10-nano-fpga-leds \ de10-nano-usb-gadget \ - de10-nano-qt-usb-gadget-app \ de10-nano-linux-firmware \ - de10-nano-fftsw-apps \ - de10-nano-fftdriver-mod \ - de10-nano-synergy-init \ - de10-nano-xfce-init \ " - + export IMAGE_BASENAME = "de10-nano-image" diff --git a/recipes-kernel/linux/linux-yocto_5%.bbappend b/recipes-kernel/linux/linux-yocto_5%.bbappend new file mode 100644 index 0000000..a67ffc4 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_5%.bbappend @@ -0,0 +1,38 @@ +PR = "r0" + +KBUILD_DEFCONFIG ?= "socfpga_defconfig" +KBUILD_DEFCONFIG_stratix10swvp ?= "defconfig" +KBUILD_DEFCONFIG_stratix10 ?= "defconfig" +KBUILD_DEFCONFIG_10m50 ?= "10m50_defconfig" + +KCONFIG_MODE ?= "--alldefconfig" +KBUILD_DEFCONFIG ?= "socfpga_defconfig" + +COMPATIBLE_MACHINE_de10-nano = "de10-nano" + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append_de0-nano += " \ + file://socfpga-4.1-ltsi/cfg/configfs.cfg \ + file://socfpga-4.1-ltsi/cfg/gpio-keys.cfg \ + file://socfpga-4.1-ltsi/cfg/input_misc.cfg \ + file://socfpga-4.1-ltsi/cfg/led-triggers.cfg \ + file://socfpga-4.1-ltsi/cfg/usb_gadget.cfg \ + file://socfpga-4.1-ltsi/cfg/usb_vid.cfg \ + file://socfpga-4.1-ltsi/cfg/bluetooth.cfg \ + file://socfpga-4.1-ltsi/cfg/wireless.cfg \ + file://socfpga-4.1-ltsi/patches/0001-Add-DE10-Nano-devicetree.patch \ + " +SRC_URI_append_de10-nano += " \ + file://socfpga-4.1-ltsi/cfg/configfs.cfg \ + file://socfpga-4.1-ltsi/cfg/gpio-keys.cfg \ + file://socfpga-4.1-ltsi/cfg/input_misc.cfg \ + file://socfpga-4.1-ltsi/cfg/led-triggers.cfg \ + file://socfpga-4.1-ltsi/cfg/usb_gadget.cfg \ + file://socfpga-4.1-ltsi/cfg/framebuffer.cfg \ + file://socfpga-4.1-ltsi/cfg/framebuffer-console.cfg \ + file://socfpga-4.1-ltsi/cfg/usb_vid.cfg \ + file://socfpga-4.1-ltsi/cfg/bluetooth.cfg \ + file://socfpga-4.1-ltsi/cfg/wireless.cfg \ + file://socfpga-4.1-ltsi/patches/0001-Add-DE10-Nano-devicetree.patch \ + " -- cgit v1.1