From: Nicolas Thill Date: Fri, 29 Dec 2006 11:09:10 +0000 (+0000) Subject: fix uml-2.6 build with 2.6.19.1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ca4e275b70013eb410d44633cc166e805f29a931;p=openwrt%2Fstaging%2Fwigyori.git fix uml-2.6 build with 2.6.19.1 SVN-Revision: 5926 --- diff --git a/target/linux/uml-2.6/config b/target/linux/uml-2.6/config index bb26856ee1..d70ac92eb7 100644 --- a/target/linux/uml-2.6/config +++ b/target/linux/uml-2.6/config @@ -1,5 +1,5 @@ -CONFIG_3_LEVEL_PGTABLES=y -CONFIG_64BIT=y +# CONFIG_3_LEVEL_PGTABLES is not set +# CONFIG_64BIT is not set # CONFIG_6PACK is not set # CONFIG_8139CP is not set # CONFIG_9P_FS is not set @@ -15,8 +15,6 @@ CONFIG_AIRO_CS=m # CONFIG_AMIGA_PARTITION is not set # CONFIG_APPLICOM is not set CONFIG_ARCH_FLATMEM_ENABLE=y -# CONFIG_ARCH_HAS_SC_SIGNALS is not set -# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set # CONFIG_ARCNET is not set CONFIG_ARPD=y CONFIG_ASK_IP_FIB_HASH=y @@ -173,6 +171,7 @@ CONFIG_CRC_CCITT=m CONFIG_CROSSCOMPILE=y CONFIG_CRYPTO=y CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_AES_586 is not set # CONFIG_CRYPTO_AES_X86_64 is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ANUBIS=m @@ -202,25 +201,13 @@ CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TWOFISH=m +# CONFIG_CRYPTO_TWOFISH_586 is not set CONFIG_CRYPTO_TWOFISH_COMMON=m # CONFIG_CRYPTO_TWOFISH_X86_64 is not set CONFIG_CRYPTO_WP512=m # CONFIG_DAVICOM_PHY is not set -# CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_FS is not set -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_RWSEMS is not set -CONFIG_DEBUG_SLAB=y -# CONFIG_DEBUG_SLAB_LEAK is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_KERNEL is not set # CONFIG_DECNET is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_BIC is not set @@ -265,7 +252,7 @@ CONFIG_EXPORTFS=m CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4DEV_FS is not set CONFIG_FAT_DEFAULT_CODEPAGE=437 @@ -307,6 +294,7 @@ CONFIG_GENERIC_TIME=y CONFIG_HERMES=m CONFIG_HFSPLUS_FS=m CONFIG_HFS_FS=m +# CONFIG_HIGHMEM is not set # CONFIG_HIPPI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_CS=m @@ -316,6 +304,10 @@ CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PLX=m CONFIG_HOSTAUDIO=m CONFIG_HOSTFS=y +# CONFIG_HOST_VMSPLIT_1G is not set +# CONFIG_HOST_VMSPLIT_2G is not set +CONFIG_HOST_VMSPLIT_3G=y +# CONFIG_HOST_VMSPLIT_3G_OPT is not set CONFIG_HOTPLUG=y # CONFIG_HOTPLUG_PCI is not set # CONFIG_HP100 is not set @@ -416,7 +408,7 @@ CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IPV6_ROUTE_INFO is not set CONFIG_IPV6_SIT=m -CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_TUNNEL is not set CONFIG_IPW2100=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100_MONITOR=y @@ -433,7 +425,6 @@ CONFIG_IP_DCCP_ACKVEC=y CONFIG_IP_DCCP_CCID2=m # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=m -# CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_DCCP_TFRC_LIB=m CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set @@ -524,9 +515,9 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IRQ_RELEASE_METHOD=y # CONFIG_ISCSI_TCP is not set # CONFIG_ISDN is not set -CONFIG_ISO9660_FS=m +CONFIG_ISO9660_FS=y # CONFIG_IXGB is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set # CONFIG_JFFS2_CMODE_NONE is not set CONFIG_JFFS2_CMODE_PRIORITY=y @@ -567,7 +558,7 @@ CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LIBCRC32C=m CONFIG_LLC=y -# CONFIG_LLC2 is not set +CONFIG_LLC2=m CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCKD=m @@ -576,19 +567,33 @@ CONFIG_LOCKD_V4=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_LSF is not set # CONFIG_LXT_PHY is not set +# CONFIG_M386 is not set +CONFIG_M486=y +# CONFIG_M586 is not set +# CONFIG_M586MMX is not set +# CONFIG_M586TSC is not set +# CONFIG_M686 is not set # CONFIG_MAC_PARTITION is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARVELL_PHY is not set CONFIG_MCONSOLE=y +# CONFIG_MCRUSOE is not set +# CONFIG_MCYRIXIII is not set # CONFIG_MD is not set +# CONFIG_MEFFICEON is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_SAS is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set CONFIG_MII=y CONFIG_MINIX_FS=m # CONFIG_MINIX_SUBPARTITION is not set -CONFIG_MINI_FO=m +# CONFIG_MINI_FO is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set CONFIG_MKISS=m # CONFIG_MMAPPER is not set # CONFIG_MMC is not set @@ -599,8 +604,16 @@ CONFIG_MODULES=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y +# CONFIG_MVIAC3_2 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MWINCHIPC6 is not set # CONFIG_MYRI10GE is not set # CONFIG_NCP_FS is not set CONFIG_NEST_LEVEL=0 @@ -705,24 +718,26 @@ CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_NEW_LEDS=y CONFIG_NFSD=m CONFIG_NFSD_TCP=y +CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y +CONFIG_NFSD_V3_ACL=y +# CONFIG_NFSD_V4 is not set +CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y # CONFIG_NFS_DIRECTIO is not set CONFIG_NFS_FS=m CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y +CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V4 is not set # CONFIG_NFTL is not set -CONFIG_NLS=m +CONFIG_NLS=y # CONFIG_NLS_ASCII is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=m +# CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set @@ -743,7 +758,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set -CONFIG_NLS_ISO8859_15=m +# CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -752,16 +767,16 @@ CONFIG_NLS_ISO8859_15=m # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_ISO8859_9 is not set -CONFIG_NLS_KOI8_R=m +# CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m -CONFIG_NOCONFIG_CHAN=y +# CONFIG_NOCONFIG_CHAN is not set CONFIG_NORTEL_HERMES=m # CONFIG_NS83820 is not set # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_FS=m CONFIG_NTFS_RW=y -# CONFIG_NULL_CHAN is not set +CONFIG_NULL_CHAN=y # CONFIG_OCFS2_FS is not set # CONFIG_OSF_PARTITION is not set CONFIG_PACKET=y @@ -804,7 +819,7 @@ CONFIG_PPP_BSDCOMP=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_FILTER=y CONFIG_PPP_MPPE=m -# CONFIG_PPP_MULTILINK is not set +CONFIG_PPP_MULTILINK=y CONFIG_PPP_SYNC_TTY=m # CONFIG_PREEMPT is not set CONFIG_PREEMPT_NONE=y @@ -819,9 +834,12 @@ CONFIG_PROC_SYSCTL=y # CONFIG_PROFILING is not set CONFIG_PTY_CHAN=y # CONFIG_QEMU is not set +CONFIG_QFMT_V1=y +CONFIG_QFMT_V2=y # CONFIG_QLA3XXX is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_QUOTA is not set +CONFIG_QUOTA=y +CONFIG_QUOTACTL=y # CONFIG_R3964 is not set # CONFIG_R8169 is not set # CONFIG_RADIO_GEMTEK_PCI is not set @@ -836,7 +854,7 @@ CONFIG_REISERFS_FS=m # CONFIG_REISERFS_FS_XATTR is not set # CONFIG_REISERFS_PROC_INFO is not set CONFIG_RELAY=y -CONFIG_RESOURCES_64BIT=y +# CONFIG_RESOURCES_64BIT is not set # CONFIG_RFD_FTL is not set CONFIG_ROMFS_FS=m # CONFIG_ROSE is not set @@ -845,7 +863,7 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RTC_CLASS is not set CONFIG_RT_MUTEXES=y # CONFIG_RT_MUTEX_TESTER is not set -CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_S2IO is not set # CONFIG_SCHEDSTATS is not set CONFIG_SCSI=m @@ -909,14 +927,10 @@ CONFIG_SHMEM=y # CONFIG_SKY2 is not set CONFIG_SLAB=y CONFIG_SLHC=m -CONFIG_SLIP=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP is not set # CONFIG_SLOB is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_SMP_BROKEN=y CONFIG_SND=m # CONFIG_SND_AD1889 is not set # CONFIG_SND_ALI5451 is not set @@ -1005,7 +1019,7 @@ CONFIG_SOUND=m # CONFIG_SPI_MASTER is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SQUASHFS=y -# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_SQUASHFS_VMALLOC is not set # CONFIG_SSFDC is not set @@ -1017,9 +1031,9 @@ CONFIG_STANDALONE=y CONFIG_STDERR_CONSOLE=y CONFIG_STDIO_CONSOLE=y # CONFIG_STRIP is not set -CONFIG_STUB_CODE=0x7fbfffe000 -CONFIG_STUB_DATA=0x7fbffff000 -CONFIG_STUB_START=0x7fbfffe000 +CONFIG_STUB_CODE=0xbfffe000 +CONFIG_STUB_DATA=0xbffff000 +CONFIG_STUB_START=0xbfffe000 # CONFIG_SUNDANCE is not set # CONFIG_SUNGEM is not set CONFIG_SUNRPC=m @@ -1059,7 +1073,7 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TMD_HERMES=m CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set -CONFIG_TOP_ADDR=0x80000000 +CONFIG_TOP_ADDR=0xC0000000 # CONFIG_TR is not set # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set CONFIG_TTY_CHAN=y @@ -1251,11 +1265,23 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_WAN is not set # CONFIG_WAN_ROUTER is not set CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y +# CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WDTPCI is not set CONFIG_WIRELESS_EXT=y # CONFIG_WR_PPMC is not set # CONFIG_X25 is not set +CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_BSWAP=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_F00F_BUG=y +CONFIG_X86_GENERIC=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_INVLPG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_POPAD_OK=y +CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_XADD=y CONFIG_XFRM=y # CONFIG_XFRM_SUB_POLICY is not set CONFIG_XFRM_USER=m @@ -1276,5 +1302,5 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZISOFS=y CONFIG_ZISOFS_FS=m -CONFIG_ZLIB_DEFLATE=m +CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y diff --git a/target/linux/uml-2.6/config-diff b/target/linux/uml-2.6/config-diff index 0bc59aacea..7087eac084 100644 --- a/target/linux/uml-2.6/config-diff +++ b/target/linux/uml-2.6/config-diff @@ -1,7 +1,5 @@ -CONFIG_3_LEVEL_PGTABLES=y -CONFIG_64BIT=y -# CONFIG_ARCH_HAS_SC_SIGNALS is not set -# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set +# CONFIG_3_LEVEL_PGTABLES is not set +# CONFIG_64BIT is not set # CONFIG_ATM is not set CONFIG_BASE_SMALL=0 CONFIG_BINFMT_MISC=m @@ -12,22 +10,10 @@ CONFIG_BLK_DEV_UBD_SYNC=y CONFIG_CON_CHAN="xterm" CONFIG_CON_ZERO_CHAN="fd:0,fd:1" CONFIG_CRAMFS=y +# CONFIG_CRYPTO_AES_586 is not set # CONFIG_CRYPTO_AES_X86_64 is not set +# CONFIG_CRYPTO_TWOFISH_586 is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set -# CONFIG_DEBUG_DRIVER is not set -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_RWSEMS is not set -CONFIG_DEBUG_SLAB=y -# CONFIG_DEBUG_SLAB_LEAK is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_VM is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="anticipatory" @@ -37,6 +23,7 @@ CONFIG_DNOTIFY=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y # CONFIG_FORCED_INLINING is not set CONFIG_FRAME_POINTER=y CONFIG_FS_POSIX_ACL=y @@ -44,8 +31,13 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_GCOV is not set # CONFIG_GPROF is not set # CONFIG_HAMRADIO is not set +# CONFIG_HIGHMEM is not set CONFIG_HOSTAUDIO=m CONFIG_HOSTFS=y +# CONFIG_HOST_VMSPLIT_1G is not set +# CONFIG_HOST_VMSPLIT_2G is not set +CONFIG_HOST_VMSPLIT_3G=y +# CONFIG_HOST_VMSPLIT_3G_OPT is not set # CONFIG_HPPFS is not set # CONFIG_HW_RANDOM is not set # CONFIG_IFB is not set @@ -53,9 +45,9 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_INIT_ENV_ARG_LIMIT=128 CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_CFQ=y -CONFIG_IPV6_TUNNEL=m -# CONFIG_IP_DCCP_DEBUG is not set CONFIG_IRQ_RELEASE_METHOD=y +CONFIG_ISO9660_FS=y +CONFIG_JBD=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y @@ -64,46 +56,75 @@ CONFIG_LBD=y CONFIG_LD_SCRIPT_DYN=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_LLC2 is not set +# CONFIG_M386 is not set +CONFIG_M486=y +# CONFIG_M586 is not set +# CONFIG_M586MMX is not set +# CONFIG_M586TSC is not set +# CONFIG_M686 is not set # CONFIG_MAC_PARTITION is not set CONFIG_MAGIC_SYSRQ=y CONFIG_MCONSOLE=y -CONFIG_MINI_FO=m +# CONFIG_MCRUSOE is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MINI_FO is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set # CONFIG_MMAPPER is not set CONFIG_MODE_SKAS=y +# CONFIG_MPENTIUM4 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MWINCHIPC6 is not set CONFIG_NEST_LEVEL=0 # CONFIG_NET_RADIO is not set CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y # CONFIG_NET_SCH_CLK_JIFFIES is not set -CONFIG_NOCONFIG_CHAN=y -# CONFIG_NULL_CHAN is not set +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3_ACL=y +# CONFIG_NFSD_V4 is not set +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V4 is not set +CONFIG_NLS=y +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NOCONFIG_CHAN is not set +CONFIG_NULL_CHAN=y CONFIG_PORT_CHAN=y CONFIG_POSIX_MQUEUE=y -# CONFIG_PPP_MULTILINK is not set CONFIG_PTY_CHAN=y +CONFIG_QFMT_V1=y +CONFIG_QFMT_V2=y +CONFIG_QUOTA=y +CONFIG_QUOTACTL=y # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RELAY=y -CONFIG_RESOURCES_64BIT=y # CONFIG_RT_MUTEX_TESTER is not set -CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SCHEDSTATS is not set CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_SLIP=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_SLIP_SMART is not set -CONFIG_SMP_BROKEN=y CONFIG_SOFT_WATCHDOG=m # CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SSL=y CONFIG_SSL_CHAN="pty" # CONFIG_STATIC_LINK is not set CONFIG_STDERR_CONSOLE=y CONFIG_STDIO_CONSOLE=y -CONFIG_STUB_CODE=0x7fbfffe000 -CONFIG_STUB_DATA=0x7fbffff000 -CONFIG_STUB_START=0x7fbfffe000 -CONFIG_TOP_ADDR=0x80000000 +CONFIG_STUB_CODE=0xbfffe000 +CONFIG_STUB_DATA=0xbffff000 +CONFIG_STUB_START=0xbfffe000 +CONFIG_TOP_ADDR=0xC0000000 # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set CONFIG_TTY_CHAN=y CONFIG_UID16=y @@ -124,6 +145,16 @@ CONFIG_UML_X86=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_UNWIND_INFO=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_BSWAP=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_F00F_BUG=y +CONFIG_X86_GENERIC=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_INVLPG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_POPAD_OK=y +CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_XADD=y CONFIG_XTERM_CHAN=y -CONFIG_ZLIB_DEFLATE=m diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index d823f196c2..3731673e5d 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -31,9 +31,14 @@ define Build/Configure/powerpc mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc endef -KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \ +ifneq (,$(findstring uml,$(BOARD))) + KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \ + CONFIG_SHELL=$(BASH) +else + KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH=$(LINUX_KARCH) \ CONFIG_SHELL=$(BASH) +endif define Build/Configure yes '' | $(KMAKE) oldconfig