adjust x86/x64 target

This commit is contained in:
coolsnowwolf 2019-01-03 20:10:40 +08:00
parent c1bb7cffef
commit 14d020a77a
4 changed files with 7 additions and 6 deletions

View File

@ -18,6 +18,7 @@ menu "Target Images"
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ipq40xx
default TARGET_INITRAMFS_COMPRESSION_NONE default TARGET_INITRAMFS_COMPRESSION_NONE
depends on TARGET_ROOTFS_INITRAMFS depends on TARGET_ROOTFS_INITRAMFS
help help
@ -227,7 +228,7 @@ menu "Target Images"
config GRUB_TIMEOUT config GRUB_TIMEOUT
string "Seconds to wait before booting the default entry" string "Seconds to wait before booting the default entry"
depends on GRUB_IMAGES depends on GRUB_IMAGES
default "5" default "0"
help help
If you don't know, 5 seconds is a reasonable default. If you don't know, 5 seconds is a reasonable default.
@ -252,15 +253,17 @@ menu "Target Images"
select GRUB_IMAGES select GRUB_IMAGES
select TARGET_IMAGES_PAD select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000 select PACKAGE_kmod-e1000
default y
config TARGET_IMAGES_PAD config TARGET_IMAGES_PAD
bool "Pad images to filesystem size (for JFFS2)" bool "Pad images to filesystem size (for JFFS2)"
depends on GRUB_IMAGES depends on GRUB_IMAGES
default y
config TARGET_IMAGES_GZIP config TARGET_IMAGES_GZIP
bool "GZip images" bool "GZip images"
depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86 depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86
default y default n
comment "Image Options" comment "Image Options"
@ -275,7 +278,7 @@ menu "Target Images"
config TARGET_ROOTFS_PARTSIZE config TARGET_ROOTFS_PARTSIZE
int "Root filesystem partition size (in MB)" 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 depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_rb532 || TARGET_sunxi || TARGET_uml
default 256 default 90
help help
Select the root filesystem partition size. Select the root filesystem partition size.

View File

@ -208,7 +208,6 @@ CONFIG_I2C_BOARDINFO=y
# CONFIG_IA32_EMULATION is not set # CONFIG_IA32_EMULATION is not set
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IPS is not set # CONFIG_INTEL_IPS is not set
# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_MENLOW is not set

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
ARCH:=i386 ARCH:=i386
BOARD:=x86 BOARD:=x86
BOARDNAME:=x86 BOARDNAME:=x86
FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu FEATURES:=squashfs vdi vmdk pcmcia fpu
SUBTARGETS:=64 generic legacy geode SUBTARGETS:=64 generic legacy geode
MAINTAINER:=Felix Fietkau <nbd@nbd.name> MAINTAINER:=Felix Fietkau <nbd@nbd.name>

View File

@ -201,7 +201,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
CONFIG_INTEL_GTT=y CONFIG_INTEL_GTT=y
CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IPS is not set # CONFIG_INTEL_IPS is not set
# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_MENLOW is not set