From b42845f350c3f6c599b94e4f0930ae8412235ef6 Mon Sep 17 00:00:00 2001 From: Ramon Moesching Date: Mon, 18 Jun 2018 18:36:36 +0200 Subject: [PATCH] Machines: Weak assignment of defcongis Allows override from local.conf Signed-off-by: Ramon Moesching --- conf/machine/am335x-nbhw16.conf | 2 +- conf/machine/am335x-nrhw20.conf | 2 +- conf/machine/armada-385-nbhw14.conf | 2 +- conf/machine/armada-385-nbhw17.conf | 2 +- conf/machine/armada-385-nrhw18.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/am335x-nbhw16.conf b/conf/machine/am335x-nbhw16.conf index d7eecaa..c3a0944 100644 --- a/conf/machine/am335x-nbhw16.conf +++ b/conf/machine/am335x-nbhw16.conf @@ -9,7 +9,7 @@ IMAGE_CLASSES += "image_types" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG = "nbhw16_defconfig" +KERNEL_DEFCONFIG ??= "nbhw16_defconfig" KERNEL_DEVICETREE = "am335x-nbhw16.dtb \ am335x-nbhw16-prod2.dtb \ am335x-nbhw16-prod3.dtb \ diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf index f0c9659..e024b77 100644 --- a/conf/machine/am335x-nrhw20.conf +++ b/conf/machine/am335x-nrhw20.conf @@ -9,7 +9,7 @@ IMAGE_CLASSES += "image_types" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG = "am335x-nrhw20_defconfig" +KERNEL_DEFCONFIG ??= "am335x-nrhw20_defconfig" KERNEL_DEVICETREE = "am335x-nrhw20-prod1.dtb \ " KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/armada-385-nbhw14.conf b/conf/machine/armada-385-nbhw14.conf index a801b64..15377e5 100644 --- a/conf/machine/armada-385-nbhw14.conf +++ b/conf/machine/armada-385-nbhw14.conf @@ -10,7 +10,7 @@ IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG = "nbhw_defconfig" +KERNEL_DEFCONFIG ??= "nbhw_defconfig" KERNEL_DEVICETREE = "armada-385-nbhw14-prod1.dtb \ armada-385-nbhw14-prod2.dtb \ " diff --git a/conf/machine/armada-385-nbhw17.conf b/conf/machine/armada-385-nbhw17.conf index 3320ba0..4fc672e 100644 --- a/conf/machine/armada-385-nbhw17.conf +++ b/conf/machine/armada-385-nbhw17.conf @@ -10,7 +10,7 @@ IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG = "nbhw_defconfig" +KERNEL_DEFCONFIG ??= "nbhw_defconfig" KERNEL_DEVICETREE = "armada-385-nbhw17-prod1.dtb" KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf index 4013824..adb55ba 100644 --- a/conf/machine/armada-385-nrhw18.conf +++ b/conf/machine/armada-385-nrhw18.conf @@ -10,7 +10,7 @@ IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG = "armada-385-nrhw18_defconfig" +KERNEL_DEFCONFIG ??= "armada-385-nrhw18_defconfig" KERNEL_DEVICETREE = "armada-385-nrhw18-prod3.dtb" KERNEL_IMAGETYPE = "zImage"