diff options
| author | Awais Belal <awais_belal@mentor.com> | 2016-11-08 18:17:28 +0500 |
|---|---|---|
| committer | Awais Belal <awais_belal@mentor.com> | 2016-11-08 18:17:32 +0500 |
| commit | b02508bcb2913dfcc98120a7351dcec729d88210 (patch) | |
| tree | 32a47c811f9d23fc8f98564d62d0e87b7553f6c0 /meta-amdfalconx86 | |
| parent | 6517f7ae1ac988ded50f3f3d86ecf1a3a90ff406 (diff) | |
| download | meta-amd-b02508bcb2913dfcc98120a7351dcec729d88210.tar.gz meta-amd-b02508bcb2913dfcc98120a7351dcec729d88210.tar.bz2 meta-amd-b02508bcb2913dfcc98120a7351dcec729d88210.zip | |
machine.conf: allow for modifications through customer layers
The machine configuration now includes a config fragment
that can be provided through customer layers. This will
help in situations where a variable can only be touched
through conf files rather than recipes one such example is
the SERIAL_CONSOLES variable.
Also pick up APPEND_ADDITIONAL which can be passed through
the same customer layer for flexibility.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Diffstat (limited to 'meta-amdfalconx86')
| -rw-r--r-- | meta-amdfalconx86/conf/machine/amdfalconx86.conf | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta-amdfalconx86/conf/machine/amdfalconx86.conf b/meta-amdfalconx86/conf/machine/amdfalconx86.conf index a24a5772..f6556ff2 100644 --- a/meta-amdfalconx86/conf/machine/amdfalconx86.conf +++ b/meta-amdfalconx86/conf/machine/amdfalconx86.conf @@ -10,6 +10,7 @@ PREFERRED_VERSION_libdrm ?= "2.4.66" require conf/machine/include/tune-amdfalconx86.inc include conf/machine/include/amd-common-configurations.inc +include conf/machine/include/amd-customer-configurations.inc # Disable GPU if RT kernel is in use XSERVER_X86_AMDGPU = "xf86-video-amd \ @@ -29,16 +30,13 @@ MACHINE_EXTRA_RRECOMMENDS += "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "", " KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "", "snd-soc-acp-pcm snd-soc-acp-rt286-mach", d)}" -# Setup a gettys on all serial ports -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyUSB0" - -# These are only needed for Bettongs where console doesn't +# Setup a getty on all serial ports +# ttyS4/ttyS5 are only needed for Bettongs where console doesn't # work on ttyS0/ttyS1 so we hope to at least get a getty running -# on ttyS4/ttyS5 -SERIAL_CONSOLES += "115200;ttyS4 115200;ttyS5" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyUSB0 115200;ttyS4 115200;ttyS5" # Enable the kernel console on ttyS0/COM0 -KERNEL_SERIAL_CONSOLE = "console=ttyS0,115200n8" +KERNEL_SERIAL_CONSOLE ?= "console=ttyS0,115200n8" # Enable powerplay APPEND += "amdgpu.powerplay=1 amdgpu.pg_mask=0" |