From 5662c664e73250ccbe9fbda93210ee3fbe4e928c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 Oct 2012 11:46:17 +0200 Subject: fix qemu mips64 big build --- target/linux/config/Config.in.kernel | 4 + target/mips/kernel64.config | 173 ++++++++++++++--------------------- target/mips/uclibc.config.big.mips64 | 11 ++- 3 files changed, 80 insertions(+), 108 deletions(-) (limited to 'target') diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index da3b800ee..2921c2386 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -103,3 +103,7 @@ config ADK_KERNEL_SUNRPC config ADK_KERNEL_PCI boolean + +config ADK_KERNEL_64BIT + boolean + default y if ADK_TARGET_KERNEL64 diff --git a/target/mips/kernel64.config b/target/mips/kernel64.config index a386b51ab..877a5ebf4 100644 --- a/target/mips/kernel64.config +++ b/target/mips/kernel64.config @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 3.5.4 Kernel Configuration +# Linux/mips 3.6.1 Kernel Configuration # CONFIG_MIPS=y # # Machine selection # +CONFIG_ZONE_DMA=y # CONFIG_MIPS_ALCHEMY is not set # CONFIG_AR7 is not set # CONFIG_ATH79 is not set @@ -18,8 +19,9 @@ CONFIG_MIPS=y # CONFIG_MACH_JZ4740 is not set # CONFIG_LANTIQ is not set # CONFIG_LASAT is not set -CONFIG_MACH_LOONGSON=y -# CONFIG_MIPS_MALTA is not set +# CONFIG_MACH_LOONGSON is not set +# CONFIG_MACH_LOONGSON1 is not set +CONFIG_MIPS_MALTA=y # CONFIG_MIPS_SIM is not set # CONFIG_NEC_MARKEINS is not set # CONFIG_MACH_VR41XX is not set @@ -52,19 +54,14 @@ CONFIG_MACH_LOONGSON=y # CONFIG_NLM_XLR_BOARD is not set # CONFIG_NLM_XLP_BOARD is not set # CONFIG_ALCHEMY_GPIO_INDIRECT is not set -# CONFIG_LEMOTE_FULOONG2E is not set -CONFIG_LEMOTE_MACH2F=y -CONFIG_CS5536=y -# CONFIG_CS5536_MFGPT is not set -CONFIG_LOONGSON_SUSPEND=y -CONFIG_LOONGSON_UART_BASE=y -CONFIG_LOONGSON_MC146818=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_BOOT_RAW=y CONFIG_CEVT_R4K_LIB=y CONFIG_CEVT_R4K=y CONFIG_CSRC_R4K_LIB=y @@ -74,57 +71,77 @@ CONFIG_DMA_NONCOHERENT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_SYS_HAS_EARLY_PRINTK=y CONFIG_I8259=y +CONFIG_MIPS_BONITO64=y +CONFIG_MIPS_MSC=y # CONFIG_MIPS_MACHINE is not set # CONFIG_NO_IOPORT is not set CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y CONFIG_ISA_DMA_API=y -CONFIG_GENERIC_GPIO=y +# CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y +CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_IRQ_CPU=y +CONFIG_IRQ_GIC=y +CONFIG_MIPS_BOARDS_GEN=y +CONFIG_PCI_GT64XXX_PCI0=y +CONFIG_SWAP_IO_SPACE=y CONFIG_BOOT_ELF32=y -CONFIG_MIPS_L1_CACHE_SHIFT=5 +CONFIG_MIPS_L1_CACHE_SHIFT=6 # # CPU selection # -CONFIG_CPU_LOONGSON2F=y -CONFIG_CPU_NOP_WORKAROUNDS=y -CONFIG_CPU_JUMP_WORKAROUNDS=y -CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y +# CONFIG_CPU_MIPS32_R1 is not set +# CONFIG_CPU_MIPS32_R2 is not set +CONFIG_CPU_MIPS64_R1=y +# CONFIG_CPU_MIPS64_R2 is not set +# CONFIG_CPU_NEVADA is not set +# CONFIG_CPU_RM7000 is not set CONFIG_SYS_SUPPORTS_ZBOOT=y -CONFIG_CPU_LOONGSON2=y -CONFIG_SYS_HAS_CPU_LOONGSON2F=y +CONFIG_SYS_HAS_CPU_MIPS32_R1=y +CONFIG_SYS_HAS_CPU_MIPS32_R2=y +CONFIG_SYS_HAS_CPU_MIPS64_R1=y +CONFIG_SYS_HAS_CPU_MIPS64_R2=y +CONFIG_SYS_HAS_CPU_NEVADA=y +CONFIG_SYS_HAS_CPU_RM7000=y +CONFIG_CPU_MIPS64=y +CONFIG_CPU_MIPSR1=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y -CONFIG_CPU_SUPPORTS_CPUFREQ=y -CONFIG_CPU_SUPPORTS_ADDRWINCFG=y -CONFIG_CPU_SUPPORTS_UNCACHED_ACCELERATED=y +CONFIG_CPU_SUPPORTS_HUGEPAGES=y +CONFIG_HARDWARE_WATCHPOINTS=y # # Kernel type # # CONFIG_32BIT is not set CONFIG_64BIT=y -CONFIG_PAGE_SIZE_16KB=y +CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_BOARD_SCACHE=y +CONFIG_MIPS_CPU_SCACHE=y +CONFIG_CPU_HAS_PREFETCH=y CONFIG_MIPS_MT_DISABLED=y +# CONFIG_MIPS_MT_SMP is not set +CONFIG_SYS_SUPPORTS_MULTITHREADING=y +# CONFIG_MIPS_VPE_LOADER is not set +# CONFIG_MIPS_CMP is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_CPU_HAS_WB=y +# CONFIG_CPU_HAS_SMARTMIPS is not set CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_SUPPORTS_HIGHMEM=y -CONFIG_SYS_SUPPORTS_HIGHMEM=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_SYS_SUPPORTS_SMARTMIPS=y +CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_STATIC=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y @@ -132,13 +149,14 @@ CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=0 +CONFIG_ZONE_DMA_FLAG=1 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set +CONFIG_SYS_SUPPORTS_MIPS_CMP=y # CONFIG_HZ_48 is not set CONFIG_HZ_100=y # CONFIG_HZ_128 is not set @@ -229,6 +247,8 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -262,6 +282,8 @@ CONFIG_HAVE_DMA_ATTRS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y # @@ -321,8 +343,9 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set -CONFIG_ISA=y +# CONFIG_PCIEPORTBUS is not set CONFIG_MMU=y +CONFIG_I8253=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set # CONFIG_RAPIDIO is not set @@ -354,6 +377,7 @@ CONFIG_PM_SLEEP=y # CONFIG_PM_RUNTIME is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set +CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_NET=y # @@ -444,7 +468,7 @@ CONFIG_WIRELESS=y # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_UEVENT_HELPER_PATH="/sbin/mdev" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set @@ -458,7 +482,6 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set # CONFIG_PARPORT is not set -# CONFIG_PNP is not set # # Misc devices @@ -481,7 +504,6 @@ CONFIG_DEVTMPFS_MOUNT=y # # Texas Instruments shared transport line discipline # -# CONFIG_TI_ST is not set # # Altera FPGA firmware download module @@ -522,9 +544,6 @@ CONFIG_NET_CORE=y # CONFIG_ETHERNET=y CONFIG_NET_VENDOR_3COM=y -# CONFIG_EL1 is not set -# CONFIG_EL3 is not set -# CONFIG_3C515 is not set # CONFIG_VORTEX is not set # CONFIG_TYPHOON is not set CONFIG_NET_VENDOR_ADAPTEC=y @@ -533,10 +552,7 @@ CONFIG_NET_VENDOR_ALTEON=y # CONFIG_ACENIC is not set CONFIG_NET_VENDOR_AMD=y # CONFIG_AMD8111_ETH is not set -# CONFIG_LANCE is not set # CONFIG_PCNET32 is not set -# CONFIG_DEPCA is not set -# CONFIG_NI65 is not set CONFIG_NET_VENDOR_ATHEROS=y # CONFIG_ATL2 is not set # CONFIG_ATL1 is not set @@ -556,14 +572,11 @@ CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_CHELSIO_T3 is not set # CONFIG_CHELSIO_T4 is not set # CONFIG_CHELSIO_T4VF is not set -CONFIG_NET_VENDOR_CIRRUS=y -# CONFIG_CS89x0 is not set CONFIG_NET_VENDOR_CISCO=y # CONFIG_ENIC is not set # CONFIG_DM9000 is not set # CONFIG_DNET is not set CONFIG_NET_VENDOR_DEC=y -# CONFIG_EWRK3 is not set # CONFIG_NET_TULIP is not set CONFIG_NET_VENDOR_DLINK=y # CONFIG_DL2K is not set @@ -573,9 +586,6 @@ CONFIG_NET_VENDOR_EMULEX=y CONFIG_NET_VENDOR_EXAR=y # CONFIG_S2IO is not set # CONFIG_VXGE is not set -CONFIG_NET_VENDOR_FUJITSU=y -# CONFIG_AT1700 is not set -# CONFIG_ETH16I is not set CONFIG_NET_VENDOR_HP=y # CONFIG_HP100 is not set CONFIG_NET_VENDOR_INTEL=y @@ -587,13 +597,6 @@ CONFIG_NET_VENDOR_INTEL=y # CONFIG_IXGB is not set # CONFIG_IXGBE is not set CONFIG_NET_VENDOR_I825XX=y -# CONFIG_ELPLUS is not set -# CONFIG_EL16 is not set -# CONFIG_APRICOT is not set -# CONFIG_EEXPRESS is not set -# CONFIG_EEXPRESS_PRO is not set -# CONFIG_LP486E is not set -# CONFIG_NI52 is not set # CONFIG_ZNET is not set # CONFIG_IP1000 is not set # CONFIG_JME is not set @@ -613,16 +616,8 @@ CONFIG_NET_VENDOR_NATSEMI=y # CONFIG_NATSEMI is not set # CONFIG_NS83820 is not set CONFIG_NET_VENDOR_8390=y -# CONFIG_EL2 is not set -# CONFIG_AC3200 is not set # CONFIG_AX88796 is not set -# CONFIG_E2100 is not set -# CONFIG_HPLAN_PLUS is not set -# CONFIG_HPLAN is not set -# CONFIG_NE2000 is not set # CONFIG_NE2K_PCI is not set -# CONFIG_ULTRA is not set -# CONFIG_WD80x3 is not set CONFIG_NET_VENDOR_NVIDIA=y # CONFIG_FORCEDETH is not set CONFIG_NET_VENDOR_OKI=y @@ -636,8 +631,6 @@ CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_NETXEN_NIC is not set -CONFIG_NET_VENDOR_RACAL=y -# CONFIG_NI5010 is not set CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set @@ -653,7 +646,6 @@ CONFIG_NET_VENDOR_SIS=y # CONFIG_SIS190 is not set # CONFIG_SFC is not set CONFIG_NET_VENDOR_SMSC=y -# CONFIG_SMC9194 is not set # CONFIG_SMC91X is not set # CONFIG_EPIC100 is not set # CONFIG_SMSC911X is not set @@ -693,6 +685,7 @@ CONFIG_PHYLIB=y # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set # CONFIG_NATIONAL_PHY is not set @@ -766,8 +759,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_TTY_PRINTK is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set -# CONFIG_RTC is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_TCG_TPM is not set @@ -793,41 +784,9 @@ CONFIG_DEVPORT=y # Enable Device Drivers -> PPS to see the PTP clock options. # CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_DEBUG_GPIO is not set -# CONFIG_GPIO_SYSFS is not set - -# -# Memory mapped GPIO drivers: -# -# CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_VX855 is not set - -# -# I2C GPIO expanders: -# - -# -# PCI GPIO expanders: -# -# CONFIG_GPIO_BT8XX is not set -# CONFIG_GPIO_ML_IOH is not set -# CONFIG_GPIO_RDC321X is not set - -# -# SPI GPIO expanders: -# - -# -# AC97 GPIO expanders: -# - -# -# MODULbus GPIO expanders: -# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set +# CONFIG_POWER_AVS is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set @@ -852,7 +811,6 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set # CONFIG_ABX500_CORE is not set -# CONFIG_MFD_TIMBERDALE is not set # CONFIG_LPC_SCH is not set # CONFIG_LPC_ICH is not set # CONFIG_MFD_RDC321X is not set @@ -883,6 +841,7 @@ CONFIG_USB_ARCH_HAS_XHCI=y # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set +CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set @@ -905,6 +864,7 @@ CONFIG_STAGING=y # CONFIG_RTLLIB is not set # CONFIG_VT6655 is not set # CONFIG_DX_SEP is not set +# CONFIG_ZSMALLOC is not set # CONFIG_CRYSTALHD is not set # CONFIG_FT1000 is not set @@ -924,6 +884,10 @@ CONFIG_STAGING=y # # Hardware Spinlock drivers # +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y CONFIG_IOMMU_SUPPORT=y # @@ -939,6 +903,7 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_MEMORY is not set # CONFIG_IIO is not set # CONFIG_VME_BUS is not set +# CONFIG_PWM is not set # # File systems @@ -971,6 +936,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_TMPFS_XATTR is not set +# CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set # CONFIG_MISC_FILESYSTEMS is not set @@ -1033,6 +999,7 @@ CONFIG_DEBUG_INFO=y # CONFIG_RCU_TRACE is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_HAVE_FUNCTION_TRACER=y @@ -1051,7 +1018,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_TEST_KSTRTOX is not set CONFIG_EARLY_PRINTK=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="init=/init" +CONFIG_CMDLINE="" # CONFIG_CMDLINE_OVERRIDE is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_RUNTIME_DEBUG is not set @@ -1091,12 +1058,12 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC8 is not set # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set -CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set # CONFIG_DDR is not set diff --git a/target/mips/uclibc.config.big.mips64 b/target/mips/uclibc.config.big.mips64 index a10b634e0..4d3abf88f 100644 --- a/target/mips/uclibc.config.big.mips64 +++ b/target/mips/uclibc.config.big.mips64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Version: 0.9.33.2 -# Fri Sep 21 10:13:47 2012 +# Sat Oct 13 11:30:23 2012 # # TARGET_alpha is not set # TARGET_arm is not set @@ -244,10 +244,11 @@ UCLIBC_BUILD_NOEXECSTACK=y # CROSS_COMPILER_PREFIX="" UCLIBC_EXTRA_CFLAGS="" -DODEBUG=y -DOASSERTS=y -SUPPORT_LD_DEBUG=y -SUPPORT_LD_DEBUG_EARLY=y +# DODEBUG is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set # UCLIBC_HAS_BACKTRACE is not set WARNINGS="-Wall" -- cgit v1.2.3