diff options
author | Dalon Westergreen <dwesterg@gmail.com> | 2019-10-22 13:38:00 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-12-02 11:38:17 -0800 |
commit | de7c227fbae08107782eaa0bd999f65c84585973 (patch) | |
tree | 29ef465b01372999fa5fb60be9006d6f8067300a | |
parent | 3c3702245eff439901da17591d1e172448f54fdb (diff) | |
download | meta-altera-de7c227fbae08107782eaa0bd999f65c84585973.tar.gz |
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>
-rw-r--r-- | conf/machine/10m50.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/socfpga.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/socfpga_armv8a.inc | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-altera-configs.inc | 4 |
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" | |||
18 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | 18 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" |
19 | MACHINE_FEATURES = "kernel26 serial" | 19 | MACHINE_FEATURES = "kernel26 serial" |
20 | 20 | ||
21 | KBUILD_DEFCONFIG ?= "10m50_defconfig" | ||
22 | |||
21 | SERIAL_CONSOLE = "115200 ttyS0" | 23 | SERIAL_CONSOLE = "115200 ttyS0" |
22 | 24 | ||
23 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-altera-ltsi" | 25 | 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" | |||
21 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 21 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
22 | MACHINE_FEATURES = "kernel26" | 22 | MACHINE_FEATURES = "kernel26" |
23 | 23 | ||
24 | KBUILD_DEFCONFIG ?= "socfpga_defconfig" | ||
25 | |||
24 | # file system images required | 26 | # file system images required |
25 | IMAGE_FSTYPES ?= "cpio ext3 tar.gz jffs2" | 27 | IMAGE_FSTYPES ?= "cpio ext3 tar.gz jffs2" |
26 | 28 | ||
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}" | |||
5 | KERNEL_IMAGETYPE = "Image" | 5 | KERNEL_IMAGETYPE = "Image" |
6 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" | 6 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" |
7 | 7 | ||
8 | KBUILD_DEFCONFIG ?= "defconfig" | ||
9 | |||
8 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga" | 10 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga" |
9 | PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga" | 11 | PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga" |
10 | 12 | ||
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 @@ | |||
1 | 1 | ||
2 | KBUILD_DEFCONFIG ?= "socfpga_defconfig" | 2 | KBUILD_DEFCONFIG ?= "socfpga_defconfig" |
3 | KBUILD_DEFCONFIG_stratix10swvp ?= "defconfig" | ||
4 | KBUILD_DEFCONFIG_stratix10 ?= "defconfig" | ||
5 | KBUILD_DEFCONFIG_10m50 ?= "10m50_defconfig" | ||
6 | |||
7 | KCONFIG_MODE ?= "--alldefconfig" | 3 | KCONFIG_MODE ?= "--alldefconfig" |