summaryrefslogtreecommitdiffstats
path: root/bsp/meta-altera/conf/machine/arria10.conf
diff options
context:
space:
mode:
Diffstat (limited to 'bsp/meta-altera/conf/machine/arria10.conf')
-rw-r--r--bsp/meta-altera/conf/machine/arria10.conf14
1 files changed, 6 insertions, 8 deletions
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"