From 4898be78943d02be9bcbdae2ae970a5d6c2966cb Mon Sep 17 00:00:00 2001 From: Chang Rebecca Swee Fun Date: Wed, 22 Jul 2020 10:43:39 +0000 Subject: u-boot-socfpga: move u-boot configs into include file This will provide more flexibility in selecting the configs from machine configurations and better manageability in terms of the recipe parsing and maintenance. Signed-off-by: Chang Rebecca Swee Fun --- conf/machine/agilex.conf | 1 - conf/machine/arria10.conf | 4 ---- conf/machine/arria5.conf | 2 -- conf/machine/cyclone5.conf | 8 -------- conf/machine/stratix10.conf | 1 - 5 files changed, 16 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/agilex.conf b/conf/machine/agilex.conf index 81709d0..d906153 100644 --- a/conf/machine/agilex.conf +++ b/conf/machine/agilex.conf @@ -7,7 +7,6 @@ KBUILD_DEFCONFIG ?= "defconfig" require conf/machine/include/socfpga_armv8a.inc UBOOT_CONFIG ??= "agilex-socdk" -UBOOT_CONFIG[agilex-socdk] = "socfpga_agilex_defconfig" KERNEL_DEVICETREE ?= "intel/socfpga_agilex_socdk.dtb" diff --git a/conf/machine/arria10.conf b/conf/machine/arria10.conf index 942a202..eb1367b 100644 --- a/conf/machine/arria10.conf +++ b/conf/machine/arria10.conf @@ -9,10 +9,6 @@ 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 diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf index 0110fb1..bf0b315 100644 --- a/conf/machine/arria5.conf +++ b/conf/machine/arria5.conf @@ -6,8 +6,6 @@ require conf/machine/include/socfpga.inc UBOOT_CONFIG ??= "arria5-socdk" -UBOOT_CONFIG[arria5-socdk] = "socfpga_arria5_defconfig" - KMACHINE = "arria5" # Default kernel devicetrees diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf index 728a4d8..13f5c8d 100644 --- a/conf/machine/cyclone5.conf +++ b/conf/machine/cyclone5.conf @@ -6,14 +6,6 @@ require conf/machine/include/socfpga.inc UBOOT_CONFIG ??= "cyclone5-socdk" -UBOOT_CONFIG[cyclone5-socdk] = "socfpga_cyclone5_defconfig" -UBOOT_CONFIG[de0-nano-soc] = "socfpga_de0_nano_soc_defconfig" -UBOOT_CONFIG[de10-nano-soc] = "socfpga_de10_nano_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 diff --git a/conf/machine/stratix10.conf b/conf/machine/stratix10.conf index 2a514db..4b4ad3a 100644 --- a/conf/machine/stratix10.conf +++ b/conf/machine/stratix10.conf @@ -5,7 +5,6 @@ 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" -- cgit v1.2.3-54-g00ecf