summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/libpayload/Config.in3
-rw-r--r--payloads/libpayload/configs/defconfig-arm8
2 files changed, 4 insertions, 7 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index f317c180b8..bef0e05b01 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -237,7 +237,8 @@ config COREBOOT_VIDEO_CONSOLE
config PC_KEYBOARD
bool "Allow input from a PC keyboard"
- default y
+ default y if ARCH_X86 # uses IO
+ default n
config PC_KEYBOARD_LAYOUT_US
bool "English (US) keyboard layout"
diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm
index 12ad423e37..fe47d0c60d 100644
--- a/payloads/libpayload/configs/defconfig-arm
+++ b/payloads/libpayload/configs/defconfig-arm
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# libpayload version: 0.2.0
-# Wed Nov 12 14:57:03 2014
+# Tue Dec 23 15:19:30 2014
#
#
@@ -42,9 +42,7 @@ CONFIG_LP_SERIAL_CONSOLE=y
# CONFIG_LP_SERIAL_ACS_FALLBACK is not set
CONFIG_LP_VIDEO_CONSOLE=y
# CONFIG_LP_COREBOOT_VIDEO_CONSOLE is not set
-CONFIG_LP_PC_KEYBOARD=y
-CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y
-# CONFIG_LP_PC_KEYBOARD_LAYOUT_DE is not set
+# CONFIG_LP_PC_KEYBOARD is not set
#
# Drivers
@@ -70,5 +68,3 @@ CONFIG_LP_USB_GEN_HUB=y
CONFIG_LP_LITTLE_ENDIAN=y
# CONFIG_LP_IO_ADDRESS_SPACE is not set
CONFIG_LP_ARCH_SPECIFIC_OPTIONS=y
-CONFIG_LP_COREBOOT_INFO_RANGE_BASE=0x10
-CONFIG_LP_COREBOOT_INFO_RANGE_SIZE=0x4000000