diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile | 10 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.pm | 16 |
3 files changed, 25 insertions, 5 deletions
diff --git a/target/Makefile b/target/Makefile index 91d5b2bc1..bffcabfe0 100644 --- a/target/Makefile +++ b/target/Makefile @@ -12,7 +12,7 @@ all: install # configuration when building. This is how it's done: # 1) fetch all ADK_KPACKAGE_KMOD_* vars into # .kernelconfig.modules and set them to "m", -# fetch all ADK_KERNELMOD_* vars into +# fetch all ADK_KERNEL_MOD_* vars into # .kernelconfig.modules and set them to "m" # 2) fetch all enabled ADK_KERNEL_* vars into # .kernelconfig.kernel (no conversion, as they are booleans) @@ -32,6 +32,10 @@ all: install # only if it does (so the timestamp stays intact) # 8) remove the temporary .kernelconfig.tmp ### +ADK_PACKAGE_CRYPTINIT_ROOT:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_ROOT))) +ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP))) +ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPTINIT_SWAP) resume=/dev/mapper/swapcrypt + ifeq (${ADK_TARGET_KERNEL_CUSTOMISING},y) config-prepare: $(TOPDIR)/.config @sed -n '/^ADK_KPACKAGE_KMOD/s//CONFIG/p' ${TOPDIR}/.config | \ @@ -61,6 +65,10 @@ ifneq ($(ADK_TARGET_CMDLINE),) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_TARGET_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board endif +ifneq ($(ADK_PACKAGE_CMDLINE),) + @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \ + ${BUILD_DIR}/.kernelconfig.board +endif ifeq ($(ADK_QUIET_KERNEL),y) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet"#' \ ${BUILD_DIR}/.kernelconfig.board diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index e9e735fe3..7e7d6cd9c 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -270,7 +270,7 @@ config ADK_KERNEL_BLK_DEV_MD default n config ADK_KPACKAGE_KMOD_BLK_DEV_MD - prompt "kmod-md........................... RAID support" + prompt "kmod-blk-dev-md................... RAID support" tristate depends on !ADK_KERNEL_BLK_DEV_MD select ADK_KERNEL_MD @@ -307,7 +307,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID456 help config ADK_KPACKAGE_KMOD_BLK_DEV_DM - prompt "kmod-dm........................... Device Mapper support" + prompt "kmod-blk-dev-dm................... Device Mapper support" select ADK_KERNEL_MD depends on !ADK_KERNEL_BLK_DEV_DM depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 0c59194a9..5ffd8aca9 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -43,13 +43,25 @@ config ADK_HARDWARE_ACPI Enable ACPI support. config ADK_KERNEL_SUSPEND - prompt "Enable Suspend support" + prompt "Enable Suspend-to-RAM support" boolean select ADK_KERNEL_PM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default n help - Enable Suspend-to-RAM and Suspend-to-Disk support. + Enable Suspend-to-RAM support. + +config ADK_KERNEL_HIBERNATION + prompt "Enable Suspend-to-Disk support" + boolean + select ADK_KERNEL_PM + select ADK_KERNEL_SWAP + select BUSYBOX_SWAPONOFF + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 + default n + help + Enable Suspend-to-Disk support. endmenu |