From 097f807adc5a6debdc98c0f8360fb467328c7426 Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Wed, 22 May 2019 12:14:36 -0700 Subject: Cyclone5/Arria5 machine conf cleanup -> move extlinux configuration to individual machine configs. this makes it more readable -> cleanup u-boot common configuration Signed-off-by: Dalon Westergreen --- conf/machine/arria5.conf | 23 ++++++++++++++++++++++- conf/machine/cyclone5.conf | 28 +++++++++++++++++++--------- conf/machine/include/socfpga.inc | 28 +++------------------------- 3 files changed, 44 insertions(+), 35 deletions(-) (limited to 'conf') diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf index 13c0771..01cc58b 100644 --- a/conf/machine/arria5.conf +++ b/conf/machine/arria5.conf @@ -4,7 +4,7 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga ?= "v2016.11%" +PREFERRED_VERSION_u-boot-socfpga ?= "v2019.01%" UBOOT_CONFIG ??= "arria5-socdk" @@ -17,3 +17,24 @@ KERNEL_DEVICETREE_arria5 ?= " \ socfpga_arria5_socdk.dtb \ " +SERIAL_CONSOLES ?= "115200;ttyS0" + +UBOOT_EXTLINUX ?= "1" +UBOOT_EXTLINUX_LABELS ?= "default" +UBOOT_EXTLINUX_DEFAULT_LABEL ?= "Arria5 SOCDK" + +UBOOT_EXTLINUX_FDT_default ?= "../socfpga_arria5_socdk.dtb" +UBOOT_EXTLINUX_ROOT_default ?= "root=/dev/mmcblk0p3" +UBOOT_EXTLINUX_MENU_DESCRIPTION_default ?= "Arria5 SOCDK" +UBOOT_EXTLINUX_KERNEL_IMAGE_default ?= "../${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_FDTDIR_default ?= "../" +UBOOT_EXTLINUX_KERNEL_ARGS_default ?= "rootwait rw earlycon" + +IMAGE_BOOT_FILES ?= " \ + ${KERNEL_DEVICETREE} \ + ${KERNEL_IMAGETYPE} \ + extlinux.conf;extlinux/extlinux.conf \ + " + +WKS_FILE ?= "sdimage-cyclone5-arria5.wks" +IMAGE_FSTYPES +="wic" diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf index 1a49810..c66af25 100644 --- a/conf/machine/cyclone5.conf +++ b/conf/machine/cyclone5.conf @@ -15,12 +15,6 @@ UBOOT_CONFIG[sockit] = "socfpga_sockit_defconfig" UBOOT_CONFIG[socrates] = "socfpga_socrates_defconfig" UBOOT_CONFIG[sr1500] = "socfpga_sr1500_defconfig" -# Some versions of u-boot use .bin and others use .img. -# By default we use .sfp as this is what is generated -# for Cyclone V by the U-Boot. -UBOOT_SUFFIX = "sfp" -UBOOT_BINARY = "u-boot-with-spl.${UBOOT_SUFFIX}" - KMACHINE = "cyclone5" # Default kernel devicetrees @@ -28,16 +22,32 @@ KERNEL_DEVICETREE ?= "\ socfpga_cyclone5_socdk.dtb \ socfpga_cyclone5_sockit.dtb \ socfpga_cyclone5_socrates.dtb \ - socfpga_cyclone5_de0_sockit.dtb \ + socfpga_cyclone5_de0_nano_soc.dtb \ socfpga_cyclone5_mcvevk.dtb \ socfpga_cyclone5_sodia.dtb \ socfpga_cyclone5_trcom.dtb \ socfpga_cyclone5_vining_fpga.dtb \ " +SERIAL_CONSOLES ?= "115200;ttyS0" + UBOOT_EXTLINUX ?= "1" +UBOOT_EXTLINUX_LABELS ?= "default" +UBOOT_EXTLINUX_DEFAULT_LABEL ?= "Cyclone5 SOCDK SDMMC" + UBOOT_EXTLINUX_FDT_default ?= "../socfpga_cyclone5_socdk.dtb" -IMAGE_BOOT_FILES += "extlinux.conf;extlinux/extlinux.conf" - +UBOOT_EXTLINUX_ROOT_default ?= "root=/dev/mmcblk0p3" +UBOOT_EXTLINUX_MENU_DESCRIPTION_default ?= "Cyclone5 SOCDK SDMMC" +UBOOT_EXTLINUX_KERNEL_IMAGE_default ?= "../${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_FDTDIR_default ?= "../" +UBOOT_EXTLINUX_KERNEL_ARGS_default ?= "rootwait rw earlycon" + +IMAGE_BOOT_FILES ?= " \ + ${KERNEL_DEVICETREE} \ + ${KERNEL_IMAGETYPE} \ + extlinux.conf;extlinux/extlinux.conf \ + " + +WKS_FILE ?= "sdimage-cyclone5-arria5.wks" IMAGE_FSTYPES +="wic" diff --git a/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc index 813313f..a618b87 100644 --- a/conf/machine/include/socfpga.inc +++ b/conf/machine/include/socfpga.inc @@ -16,8 +16,6 @@ MACHINE_KERNEL_PR = "r1" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -SERIAL_CONSOLE = "115200 ttyS0" - KERNEL_IMAGETYPE ?= "zImage" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_FEATURES = "kernel26" @@ -26,29 +24,9 @@ MACHINE_FEATURES = "kernel26" IMAGE_FSTYPES ?= "cpio ext3 tar.gz" # u-boot setup -UBOOT_SUFFIX = "img" - -# AV and CV uBoot + SPL mkpimage type binary -SPL_BINARY_cyclone5 = "u-boot-with-spl.sfp" -SPL_BINARY_arria5 = "u-boot-with-spl.sfp" - -# Set extlinux.conf up -UBOOT_EXTLINUX ??= "0" -UBOOT_EXTLINUX_ROOT ?= "root=/dev/mmcblk0p3" -UBOOT_EXTLINUX_LABELS ?= "default" -UBOOT_EXTLINUX_CONSOLE ?= "earlycon" -UBOOT_EXTLINUX_MENU_DESCRIPTION_default ?= "Linux Default" -UBOOT_EXTLINUX_KERNEL_IMAGE_default ?= "../${KERNEL_IMAGETYPE}" -UBOOT_EXTLINUX_FDTDIR_default ??= "../" -UBOOT_EXTLINUX_KERNEL_ARGS_default ??= "rootwait rw" - -# Add default variables for wic creation of sdcard image -IMAGE_BOOT_FILES ?= " \ - ${KERNEL_DEVICETREE} \ - ${KERNEL_IMAGETYPE} \ - " - -WKS_FILE ?= "sdimage-cyclone5-arria5.wks" +UBOOT_SUFFIX ?= "sfp" +UBOOT_BINARY ?= "u-boot-with-spl.${UBOOT_SUFFIX}" + do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy virtual/kernel:do_deploy" -- cgit v1.2.3-54-g00ecf