diff options
Diffstat (limited to 'bsp/meta-altera/conf/machine')
| -rw-r--r-- | bsp/meta-altera/conf/machine/10m50.conf | 2 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/agilex.conf | 25 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/arria10.conf | 14 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/arria5.conf | 4 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/cyclone5.conf | 11 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/include/socfpga.inc | 3 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/include/socfpga_armv8a.inc | 9 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/stratix10.conf | 5 | ||||
| -rw-r--r-- | bsp/meta-altera/conf/machine/stratix10swvp.conf | 39 |
9 files changed, 47 insertions, 65 deletions
diff --git a/bsp/meta-altera/conf/machine/10m50.conf b/bsp/meta-altera/conf/machine/10m50.conf index dadcbbd4..36dcf771 100644 --- a/bsp/meta-altera/conf/machine/10m50.conf +++ b/bsp/meta-altera/conf/machine/10m50.conf @@ -18,6 +18,8 @@ KERNEL_DEVICETREE = "10m50_devboard.dtb" MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" MACHINE_FEATURES = "kernel26 serial" +KBUILD_DEFCONFIG ?= "10m50_defconfig" + SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_PROVIDER_virtual/kernel ??= "linux-altera-ltsi" diff --git a/bsp/meta-altera/conf/machine/agilex.conf b/bsp/meta-altera/conf/machine/agilex.conf new file mode 100644 index 00000000..d9061534 --- /dev/null +++ b/bsp/meta-altera/conf/machine/agilex.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: Altera Agilex +#@DESCRIPTION: Layer for the Intel PSG Agilex + +KBUILD_DEFCONFIG ?= "defconfig" + +require conf/machine/include/socfpga_armv8a.inc + +UBOOT_CONFIG ??= "agilex-socdk" + +KERNEL_DEVICETREE ?= "intel/socfpga_agilex_socdk.dtb" + +SERIAL_CONSOLES ?= "115200;ttyS0" + +EXTRA_IMAGECMD_jffs2 ?= "-n -q -e 0x10000" + +# Add variables for wic creation of sdcard image +IMAGE_BOOT_FILES ?= " \ + ${UBOOT_BINARY} \ + ${KERNEL_IMAGETYPE} \ + socfpga_agilex_socdk.dtb \ + " +WKS_FILE ?= "sdimage-stratix10-agilex.wks" +IMAGE_FSTYPES += "wic" + diff --git a/bsp/meta-altera/conf/machine/arria10.conf b/bsp/meta-altera/conf/machine/arria10.conf index 249edcc6..eb1367b9 100644 --- a/bsp/meta-altera/conf/machine/arria10.conf +++ b/bsp/meta-altera/conf/machine/arria10.conf @@ -4,17 +4,11 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga ?= "v2019.07%" - SPL_BINARY = "u-boot-with-spl.sfp" -UBOOT_BINARY = "u-boot-dtb.img" +UBOOT_BINARY = "u-boot.img" UBOOT_CONFIG ??= "arria10-socdk" -UBOOT_CONFIG[arria10-socdk] = "socfpga_arria10_defconfig" -UBOOT_CONFIG[arria10-socdk-nand] = "socfpga_arria10_nand_defconfig" -UBOOT_CONFIG[arria10-socdk-qspi] = "socfpga_arria10_qspi_defconfig" - KMACHINE = "arria10" # Default kernel devicetrees @@ -23,7 +17,11 @@ KERNEL_DEVICETREE ?= "\ socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_nand.dtb \ " -EXTRA_IMAGECMD_jffs2 = "--squash -s 256 -e 64KiB" + +EXTRA_IMAGECMD_jffs2 ?= "-n -q \ + ${@bb.utils.contains("A10_IMAGE_TYPE", "NAND", "-e 0x20000 -s 0x200", "", d)} \ + ${@bb.utils.contains("A10_IMAGE_TYPE", "QSPI", "-e 0x10000", "", d)} \ + " SERIAL_CONSOLES ?= "115200;ttyS0" diff --git a/bsp/meta-altera/conf/machine/arria5.conf b/bsp/meta-altera/conf/machine/arria5.conf index 01cc58b4..bf0b3156 100644 --- a/bsp/meta-altera/conf/machine/arria5.conf +++ b/bsp/meta-altera/conf/machine/arria5.conf @@ -4,12 +4,8 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga ?= "v2019.01%" - UBOOT_CONFIG ??= "arria5-socdk" -UBOOT_CONFIG[arria5-socdk] = "socfpga_arria5_defconfig" - KMACHINE = "arria5" # Default kernel devicetrees diff --git a/bsp/meta-altera/conf/machine/cyclone5.conf b/bsp/meta-altera/conf/machine/cyclone5.conf index bee250bf..13f5c8da 100644 --- a/bsp/meta-altera/conf/machine/cyclone5.conf +++ b/bsp/meta-altera/conf/machine/cyclone5.conf @@ -4,17 +4,8 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga ?= "v2019.01%" - UBOOT_CONFIG ??= "cyclone5-socdk" -UBOOT_CONFIG[cyclone5-socdk] = "socfpga_cyclone5_defconfig" -UBOOT_CONFIG[de0-nano-soc] = "socfpga_de0_nano_soc_defconfig" -UBOOT_CONFIG[mcvevk] = "socfpga_mcvevk_defconfig" -UBOOT_CONFIG[sockit] = "socfpga_sockit_defconfig" -UBOOT_CONFIG[socrates] = "socfpga_socrates_defconfig" -UBOOT_CONFIG[sr1500] = "socfpga_sr1500_defconfig" - KMACHINE = "cyclone5" # Default kernel devicetrees @@ -47,6 +38,8 @@ IMAGE_BOOT_FILES ?= " \ extlinux.conf;extlinux/extlinux.conf \ " +EXTRA_IMAGECMD_jffs2 ?= "-e 0x10000" + WKS_FILE ?= "sdimage-cyclone5-arria5.wks" IMAGE_FSTYPES +="wic" diff --git a/bsp/meta-altera/conf/machine/include/socfpga.inc b/bsp/meta-altera/conf/machine/include/socfpga.inc index 256c0084..3b36bbcb 100644 --- a/bsp/meta-altera/conf/machine/include/socfpga.inc +++ b/bsp/meta-altera/conf/machine/include/socfpga.inc @@ -9,6 +9,7 @@ KERNEL_PROVIDER ?= "linux-altera" PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga" +PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga" # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r1" @@ -20,6 +21,8 @@ KERNEL_IMAGETYPE ?= "zImage" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_FEATURES = "kernel26" +KBUILD_DEFCONFIG ?= "socfpga_defconfig" + # file system images required IMAGE_FSTYPES ?= "cpio ext3 tar.gz jffs2" diff --git a/bsp/meta-altera/conf/machine/include/socfpga_armv8a.inc b/bsp/meta-altera/conf/machine/include/socfpga_armv8a.inc index 766b7293..40f93536 100644 --- a/bsp/meta-altera/conf/machine/include/socfpga_armv8a.inc +++ b/bsp/meta-altera/conf/machine/include/socfpga_armv8a.inc @@ -1,16 +1,19 @@ -require conf/machine/include/arm/arch-armv8.inc +require conf/machine/include/arm/arch-armv8a.inc KERNEL_PROVIDER ?= "linux-altera" PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}" KERNEL_IMAGETYPE = "Image" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" +KBUILD_DEFCONFIG ?= "defconfig" + PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga" +PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga" SPL_BINARY = "spl/u-boot-spl-dtb.hex" UBOOT_SUFFIX = "img" -UBOOT_BINARY = "u-boot-dtb.img" -UBOOT_IMAGE = "u-boot-dtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_BINARY = "u-boot.img" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" IMAGE_FSTYPES ?= "cpio ext3 tar.gz" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy virtual/kernel:do_deploy" diff --git a/bsp/meta-altera/conf/machine/stratix10.conf b/bsp/meta-altera/conf/machine/stratix10.conf index a3ca1f77..4b4ad3a0 100644 --- a/bsp/meta-altera/conf/machine/stratix10.conf +++ b/bsp/meta-altera/conf/machine/stratix10.conf @@ -5,18 +5,19 @@ require conf/machine/include/socfpga_armv8a.inc UBOOT_CONFIG ??= "stratix10-socdk" -UBOOT_CONFIG[stratix10-socdk] = "socfpga_stratix10_defconfig" KERNEL_DEVICETREE ?= "altera/socfpga_stratix10_socdk.dtb" SERIAL_CONSOLES ?= "115200;ttyS0" +EXTRA_IMAGECMD_jffs2 ?= "-n -q -e 0x10000" + # Add variables for wic creation of sdcard image IMAGE_BOOT_FILES ?= " \ ${UBOOT_BINARY} \ ${KERNEL_IMAGETYPE} \ socfpga_stratix10_socdk.dtb \ " -WKS_FILE ?= "sdimage-stratix10.wks" +WKS_FILE ?= "sdimage-stratix10-agilex.wks" IMAGE_FSTYPES += "wic" diff --git a/bsp/meta-altera/conf/machine/stratix10swvp.conf b/bsp/meta-altera/conf/machine/stratix10swvp.conf deleted file mode 100644 index c7b664fa..00000000 --- a/bsp/meta-altera/conf/machine/stratix10swvp.conf +++ /dev/null @@ -1,39 +0,0 @@ -#@TYPE: Machine -#@NAME: Altera Stratix10 SWVP -#@DESCRIPTION: Layer for the Altera Stratix10 Software Virtual Platform - -require conf/machine/include/arm/arch-armv8.inc - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" - -XSERVER ?= "xserver-xorg \ - mesa-driver-swrast \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-fbdev \ - xf86-input-keyboard" - -MACHINE_FEATURES = "" - -# Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -KERNEL_PROVIDER ?= "linux-altera" -PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}" - -KERNEL_IMAGETYPE = "Image" - -# We have to disable SERIAL_CONSOLE due to auto-serial-console -#SERIAL_CONSOLE = "115200 ttyAMA0" - -# Force auto-serial-console to be used by all image types -# Ideally this would be part of core oe or as a bbclassappend, -# but as we don't have an easy way to append a class, defining -# it here -EXTRA_IMAGE_FEATURES += "autoserial" -FEATURE_PACKAGES_autoserial = "auto-serial-console" - -# we do not want to have getty running on tty1 as we run -# auto-serial-console there -#USE_VT = "0" -IMAGE_FSTYPES ?= "cpio ext3 tar.gz" |