diff options
| author | Dalon Westergreen <dwesterg@gmail.com> | 2016-04-18 19:02:58 -0700 |
|---|---|---|
| committer | Dalon Westergreen <dwesterg@gmail.com> | 2016-04-18 19:54:20 -0700 |
| commit | eb352fc6168b382bebd4587baadaecd754c96229 (patch) | |
| tree | c77d7d310072d24f224f66002698b60e6bca6390 /conf/machine | |
| parent | b27593878e1b9b51b4b3cb36639959d4744724bd (diff) | |
| download | meta-altera-eb352fc6168b382bebd4587baadaecd754c96229.tar.gz | |
Clean up variables for uboot
-> Moved common variables to socfpga.inc
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/arria5.conf | 6 | ||||
| -rw-r--r-- | conf/machine/cyclone5.conf | 13 | ||||
| -rw-r--r-- | conf/machine/include/socfpga.inc | 9 |
3 files changed, 25 insertions, 3 deletions
diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf index 193403c..1cd460d 100644 --- a/conf/machine/arria5.conf +++ b/conf/machine/arria5.conf | |||
| @@ -4,9 +4,13 @@ | |||
| 4 | 4 | ||
| 5 | require conf/machine/include/socfpga.inc | 5 | require conf/machine/include/socfpga.inc |
| 6 | 6 | ||
| 7 | PREFERRED_VERSION_u-boot-socfpga ?= "2016.03" | 7 | PREFERRED_VERSION_u-boot-socfpga ?= "2016.03%" |
| 8 | 8 | ||
| 9 | UBOOT_CONFIG ?= "arria5-socdk" | 9 | UBOOT_CONFIG ?= "arria5-socdk" |
| 10 | 10 | ||
| 11 | UBOOT_CONFIG[arria5-socdk] = "socfpga_arria5_defconfig,sdcard" | ||
| 12 | |||
| 11 | KMACHINE = "arria5" | 13 | KMACHINE = "arria5" |
| 12 | 14 | ||
| 15 | # Default kernel devicetrees | ||
| 16 | KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb" | ||
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf index 7d0aab0..7f39d39 100644 --- a/conf/machine/cyclone5.conf +++ b/conf/machine/cyclone5.conf | |||
| @@ -4,9 +4,18 @@ | |||
| 4 | 4 | ||
| 5 | require conf/machine/include/socfpga.inc | 5 | require conf/machine/include/socfpga.inc |
| 6 | 6 | ||
| 7 | PREFERRED_VERSION_u-boot-socfpga ?= "2016.03" | 7 | PREFERRED_VERSION_u-boot-socfpga ?= "2016.03%" |
| 8 | 8 | ||
| 9 | UBOOT_CONFIG ?= "cyclone5-socdk" | 9 | UBOOT_CONFIG ??= "cyclone5-socdk" |
| 10 | |||
| 11 | UBOOT_CONFIG[cyclone5-socdk] = "socfpga_cyclone5_defconfig" | ||
| 12 | UBOOT_CONFIG[de0-nano-soc] = "socfpga_de0_nano_soc_defconfig" | ||
| 13 | UBOOT_CONFIG[mcvevk] = "socfpga_mcvevk_defconfig" | ||
| 14 | UBOOT_CONFIG[sockit] = "socfpga_sockit_defconfig" | ||
| 15 | UBOOT_CONFIG[socrates] = "socfpga_socrates_defconfig" | ||
| 16 | UBOOT_CONFIG[sr1500] = "socfpga_sr1500_defconfig" | ||
| 10 | 17 | ||
| 11 | KMACHINE = "cyclone5" | 18 | KMACHINE = "cyclone5" |
| 12 | 19 | ||
| 20 | # Default kernel devicetrees | ||
| 21 | KERNEL_DEVICETREE ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb socfpga_cyclone5_de0_sockit.dtb" | ||
diff --git a/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc index 6932620..19106a1 100644 --- a/conf/machine/include/socfpga.inc +++ b/conf/machine/include/socfpga.inc | |||
| @@ -25,3 +25,12 @@ MACHINE_FEATURES = "kernel26" | |||
| 25 | # file system images required | 25 | # file system images required |
| 26 | IMAGE_FSTYPES ?= "cpio ext3 tar.gz" | 26 | IMAGE_FSTYPES ?= "cpio ext3 tar.gz" |
| 27 | 27 | ||
| 28 | # u-boot setup | ||
| 29 | UBOOT_SUFFIX = "img" | ||
| 30 | |||
| 31 | # AV and CV uBoot + SPL mkpimage type binary | ||
| 32 | SPL_BINARY_cyclone5 = "u-boot-with-spl.sfp" | ||
| 33 | SPL_BINARY_arria5 = "u-boot-with-spl.sfp" | ||
| 34 | |||
| 35 | |||
| 36 | |||