linux: move kernel defconfig to machine declarations

Move the defconfig declaration to the various machine
declarations, or to a common include in the machine
declaration.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>

4 files changed, 6 insertions, 4 deletions

diff --git a/conf/machine/10m50.conf b/conf/machine/10m50.conf
index dadcbbd..36dcf77 100644
--- a/conf/machine/10m50.conf
+++ b/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/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc
index f274060..3b36bbc 100644
--- a/conf/machine/include/socfpga.inc
+++ b/conf/machine/include/socfpga.inc
@@ -21,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/conf/machine/include/socfpga_armv8a.inc b/conf/machine/include/socfpga_armv8a.inc
index 150e3f2..40f9353 100644
--- a/conf/machine/include/socfpga_armv8a.inc
+++ b/conf/machine/include/socfpga_armv8a.inc
@@ -5,6 +5,8 @@ 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"
 
diff --git a/recipes-kernel/linux/linux-altera-configs.inc b/recipes-kernel/linux/linux-altera-configs.inc
index d97217c..3e4fd8b 100644
--- a/recipes-kernel/linux/linux-altera-configs.inc
+++ b/recipes-kernel/linux/linux-altera-configs.inc
@@ -1,7 +1,3 @@
 
 KBUILD_DEFCONFIG ?= "socfpga_defconfig"
-KBUILD_DEFCONFIG_stratix10swvp ?= "defconfig"
-KBUILD_DEFCONFIG_stratix10 ?= "defconfig"
-KBUILD_DEFCONFIG_10m50 ?= "10m50_defconfig"
-
 KCONFIG_MODE ?= "--alldefconfig"