From 14d020a77a04797457b0fc63b792148ec109ceaa Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 3 Jan 2019 20:10:40 +0800 Subject: [PATCH] adjust x86/x64 target --- config/Config-images.in | 9 ++++++--- target/linux/x86/64/config-default | 1 - target/linux/x86/Makefile | 2 +- target/linux/x86/generic/config-default | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index 245aed098..e262650f4 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -18,6 +18,7 @@ menu "Target Images" default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx + default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ipq40xx default TARGET_INITRAMFS_COMPRESSION_NONE depends on TARGET_ROOTFS_INITRAMFS help @@ -227,7 +228,7 @@ menu "Target Images" config GRUB_TIMEOUT string "Seconds to wait before booting the default entry" depends on GRUB_IMAGES - default "5" + default "0" help If you don't know, 5 seconds is a reasonable default. @@ -252,15 +253,17 @@ menu "Target Images" select GRUB_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 + default y config TARGET_IMAGES_PAD bool "Pad images to filesystem size (for JFFS2)" depends on GRUB_IMAGES + default y config TARGET_IMAGES_GZIP bool "GZip images" depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86 - default y + default n comment "Image Options" @@ -275,7 +278,7 @@ menu "Target Images" config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MB)" depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_rb532 || TARGET_sunxi || TARGET_uml - default 256 + default 90 help Select the root filesystem partition size. diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default index ee14a3657..e2f7d6346 100644 --- a/target/linux/x86/64/config-default +++ b/target/linux/x86/64/config-default @@ -208,7 +208,6 @@ CONFIG_I2C_BOARDINFO=y # CONFIG_IA32_EMULATION is not set CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -CONFIG_INTEL_IDLE=y # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MENLOW is not set diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 919d88372..7985848b1 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 -FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu +FEATURES:=squashfs vdi vmdk pcmcia fpu SUBTARGETS:=64 generic legacy geode MAINTAINER:=Felix Fietkau diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default index 1e7cea801..12127e114 100644 --- a/target/linux/x86/generic/config-default +++ b/target/linux/x86/generic/config-default @@ -201,7 +201,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INTEL_GTT=y -CONFIG_INTEL_IDLE=y # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MENLOW is not set