diff options
| -rw-r--r-- | common/conf/machine/include/amd-common-configurations.inc | 2 | ||||
| -rw-r--r-- | meta-amdfalconx86/conf/machine/amdfalconx86.conf | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/conf/machine/include/amd-common-configurations.inc b/common/conf/machine/include/amd-common-configurations.inc index f4bfaf33..ea142c45 100644 --- a/common/conf/machine/include/amd-common-configurations.inc +++ b/common/conf/machine/include/amd-common-configurations.inc @@ -37,6 +37,8 @@ APPEND += "vga=802" # We use ext4 rootfs normally so give it priority rather than trying other FS first APPEND += "rootfstype=ext4,ext3,ext2" +APPEND += "${APPEND_ADDITIONAL}" + EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" # Once we switch to using the xserver-nodm-init version 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" |