diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit
index 28a70f10e..a40889e72 100755
--- a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit	
+++ b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit	
@@ -16,6 +16,13 @@ AllowSuspend=no
 SuspendState=freeze
 EOF
 
+### Ignore power button presses for now, until we can finish up fixing sleep.
+cat <<EOF >~/.config/logind.conf.d/login.conf
+[Login]
+HandlePowerKey=ignore
+HandleSuspendKey=ignore
+EOF
+
 ### Set sound properties
 amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1'
 amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on'
diff --git a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/001-hardwareinit b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/001-hardwareinit
index 28a70f10e..a40889e72 100755
--- a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/001-hardwareinit	
+++ b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/001-hardwareinit	
@@ -16,6 +16,13 @@ AllowSuspend=no
 SuspendState=freeze
 EOF
 
+### Ignore power button presses for now, until we can finish up fixing sleep.
+cat <<EOF >~/.config/logind.conf.d/login.conf
+[Login]
+HandlePowerKey=ignore
+HandleSuspendKey=ignore
+EOF
+
 ### Set sound properties
 amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1'
 amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on'
diff --git a/projects/Amlogic/devices/S922X/options b/projects/Amlogic/devices/S922X/options
index 80b7213dd..c977415d6 100644
--- a/projects/Amlogic/devices/S922X/options
+++ b/projects/Amlogic/devices/S922X/options
@@ -69,7 +69,7 @@
     WINDOWMANAGER="weston"
   
   # kernel serial console
-    EXTRA_CMDLINE="rootwait quiet console=ttyAML0,115200n8 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0 fbcon=rotate:3"
+    EXTRA_CMDLINE="rootwait quiet console=ttyAML0,115200 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0 fbcon=rotate:3"
 
   # additional packages to install
   #  ADDITIONAL_PACKAGES=""
diff --git a/projects/Amlogic/packages/u-boot/bin/S922X/u-boot.bin b/projects/Amlogic/packages/u-boot/bin/S922X/u-boot.bin
index ad89e0d40..3e7b0956f 100755
Binary files a/projects/Amlogic/packages/u-boot/bin/S922X/u-boot.bin and b/projects/Amlogic/packages/u-boot/bin/S922X/u-boot.bin differ