From: nynex Date: Tue, 12 May 2015 12:50:29 +0000 (+0000) Subject: rm old x86 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98804cf9a31851d1f3dffa26914c2d80326f192a;p=librecmc%2Flibrecmc-fossil.git rm old x86 --- diff --git a/trunk/package/base-files/files/etc/banner b/trunk/package/base-files/files/etc/banner index 4a53134f..03ea1c02 100644 --- a/trunk/package/base-files/files/etc/banner +++ b/trunk/package/base-files/files/etc/banner @@ -4,4 +4,4 @@ | | | '_ \ '_/ -_)| |__ | | | || |__ |_|_|_.__/_| \___||____||_|_|_||____| ----------------------------------------- - Elegant Eleanor Version 1.3 + Elegant Eleanor Version 1.3.1 diff --git a/trunk/package/base-files/image-config.in b/trunk/package/base-files/image-config.in index eb956069..b7b0f9ec 100644 --- a/trunk/package/base-files/image-config.in +++ b/trunk/package/base-files/image-config.in @@ -163,7 +163,7 @@ if VERSIONOPT config VERSION_NUMBER string prompt "Release version number" - default "v1.3" + default "v1.3.1" help This is the release version number embedded in the image. If unspecified, it defaults to the svn or git-svn revision diff --git a/trunk/target/linux/x86/64/config-default b/trunk/target/linux/x86/64/config-default deleted file mode 100644 index db254409..00000000 --- a/trunk/target/linux/x86/64/config-default +++ /dev/null @@ -1,216 +0,0 @@ -CONFIG_64BIT=y -CONFIG_ACPI=y -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y -# CONFIG_ACPI_CMPC is not set -# CONFIG_ACPI_CONTAINER is not set -# CONFIG_ACPI_CUSTOM_DSDT is not set -# CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_DOCK is not set -# CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_FAN=y -# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y -# CONFIG_ACPI_PCI_SLOT is not set -CONFIG_ACPI_PROCESSOR=y -# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set -# CONFIG_ACPI_PROCFS_POWER is not set -# CONFIG_ACPI_SBS is not set -CONFIG_ACPI_THERMAL=y -# CONFIG_ACPI_WMI is not set -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" -CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SUPPORTS_INT128=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -# CONFIG_ASUS_LAPTOP is not set -# CONFIG_ATA_SFF is not set -CONFIG_AUDIT_ARCH=y -CONFIG_AVERAGE=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_CALGARY_IOMMU=y -CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -CONFIG_CPU_RMAP=y -CONFIG_CRC_T10DIF=y -# CONFIG_CRYPTO_AES_X86_64 is not set -# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set -# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set -# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set -# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set -# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set -CONFIG_CRYPTO_CRCT10DIF=y -# CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set -# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set -# CONFIG_CRYPTO_SALSA20_X86_64 is not set -# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set -# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set -# CONFIG_CRYPTO_SHA1_MB is not set -# CONFIG_CRYPTO_SHA1_SSSE3 is not set -# CONFIG_CRYPTO_SHA256_SSSE3 is not set -# CONFIG_CRYPTO_SHA512_SSSE3 is not set -# CONFIG_CRYPTO_SKEIN is not set -# CONFIG_CRYPTO_THREEFISH is not set -# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set -# CONFIG_CRYPTO_TWOFISH_X86_64 is not set -# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set -CONFIG_DIRECT_GBPAGES=y -# CONFIG_EFI is not set -CONFIG_FB=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_VESA is not set -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -CONFIG_FONT_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_GART_IOMMU=y -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_GENERIC_CPU=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_HAVE_ACPI_APEI=y -CONFIG_HAVE_ACPI_APEI_NMI=y -# CONFIG_HAVE_AOUT is not set -CONFIG_HAVE_ARCH_SOFT_DIRTY=y -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_FENTRY=y -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HID=y -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -# CONFIG_HP_ACCEL is not set -CONFIG_HW_RANDOM_INTEL=y -# CONFIG_HW_RANDOM_VIRTIO is not set -CONFIG_HYPERVISOR_GUEST=y -# CONFIG_I7300_IDLE is not set -# CONFIG_IA32_EMULATION is not set -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -# CONFIG_INTEL_IPS is not set -# CONFIG_INTEL_MENLOW is not set -# CONFIG_INTEL_MIC_BUS is not set -# CONFIG_IOMMU_DEBUG is not set -CONFIG_IOMMU_HELPER=y -# CONFIG_ISCSI_IBFT_FIND is not set -# CONFIG_ITCO_VENDOR_SUPPORT is not set -CONFIG_ITCO_WDT=y -# CONFIG_KVM_DEBUG_FS is not set -CONFIG_KVM_GUEST=y -CONFIG_LPC_ICH=y -# CONFIG_MAXSMP is not set -CONFIG_MEMORY_BALLOON=y -# CONFIG_MEMORY_HOTPLUG is not set -CONFIG_MFD_CORE=y -CONFIG_MODULES_USE_ELF_RELA=y -# CONFIG_MPSC is not set -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NLS=y -CONFIG_NR_CPUS=8 -# CONFIG_NUMA is not set -CONFIG_OUTPUT_FORMAT="elf64-x86-64" -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_PARAVIRT_SPINLOCKS is not set -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_PCIEAER=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCI_IOAPIC is not set -CONFIG_PCI_LABEL=y -# CONFIG_PCI_MMCONFIG is not set -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_PNP=y -CONFIG_PNPACPI=y -CONFIG_PNP_DEBUG_MESSAGES=y -# CONFIG_PVPANIC is not set -CONFIG_QUEUE_RWLOCK=y -CONFIG_RAS=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -# CONFIG_SAMSUNG_Q10 is not set -CONFIG_SATA_AHCI=y -CONFIG_SCSI_VIRTIO=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SMP=y -CONFIG_SPARSEMEM=y -CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_MANUAL=y -# CONFIG_SPARSEMEM_VMEMMAP is not set -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_STOP_MACHINE=y -CONFIG_SWIOTLB=y -# CONFIG_THINKPAD_ACPI is not set -# CONFIG_TOPSTAR_LAPTOP is not set -# CONFIG_TOSHIBA_BT_RFKILL is not set -CONFIG_TREE_RCU=y -# CONFIG_UNISYSSPAR is not set -CONFIG_USB=y -CONFIG_USB_COMMON=y -CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -CONFIG_USB_EHCI_PCI=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PCI=y -# CONFIG_USB_OHCI_HCD_PLATFORM is not set -CONFIG_USB_STORAGE=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PCI=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_VIRTIO=y -CONFIG_VIRTIO_BALLOON=y -# CONFIG_VIRTIO_BLK is not set -# CONFIG_VIRTIO_CONSOLE is not set -CONFIG_VIRTIO_MMIO=y -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VMWARE_BALLOON=y -CONFIG_VMWARE_PVSCSI=y -CONFIG_VMWARE_VMCI=y -CONFIG_VMWARE_VMCI_VSOCKETS=y -CONFIG_VMXNET3=y -CONFIG_VSOCKETS=y -CONFIG_WATCHDOG_CORE=y -CONFIG_X86_64=y -CONFIG_X86_64_SMP=y -# CONFIG_X86_ACPI_CPUFREQ is not set -CONFIG_X86_CMOV=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_X86_DEV_DMA_OPS=y -CONFIG_X86_HT=y -# CONFIG_X86_INTEL_LPSS is not set -CONFIG_X86_MINIMUM_CPU_FAMILY=64 -# CONFIG_X86_MSR is not set -# CONFIG_X86_PCC_CPUFREQ is not set -CONFIG_X86_PM_TIMER=y -CONFIG_X86_TSC=y -# CONFIG_XEN is not set -CONFIG_XPS=y -CONFIG_ZONE_DMA32=y diff --git a/trunk/target/linux/x86/64/target.mk b/trunk/target/linux/x86/64/target.mk deleted file mode 100644 index ac636b77..00000000 --- a/trunk/target/linux/x86/64/target.mk +++ /dev/null @@ -1,9 +0,0 @@ -ARCH:=x86_64 -BOARDNAME:=x86_64 -DEFAULT_PACKAGES += kmod-e1000 kmod-r8169 -ARCH_PACKAGES:=x86_64 -MAINTAINER:=Imre Kaloz - -define Target/Description - Build images for 64 bit systems including virtualized guests. -endef diff --git a/trunk/target/linux/x86/Makefile b/trunk/target/linux/x86/Makefile deleted file mode 100644 index ba733c02..00000000 --- a/trunk/target/linux/x86/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -ARCH:=i386 -BOARD:=x86 -BOARDNAME:=x86 -FEATURES:=squashfs ext4 vdi vmdk pcmcia targz -SUBTARGETS=generic xen_domu ep80579 geode kvm_guest rdc 64 -MAINTAINER:=Felix Fietkau - -KERNEL_PATCHVER:=3.18 - -KERNELNAME:=bzImage - -include $(INCLUDE_DIR)/target.mk - -$(eval $(call BuildTarget)) - -$(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \ - Please install mkisofs. \ -)) diff --git a/trunk/target/linux/x86/base-files/etc/config/network b/trunk/target/linux/x86/base-files/etc/config/network deleted file mode 100644 index c9953a02..00000000 --- a/trunk/target/linux/x86/base-files/etc/config/network +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config interface loopback - option ifname lo - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - -config interface lan - option ifname eth0 - option type bridge - option proto static - option ipaddr 192.168.1.1 - option netmask 255.255.255.0 - option ip6assign 60 - -config interface wan - option ifname eth1 - option proto dhcp - -config interface wan6 - option ifname eth1 - option proto dhcpv6 - -config globals globals - option ula_prefix auto diff --git a/trunk/target/linux/x86/base-files/etc/inittab b/trunk/target/linux/x86/base-files/etc/inittab deleted file mode 100644 index ca90fd8a..00000000 --- a/trunk/target/linux/x86/base-files/etc/inittab +++ /dev/null @@ -1,4 +0,0 @@ -::sysinit:/etc/init.d/rcS S boot -::shutdown:/etc/init.d/rcS K shutdown -ttyS0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login diff --git a/trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 b/trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 deleted file mode 100644 index 5d545309..00000000 --- a/trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications - -do_mount_procfs() { - mount -o noatime -t proc none /proc -} - diff --git a/trunk/target/linux/x86/base-files/lib/preinit/20_check_iso b/trunk/target/linux/x86/base-files/lib/preinit/20_check_iso deleted file mode 100644 index beff6eba..00000000 --- a/trunk/target/linux/x86/base-files/lib/preinit/20_check_iso +++ /dev/null @@ -1,5 +0,0 @@ -check_for_iso() { - grep -qE '/dev/root.*iso9660' /proc/mounts && ramoverlay -} - -boot_hook_add preinit_mount_root check_for_iso diff --git a/trunk/target/linux/x86/base-files/lib/preinit/79_move_config b/trunk/target/linux/x86/base-files/lib/preinit/79_move_config deleted file mode 100644 index 1d4873d7..00000000 --- a/trunk/target/linux/x86/base-files/lib/preinit/79_move_config +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012-2015 OpenWrt.org - -move_config() { - . /lib/upgrade/platform.sh - - if platform_export_bootpart; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt - mv -f /mnt/sysupgrade.tgz / - umount /mnt - fi -} - -boot_hook_add preinit_mount_root move_config - diff --git a/trunk/target/linux/x86/base-files/lib/upgrade/platform.sh b/trunk/target/linux/x86/base-files/lib/upgrade/platform.sh deleted file mode 100644 index 73ab5ef0..00000000 --- a/trunk/target/linux/x86/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,66 +0,0 @@ -platform_export_bootpart() { - local cmdline uuid disk - - if read cmdline < /proc/cmdline; then - case "$cmdline" in - *block2mtd=*) - disk="${cmdline##*block2mtd=}" - disk="${disk%%,*}" - ;; - *root=*) - disk="${cmdline##*root=}" - disk="${disk%% *}" - ;; - esac - - case "$disk" in - PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) - uuid="${disk#PARTUUID=}" - uuid="${uuid%-02}" - for disk in /dev/[hsv]d[a-z]; do - set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') - if [ "$4$3$2$1" = "$uuid" ]; then - export BOOTPART="${disk}1" - return 0 - fi - done - ;; - /dev/*) - export BOOTPART="${disk%[0-9]}1" - return 0 - ;; - esac - fi - - return 1 -} - -platform_check_image() { - [ "$#" -gt 1 ] && return 1 - - case "$(get_magic_word "$1")" in - eb48|eb63) return 0;; - *) - echo "Invalid image type" - return 1 - ;; - esac -} - -platform_copy_config() { - if [ -b "$BOOTPART" ]; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt - cp -af "$CONF_TAR" /mnt/ - umount /mnt - fi -} - -platform_do_upgrade() { - platform_export_bootpart - - if [ -b "${BOOTPART%[0-9]}" ]; then - sync - get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync - sleep 1 - fi -} diff --git a/trunk/target/linux/x86/config-3.18 b/trunk/target/linux/x86/config-3.18 deleted file mode 100644 index d7a2d615..00000000 --- a/trunk/target/linux/x86/config-3.18 +++ /dev/null @@ -1,433 +0,0 @@ -# CONFIG_60XX_WDT is not set -# CONFIG_64BIT is not set -# CONFIG_ACPI is not set -# CONFIG_ACQUIRE_WDT is not set -# CONFIG_ADVANTECH_WDT is not set -# CONFIG_ALIM1535_WDT is not set -# CONFIG_ALIX is not set -CONFIG_AMD_NB=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y -CONFIG_ARCH_HAS_FAST_MULTIPLIER=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -# CONFIG_ARCH_RANDOM is not set -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_QUEUE_RWLOCK=y -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_ATA=y -CONFIG_ATA_GENERIC=y -CONFIG_ATA_PIIX=y -# CONFIG_AUDIT_ARCH is not set -CONFIG_BINFMT_MISC=y -CONFIG_BLK_DEV_SD=y -CONFIG_BOUNCE=y -CONFIG_CLKBLD_I8253=y -CONFIG_CLKEVT_I8253=y -CONFIG_CLKSRC_I8253=y -CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_COMPAT_VDSO=y -CONFIG_CONSOLE_TRANSLATIONS=y -# CONFIG_CPU5_WDT is not set -CONFIG_CPU_FREQ=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_CYRIX_32=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y -CONFIG_CRC16=y -CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_CRC32_PCLMUL is not set -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set -# CONFIG_CX_ECAT is not set -CONFIG_DCACHE_WORD_ACCESS=y -# CONFIG_DCDBAS is not set -# CONFIG_DEBUG_BOOT_PARAMS is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_NMI_SELFTEST is not set -# CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_DEBUG_VIRTUAL is not set -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -# CONFIG_DELL_RBU is not set -# CONFIG_DMI is not set -CONFIG_DNOTIFY=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set -# CONFIG_EDD is not set -# CONFIG_EUROTECH_WDT is not set -CONFIG_EXT4_FS=y -# CONFIG_F71808E_WDT is not set -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FS_MBCACHE=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GLOB=y -# CONFIG_GOOGLE_FIRMWARE is not set -# CONFIG_HANGCHECK_TIMER is not set -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_AOUT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_KMEMCHECK=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ATOMIC_IOMAP=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -# CONFIG_HIGHMEM4G is not set -CONFIG_HPET_EMULATE_RTC=y -CONFIG_HPET_TIMER=y -# CONFIG_HP_WATCHDOG is not set -CONFIG_HT_IRQ=y -# CONFIG_HUGETLBFS is not set -CONFIG_HW_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_GEODE=y -CONFIG_HW_RANDOM_VIA=y -# CONFIG_HYPERVISOR_GUEST is not set -CONFIG_HZ_PERIODIC=y -CONFIG_I8253_LOCK=y -# CONFIG_I8K is not set -# CONFIG_IB700_WDT is not set -# CONFIG_IBMASR is not set -# CONFIG_IBM_RTL is not set -# CONFIG_IE6XX_WDT is not set -CONFIG_ILLEGAL_POINTER_VALUE=0 -CONFIG_INITRAMFS_SOURCE="" -CONFIG_INPUT=y -CONFIG_INPUT_KEYBOARD=y -CONFIG_INSTRUCTION_DECODER=y -# CONFIG_INTEL_POWERCLAMP is not set -# CONFIG_IOMMU_STRESS is not set -# CONFIG_IOSF_MBI is not set -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -# CONFIG_IO_DELAY_UDELAY is not set -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -# CONFIG_ISA is not set -CONFIG_ISA_DMA_API=y -# CONFIG_IT8712F_WDT is not set -# CONFIG_IT87_WDT is not set -# CONFIG_ITCO_WDT is not set -CONFIG_JBD2=y -CONFIG_KALLSYMS=y -CONFIG_KEXEC=y -CONFIG_KEYBOARD_ATKBD=y -CONFIG_M486=y -# CONFIG_M586 is not set -# CONFIG_M586MMX is not set -# CONFIG_M586TSC is not set -# CONFIG_M686 is not set -# CONFIG_MACHZ_WDT is not set -CONFIG_MATH_EMULATION=y -# CONFIG_MATOM is not set -# CONFIG_MCORE2 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MELAN is not set -# CONFIG_MEMTEST is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MICROCODE is not set -# CONFIG_MICROCODE_AMD_EARLY is not set -# CONFIG_MICROCODE_INTEL_EARLY is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -CONFIG_MODULES_USE_ELF_REL=y -# CONFIG_MPENTIUM4 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -CONFIG_MTD_BLOCK2MTD=y -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTRR=y -# CONFIG_MTRR_SANITIZER is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MWINCHIPC6 is not set -CONFIG_NAMESPACES=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_NEED_SG_DMA_LENGTH=y -# CONFIG_NET5501 is not set -# CONFIG_NET_NS is not set -CONFIG_NOHIGHMEM=y -CONFIG_NO_BOOTMEM=y -CONFIG_NR_CPUS=1 -# CONFIG_NSC_GPIO is not set -# CONFIG_NTB is not set -CONFIG_NVRAM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -# CONFIG_OLPC is not set -CONFIG_OPROFILE_NMI_TIMER=y -# CONFIG_OPTIMIZE_INLINING is not set -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PC8736x_GPIO is not set -# CONFIG_PC87413_WDT is not set -CONFIG_PCI=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_GOANY=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOMMCONFIG is not set -CONFIG_PCI_MSI=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_PERF_EVENTS=y -CONFIG_PERF_EVENTS_INTEL_UNCORE=y -CONFIG_PHYSICAL_ALIGN=0x100000 -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_PMC_ATOM=y -CONFIG_POWER_SUPPLY=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_PROCESSOR_SELECT is not set -CONFIG_PROC_PAGE_MONITOR=y -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_RD_BZIP2=y -CONFIG_RD_GZIP=y -# CONFIG_RELOCATABLE is not set -CONFIG_RTC_CLASS=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_SBC7240_WDT is not set -# CONFIG_SBC8360_WDT is not set -# CONFIG_SBC_EPX_C3_WATCHDOG is not set -# CONFIG_SC1200_WDT is not set -CONFIG_SCHED_HRTICK=y -CONFIG_SCSI=y -CONFIG_SCx200=y -CONFIG_SCx200HR_TIMER=y -# CONFIG_SCx200_GPIO is not set -# CONFIG_SCx200_WDT is not set -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIO=y -# CONFIG_SERIO_CT82C710 is not set -CONFIG_SERIO_I8042=y -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_SERPORT=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SMSC37B787_WDT is not set -# CONFIG_SMSC_SCH311X_WDT is not set -CONFIG_SPARSEMEM_STATIC=y -CONFIG_SPARSE_IRQ=y -CONFIG_STRICT_DEVMEM=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -# CONFIG_TELCLOCK is not set -CONFIG_THERMAL=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_EMULATION is not set -# CONFIG_THERMAL_GOV_FAIR_SHARE is not set -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_USER_SPACE is not set -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_TOSHIBA is not set -CONFIG_UID16=y -CONFIG_USB_SUPPORT=y -# CONFIG_USER_NS is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_VGA_CONSOLE=y -# CONFIG_VIA_WDT is not set -CONFIG_VM86=y -# CONFIG_VMWARE_VMCI is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_WAFER_WDT is not set -CONFIG_X86=y -# CONFIG_X86_16BIT is not set -CONFIG_X86_32=y -# CONFIG_X86_32_IRIS is not set -CONFIG_X86_32_LAZY_GS=y -CONFIG_X86_ALIGNMENT_16=y -# CONFIG_X86_ANCIENT_MCE is not set -# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -# CONFIG_X86_CPUID is not set -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_X86_F00F_BUG=y -CONFIG_X86_FEATURE_NAMES=y -CONFIG_X86_GENERIC=y -# CONFIG_X86_GX_SUSPMOD is not set -# CONFIG_X86_INTEL_PSTATE is not set -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_INVD_BUG=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_LOCAL_APIC=y -# CONFIG_X86_LONGRUN is not set -CONFIG_X86_MCE=y -CONFIG_X86_MCE_AMD=y -# CONFIG_X86_MCE_INJECT is not set -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_THRESHOLD=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 -CONFIG_X86_MPPARSE=y -CONFIG_X86_MSR=y -# CONFIG_X86_P4_CLOCKMOD is not set -# CONFIG_X86_PAE is not set -CONFIG_X86_PAT=y -CONFIG_X86_PLATFORM_DEVICES=y -# CONFIG_X86_POWERNOW_K6 is not set -# CONFIG_X86_POWERNOW_K7 is not set -CONFIG_X86_PPRO_FENCE=y -# CONFIG_X86_PTDUMP is not set -# CONFIG_X86_REBOOTFIXUPS is not set -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_RESERVE_LOW=64 -# CONFIG_X86_SMAP is not set -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -# CONFIG_X86_SPEEDSTEP_ICH is not set -# CONFIG_X86_SPEEDSTEP_LIB is not set -# CONFIG_X86_SPEEDSTEP_SMI is not set -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_X86_THERMAL_VECTOR=y -CONFIG_X86_UP_APIC=y -CONFIG_X86_UP_APIC_MSI=y -CONFIG_X86_UP_IOAPIC=y -CONFIG_X86_VERBOSE_BOOTUP=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_XZ_DEC_X86=y -CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONE_DMA32 is not set diff --git a/trunk/target/linux/x86/ep80579/config-3.3 b/trunk/target/linux/x86/ep80579/config-3.3 deleted file mode 100644 index 78ee0ce7..00000000 --- a/trunk/target/linux/x86/ep80579/config-3.3 +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_HIGHMEM=y -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHPTE is not set -# CONFIG_ITCO_VENDOR_SUPPORT is not set -CONFIG_ITCO_WDT=y -CONFIG_LOG_BUF_SHIFT=17 -# CONFIG_MTD is not set -# CONFIG_NOHIGHMEM is not set -CONFIG_SATA_AHCI=y -# CONFIG_SQUASHFS is not set diff --git a/trunk/target/linux/x86/ep80579/target.mk b/trunk/target/linux/x86/ep80579/target.mk deleted file mode 100644 index 1f02f1e2..00000000 --- a/trunk/target/linux/x86/ep80579/target.mk +++ /dev/null @@ -1,11 +0,0 @@ -BOARDNAME:=Intel EP80579 -KERNEL_PATCHVER:=3.3 -DEFAULT_PACKAGES += kmod-ep80579-can kmod-ep80579-eth kmod-ep80579-misc \ - kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-uhci -FEATURES += broken - -define Target/Description - Build firmware images for Intel EP80579 based boards - (e.g : ADI Engineering Ocracoke Island) -endef - diff --git a/trunk/target/linux/x86/generic/config-default b/trunk/target/linux/x86/generic/config-default deleted file mode 100644 index eb4b357e..00000000 --- a/trunk/target/linux/x86/generic/config-default +++ /dev/null @@ -1,200 +0,0 @@ -# CONFIG_3C515 is not set -CONFIG_ACPI=y -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y -# CONFIG_ACPI_CMPC is not set -# CONFIG_ACPI_CONTAINER is not set -# CONFIG_ACPI_CUSTOM_DSDT is not set -# CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_DOCK is not set -# CONFIG_ACPI_EC_DEBUGFS is not set -# CONFIG_ACPI_FAN is not set -# CONFIG_ACPI_I2C_OPREGION is not set -# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y -# CONFIG_ACPI_PCI_SLOT is not set -CONFIG_ACPI_PROCESSOR=y -# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set -# CONFIG_ACPI_PROCFS_POWER is not set -# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set -# CONFIG_ACPI_SBS is not set -CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_VIDEO=y -# CONFIG_ACPI_WMI is not set -CONFIG_AGP=y -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_AMD is not set -# CONFIG_AGP_AMD64 is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_EFFICEON is not set -CONFIG_AGP_INTEL=y -# CONFIG_AGP_NVIDIA is not set -# CONFIG_AGP_SIS is not set -# CONFIG_AGP_SWORKS is not set -# CONFIG_AGP_VIA is not set -# CONFIG_APPLE_GMUX is not set -CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -# CONFIG_ASUS_LAPTOP is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_APPLE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_BACKLIGHT_SAHARA is not set -CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_DELL_SMO8800 is not set -CONFIG_DMA_SHARED_BUFFER=y -CONFIG_DMI=y -# CONFIG_DMIID is not set -CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_DMI_SYSFS is not set -CONFIG_DRM=y -# CONFIG_DRM_AST is not set -CONFIG_DRM_BOCHS=y -# CONFIG_DRM_CIRRUS_QEMU is not set -# CONFIG_DRM_GMA500 is not set -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_NXP_TDA998X is not set -# CONFIG_DRM_I2C_SIL164 is not set -# CONFIG_DRM_I810 is not set -CONFIG_DRM_I915=y -CONFIG_DRM_I915_FBDEV=y -CONFIG_DRM_I915_KMS=y -# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_KMS_HELPER=y -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_MGAG200 is not set -# CONFIG_DRM_NOUVEAU is not set -# CONFIG_DRM_PTN3460 is not set -# CONFIG_DRM_QXL is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_SAVAGE is not set -# CONFIG_DRM_SIS is not set -# CONFIG_DRM_TDFX is not set -CONFIG_DRM_TTM=y -# CONFIG_DRM_UDL is not set -# CONFIG_DRM_VIA is not set -# CONFIG_DRM_VMWGFX is not set -# CONFIG_EFI is not set -# CONFIG_EISA is not set -# CONFIG_EL3 is not set -CONFIG_FB=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_CMDLINE=y -# CONFIG_FB_I810 is not set -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_VESA is not set -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -CONFIG_FONT_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FUJITSU_LAPTOP is not set -# CONFIG_GEOS is not set -CONFIG_HAVE_ACPI_APEI=y -CONFIG_HAVE_ACPI_APEI_NMI=y -CONFIG_HDMI=y -CONFIG_HID=y -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -# CONFIG_HP_ACCEL is not set -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_INPUT_MOUSE=y -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INT340X_THERMAL is not set -CONFIG_INTEL_GTT=y -CONFIG_INTEL_IDLE=y -# CONFIG_INTEL_IPS is not set -# CONFIG_INTEL_MENLOW is not set -CONFIG_INTERVAL_TREE=y -CONFIG_ISA=y -CONFIG_ISAPNP=y -# CONFIG_ISCSI_IBFT_FIND is not set -CONFIG_ISO9660_FS=y -# CONFIG_JOLIET is not set -# CONFIG_LANCE is not set -# CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_LEDS_CLEVO_MAIL is not set -# CONFIG_MDA_CONSOLE is not set -# CONFIG_MIXCOMWD is not set -# CONFIG_MOUSE_BCM5974 is not set -# CONFIG_MOUSE_CYAPA is not set -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_PS2_ALPS=y -# CONFIG_MOUSE_PS2_CYPRESS is not set -# CONFIG_MOUSE_PS2_ELANTECH is not set -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set -CONFIG_NLS=y -CONFIG_NO_HZ=y -# CONFIG_PANASONIC_LAPTOP is not set -CONFIG_PATA_AMD=y -CONFIG_PATA_LEGACY=y -CONFIG_PATA_MPIIX=y -CONFIG_PATA_OLDPIIX=y -CONFIG_PATA_PLATFORM=y -CONFIG_PATA_SC1200=y -CONFIG_PATA_VIA=y -CONFIG_PCIEAER=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_IOAPIC=y -CONFIG_PCI_LABEL=y -CONFIG_PCI_MMCONFIG=y -# CONFIG_PCWATCHDOG is not set -CONFIG_PNP=y -CONFIG_PNPACPI=y -# CONFIG_PNPBIOS is not set -CONFIG_PNP_DEBUG_MESSAGES=y -# CONFIG_PVPANIC is not set -CONFIG_RAS=y -# CONFIG_SAMSUNG_Q10 is not set -CONFIG_SATA_AHCI=y -# CONFIG_SCx200_ACB is not set -# CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_PNP=y -# CONFIG_THINKPAD_ACPI is not set -# CONFIG_TOPSTAR_LAPTOP is not set -# CONFIG_TOSHIBA_BT_RFKILL is not set -# CONFIG_TOSHIBA_HAPS is not set -CONFIG_USB=y -CONFIG_USB_COMMON=y -CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -CONFIG_USB_EHCI_PCI=y -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_HCD_PLATFORM is not set -CONFIG_USB_STORAGE=y -CONFIG_USB_UHCI_HCD=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -# CONFIG_WDT is not set -# CONFIG_X86_ACPI_CPUFREQ is not set -# CONFIG_X86_E_POWERSAVER is not set -# CONFIG_X86_INTEL_LPSS is not set -# CONFIG_X86_LONGHAUL is not set -# CONFIG_X86_PCC_CPUFREQ is not set -CONFIG_X86_PM_TIMER=y diff --git a/trunk/target/linux/x86/generic/profiles/000-Generic.mk b/trunk/target/linux/x86/generic/profiles/000-Generic.mk deleted file mode 100644 index 90f989a9..00000000 --- a/trunk/target/linux/x86/generic/profiles/000-Generic.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Generic - NAME:=Generic - PACKAGES:=kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci \ - kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 \ - kmod-via-rhine kmod-via-velocity -endef - -define Profile/Generic/Description - Generic Profile -endef -$(eval $(call Profile,Generic)) diff --git a/trunk/target/linux/x86/generic/target.mk b/trunk/target/linux/x86/generic/target.mk deleted file mode 100644 index 7191292e..00000000 --- a/trunk/target/linux/x86/generic/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -BOARDNAME:=Generic - -define Target/Description - Build firmware images for x86 based boards - (e.g : Soekris, ...) -endef - diff --git a/trunk/target/linux/x86/geode/config-default b/trunk/target/linux/x86/geode/config-default deleted file mode 100644 index f4efab06..00000000 --- a/trunk/target/linux/x86/geode/config-default +++ /dev/null @@ -1,73 +0,0 @@ -# CONFIG_3C515 is not set -CONFIG_8139CP=y -CONFIG_8139TOO=y -CONFIG_8139TOO_8129=y -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_ALIX=y -# CONFIG_ATA_PIIX is not set -CONFIG_CS5535_CLOCK_EVENT_SRC=y -CONFIG_CS5535_MFGPT=y -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -# CONFIG_EISA is not set -# CONFIG_EL3 is not set -CONFIG_GEODE_WDT=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_CS5535=y -CONFIG_GPIO_DEVRES=y -# CONFIG_GPIO_F7188X is not set -# CONFIG_GPIO_INTEL_MID is not set -CONFIG_GPIO_SYSFS=y -# CONFIG_HIGHMEM64G is not set -CONFIG_HWMON=y -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_ALGOPCA=y -CONFIG_I2C_ALGOPCF=y -CONFIG_I2C_BOARDINFO=y -CONFIG_ISA=y -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_LANCE is not set -CONFIG_LEDS_GPIO=y -# CONFIG_M486 is not set -# CONFIG_MDA_CONSOLE is not set -CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=y -CONFIG_MGEODEGX1=y -# CONFIG_MIXCOMWD is not set -CONFIG_NATSEMI=y -CONFIG_NET5501=y -CONFIG_NLS=y -CONFIG_NSC_GPIO=y -CONFIG_PATA_CS5520=y -CONFIG_PATA_CS5530=y -CONFIG_PATA_CS5535=y -CONFIG_PATA_CS5536=y -CONFIG_PATA_SC1200=y -CONFIG_PC8736x_GPIO=y -# CONFIG_PCWATCHDOG is not set -# CONFIG_PNP is not set -CONFIG_SC1200_WDT=y -CONFIG_SCx200_ACB=y -CONFIG_SCx200_WDT=y -CONFIG_SENSORS_LM90=y -CONFIG_USB=y -CONFIG_USB_COMMON=y -CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -CONFIG_USB_EHCI_PCI=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PCI=y -# CONFIG_USB_OHCI_HCD_PLATFORM is not set -# CONFIG_USB_UHCI_HCD is not set -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_VIA_RHINE=y -CONFIG_VIA_RHINE_MMIO=y -# CONFIG_WDT is not set -CONFIG_X86_CPUID=y -CONFIG_X86_DEBUGCTLMSR=y -# CONFIG_X86_MCE is not set -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_X86_TSC=y diff --git a/trunk/target/linux/x86/geode/target.mk b/trunk/target/linux/x86/geode/target.mk deleted file mode 100644 index 57ccdc6c..00000000 --- a/trunk/target/linux/x86/geode/target.mk +++ /dev/null @@ -1,14 +0,0 @@ -BOARDNAME:=AMD Geode based systems -FEATURES:=squashfs ext4 pci usb gpio -DEFAULT_PACKAGES += \ - kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-aes kmod-crypto-cbc \ - kmod-ath5k kmod-ath9k \ - kmod-button-hotplug \ - kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ - kmod-ledtrig-netdev hwclock wpad-mini - -CPU_TYPE := geode - -define Target/Description - Build firmware images for AMD Geode GX/LX based systems (net5501, alix, geos) -endef diff --git a/trunk/target/linux/x86/image/Config.in b/trunk/target/linux/x86/image/Config.in deleted file mode 100644 index f232c647..00000000 --- a/trunk/target/linux/x86/image/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config X86_ETHERBOOT_IMAGES - bool "Build Etherboot image" - depends on TARGET_x86_thincan_DBE61 - default y - help - Builds network bootable image for ThinCan DBE61 (Etherboot BIOS) - -config X86_ETHERBOOT_BOOTOPTS - string "Extra kernel boot options" - depends on X86_ETHERBOOT_IMAGES - default "ip=dhcp nbdport=2000 " if TARGET_ROOTFS_SQUASHFS - default "ip=dhcp root=/dev/nfs nfsroot=192.168.0.1:/srv/dbe61" - help - Kernel arguments to pass to the kernel eg. NFS root location etc. diff --git a/trunk/target/linux/x86/image/Makefile b/trunk/target/linux/x86/image/Makefile deleted file mode 100644 index e7e02f15..00000000 --- a/trunk/target/linux/x86/image/Makefile +++ /dev/null @@ -1,234 +0,0 @@ -# -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/image.mk - -export PATH=$(TARGET_PATH):/sbin - -GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga -GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga -GRUB_TERMINALS = -GRUB_SERIAL_CONFIG = -GRUB_TERMINAL_CONFIG = -GRUB_CONSOLE_CMDLINE = - -USE_ATKBD = generic kvm_guest - -ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget)))),) - GRUB2_MODULES += at_keyboard - GRUB2_MODULES_ISO += at_keyboard -endif - -ifneq ($(CONFIG_GRUB_CONSOLE),) - GRUB_CONSOLE_CMDLINE += console=tty0 - GRUB_TERMINALS += console -endif - -GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL)) - -ifneq ($(GRUB_SERIAL),) - GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8 - GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 --rtscts=off - GRUB_TERMINALS += serial -endif - -ifneq ($(GRUB_TERMINALS),) - GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS) -endif - -SIGNATURE:=$(shell dd if=/dev/urandom bs=4 count=1 2>/dev/null | hexdump -v -e '"%08x"') -ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) -ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02) - -GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) - -ifneq ($(CONFIG_GRUB_IMAGES),) - - BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS)) - - define Image/cmdline/ext4 - root=$(ROOTPART) rootfstype=ext4 rootwait - endef - - define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait - endef - - define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait - endef - - define Image/cmdline/squashfs - block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=squashfs rootwait - endef - - define Image/Build/grub2 - # left here because the image builder doesnt need these - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - grub-mkimage \ - -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -o $(KDIR)/grub2/core.img \ - -O i386-pc \ - -c ./grub-early.cfg \ - $(GRUB2_MODULES) - $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/ - echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img' > $(KDIR)/grub2/device.map - sed \ - -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ - -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ - -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ - -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ - ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg - PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ - 256 - grub-bios-setup \ - --device-map="$(KDIR)/grub2/device.map" \ - -d "$(KDIR)/grub2" \ - -r "hd0,msdos1" \ - "$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img" - $(call Image/Build/grub/$(1)) - endef -endif - -ROOTDELAY=10 - -define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) -endef - -define Image/Build/iso - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - grub-mkimage \ - -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -o $(KDIR)/grub2/eltorito.img \ - -O i386-pc \ - -c ./grub-early.cfg \ - $(GRUB2_MODULES_ISO) - cat \ - $(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \ - $(KDIR)/grub2/eltorito.img \ - > $(KDIR)/root.grub/boot/grub/eltorito.img - sed \ - -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ - -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ - -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ - -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ - ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ - -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) -endef - -ifneq ($(CONFIG_VDI_IMAGES),) - define Image/Build/vdi - rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true - qemu-img convert -f raw -O vdi \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi - # XXX: VBoxManage insists on setting perms to 0600 - chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi - endef -endif - -ifneq ($(CONFIG_VMDK_IMAGES),) - define Image/Build/vmdk - rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true - qemu-img convert -f raw -O vmdk \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk - endef -endif - -define Image/Build/gzip - gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img - gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img -endef - -ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) - define Image/Build/gzip/ext4 - $(call Image/Build/gzip,ext4) - endef - ifneq ($(CONFIG_TARGET_IMAGES_PAD),) - define Image/Build/gzip/squashfs - $(call Image/Build/gzip,squashfs) - endef - define Image/Build/gzip/jffs2-64k - $(call Image/Build/gzip,jffs2-64k) - endef - define Image/Build/gzip/jffs2-128k - $(call Image/Build/gzip,jffs2-128k) - endef - endif -endif - -define Image/BuildKernel - $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz - ifneq ($(CONFIG_X86_ETHERBOOT_IMAGES),) - rm -f $(BIN_DIR)/$(IMG_PREFIX)-etherboot - $(STAGING_DIR_HOST)/bin/mkelfImage \ - --append=$(CONFIG_X86_ETHERBOOT_BOOTOPTS) \ - $(KDIR)/bzImage \ - $(BIN_DIR)/$(IMG_PREFIX)-etherboot - endif -endef - -define Image/Build/Profile/ar525w - cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp - $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32 - $(STAGING_DIR_HOST)/bin/airlink -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \ - $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w.img - $(STAGING_DIR_HOST)/bin/airlink -e -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \ - $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w-web.img -endef - -define Image/Build/Profile/sitecom - cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp - #32k config data + 20 bytes header + 2 bytes checksum after kernel image - $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32790 - $(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage.tmp > $(KDIR)/tmp.img - cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img - cp $(KDIR)/tmp.img $(BIN_DIR)/$(IMG_PREFIX)-$(1)-sitecom.img - rm $(KDIR)/tmp.img $(KDIR)/bzImage.tmp -endef - -define Image/Build/Profile/bifferboard - $(TOPDIR)/target/linux/rdc/image/mkimg_bifferboard.py $(KDIR)/bzImage $(KDIR)/root.$(1) \ - $(BIN_DIR)/$(IMG_PREFIX)-$(1)-bifferboard.img -endef - -define Image/Prepare - $(call Image/Prepare/grub2) -endef - -define Image/Build/Initramfs - $(CP) $(KDIR)/bzImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage -endef - -define Image/Build - $(call Image/Build/$(1)) - ifneq ($(1),iso) - $(call Image/Build/grub2,$(1)) - $(call Image/Build/vdi,$(1)) - $(call Image/Build/vmdk,$(1)) - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img - else - $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso - endif - $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz - $(call Image/Build/gzip/$(1)) - $(call Image/Build/Profile/$(PROFILE),$(1)) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - $(call Image/Build/Initramfs) -endif -endef - -$(eval $(call BuildImage)) diff --git a/trunk/target/linux/x86/image/gen_image_generic.sh b/trunk/target/linux/x86/image/gen_image_generic.sh deleted file mode 100755 index 3fb31f6e..00000000 --- a/trunk/target/linux/x86/image/gen_image_generic.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2006-2012 OpenWrt.org -set -x -[ $# == 5 -o $# == 6 ] || { - echo "SYNTAX: $0 []" - exit 1 -} - -OUTPUT="$1" -KERNELSIZE="$2" -KERNELDIR="$3" -ROOTFSSIZE="$4" -ROOTFSIMAGE="$5" -ALIGN="$6" - -rm -f "$OUTPUT" - -head=16 -sect=63 -cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512))) - -# create partition table -set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}` - -KERNELOFFSET="$(($1 / 512))" -KERNELSIZE="$(($2 / 512))" -ROOTFSOFFSET="$(($3 / 512))" -ROOTFSSIZE="$(($4 / 512))" - -BLOCKS="$((($KERNELSIZE / 2) - 1))" - -[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" -dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc - -[ -n "$NOGRUB" ] && exit 0 - -genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" -dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc -rm -f "$OUTPUT.kernel" diff --git a/trunk/target/linux/x86/image/grub-early.cfg b/trunk/target/linux/x86/image/grub-early.cfg deleted file mode 100644 index 4a5b5a60..00000000 --- a/trunk/target/linux/x86/image/grub-early.cfg +++ /dev/null @@ -1 +0,0 @@ -configfile (hd0,msdos1)/boot/grub/grub.cfg diff --git a/trunk/target/linux/x86/image/grub-iso.cfg b/trunk/target/linux/x86/image/grub-iso.cfg deleted file mode 100644 index 6a494377..00000000 --- a/trunk/target/linux/x86/image/grub-iso.cfg +++ /dev/null @@ -1,10 +0,0 @@ -@SERIAL_CONFIG@ -@TERMINAL_CONFIG@ - -set default="0" -set timeout="@TIMEOUT@" -set root='(cd)' - -menuentry "libreCMC" { - linux /boot/vmlinuz @CMDLINE@ noinitrd -} diff --git a/trunk/target/linux/x86/image/grub.cfg b/trunk/target/linux/x86/image/grub.cfg deleted file mode 100644 index e1c1c74f..00000000 --- a/trunk/target/linux/x86/image/grub.cfg +++ /dev/null @@ -1,13 +0,0 @@ -@SERIAL_CONFIG@ -@TERMINAL_CONFIG@ - -set default="0" -set timeout="@TIMEOUT@" -set root='(hd0,msdos1)' - -menuentry "libreCMC" { - linux /boot/vmlinuz @CMDLINE@ noinitrd -} -menuentry "libreCMC (failsafe)" { - linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd -} diff --git a/trunk/target/linux/x86/image/mkimg_bifferboard.py b/trunk/target/linux/x86/image/mkimg_bifferboard.py deleted file mode 100755 index 5444abeb..00000000 --- a/trunk/target/linux/x86/image/mkimg_bifferboard.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python - -""" - Create firmware for 4/8MB Bifferboards, suitable for uploading using - either bb_upload8.py or bb_eth_upload8.py -""" - -import struct, sys - -# Increase the kmax value if the script gives errors about the kernel being -# too large. You need to set the Biffboot kmax value to the same value you -# use here. -kmax = 0x10 - -# No need to change this for 4MB devices, it's only used to tell you if -# the firmware is too large! -flash_size = 0x800000 - -# This is always the same, for 1MB, 4MB and 8MB devices -config_extent = 0x6000 - -kernel_extent = kmax * 0x10000 - -if __name__ == "__main__": - - if len(sys.argv) != 4: - print "usage: mkimg_bifferboard.py " - sys.exit(-1) - - bzimage = sys.argv[1] - rootfs = sys.argv[2] - target = sys.argv[3] - - # Kernel first - fw = file(bzimage).read() - if len(fw) > (kernel_extent - config_extent): - raise IOError("Kernel too large") - - # Pad up to end of kernel partition - while len(fw) < (kernel_extent - config_extent): - fw += "\xff" - - fw += file(rootfs).read() - - # Check length of total - if len(fw) > (flash_size - 0x10000 - config_extent): - raise IOError("Rootfs too large") - - file(target,"wb").write(fw) - print "Firmware written to '%s'" % target diff --git a/trunk/target/linux/x86/image/mkimg_sitecom.pl b/trunk/target/linux/x86/image/mkimg_sitecom.pl deleted file mode 100755 index cfd5e652..00000000 --- a/trunk/target/linux/x86/image/mkimg_sitecom.pl +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/perl - -open (bzimg, @ARGV[0]); -while () { $i .= $_; } -$i .= pack "v", -(unpack "%v*", $i); -print "CSYS"; -print pack("V", length($i)); -print pack("V", 0); -print "WRRM"; -print pack("V", length($i)); -print $i; diff --git a/trunk/target/linux/x86/kvm_guest/config-default b/trunk/target/linux/x86/kvm_guest/config-default deleted file mode 100644 index f26e2681..00000000 --- a/trunk/target/linux/x86/kvm_guest/config-default +++ /dev/null @@ -1,89 +0,0 @@ -CONFIG_ACPI=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set -CONFIG_ACPI_BUTTON=y -# CONFIG_ACPI_CMPC is not set -# CONFIG_ACPI_CONTAINER is not set -# CONFIG_ACPI_CUSTOM_DSDT is not set -# CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_DOCK is not set -# CONFIG_ACPI_EC_DEBUGFS is not set -# CONFIG_ACPI_FAN is not set -# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y -# CONFIG_ACPI_PCI_SLOT is not set -CONFIG_ACPI_PROCESSOR=y -# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set -# CONFIG_ACPI_PROCFS_POWER is not set -# CONFIG_ACPI_SBS is not set -# CONFIG_ACPI_THERMAL is not set -# CONFIG_ACPI_WMI is not set -CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -# CONFIG_ASUS_LAPTOP is not set -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_EEEPC_LAPTOP is not set -# CONFIG_EFI is not set -CONFIG_HAVE_ACPI_APEI=y -CONFIG_HAVE_ACPI_APEI_NMI=y -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=y -# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_CPCI is not set -# CONFIG_HOTPLUG_PCI_IBM is not set -CONFIG_HOTPLUG_PCI_PCIE=y -# CONFIG_HOTPLUG_PCI_SHPC is not set -# CONFIG_HPET is not set -# CONFIG_HP_ACCEL is not set -CONFIG_HVC_DRIVER=y -# CONFIG_HW_RANDOM_VIRTIO is not set -CONFIG_HYPERVISOR_GUEST=y -# CONFIG_INTEL_IPS is not set -# CONFIG_ISCSI_IBFT_FIND is not set -# CONFIG_KVM is not set -# CONFIG_KVM_DEBUG_FS is not set -CONFIG_KVM_GUEST=y -# CONFIG_LGUEST is not set -# CONFIG_LGUEST_GUEST is not set -CONFIG_NLS=y -CONFIG_NO_HZ=y -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_PCIEAER=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_IOAPIC=y -CONFIG_PCI_LABEL=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PNP=y -CONFIG_PNPACPI=y -CONFIG_PNP_DEBUG_MESSAGES=y -# CONFIG_PVPANIC is not set -CONFIG_RAS=y -# CONFIG_SAMSUNG_Q10 is not set -# CONFIG_SCSI_VIRTIO is not set -CONFIG_SERIAL_8250_PNP=y -# CONFIG_THINKPAD_ACPI is not set -# CONFIG_TOPSTAR_LAPTOP is not set -# CONFIG_TOSHIBA_BT_RFKILL is not set -# CONFIG_VHOST_NET is not set -CONFIG_VIRTIO=y -CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_CONSOLE=y -# CONFIG_VIRTIO_NET is not set -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTUALIZATION=y -# CONFIG_VMWARE_BALLOON is not set -# CONFIG_VT_HW_CONSOLE_BINDING is not set -# CONFIG_X86_ACPI_CPUFREQ is not set -# CONFIG_X86_E_POWERSAVER is not set -# CONFIG_X86_GENERIC is not set -# CONFIG_X86_INTEL_LPSS is not set -CONFIG_X86_INTERNODE_CACHE_SHIFT=4 -CONFIG_X86_L1_CACHE_SHIFT=4 -# CONFIG_X86_LONGHAUL is not set -# CONFIG_X86_PAT is not set -# CONFIG_X86_PCC_CPUFREQ is not set -CONFIG_X86_PM_TIMER=y -# CONFIG_X86_PPRO_FENCE is not set diff --git a/trunk/target/linux/x86/kvm_guest/target.mk b/trunk/target/linux/x86/kvm_guest/target.mk deleted file mode 100644 index d3f950fe..00000000 --- a/trunk/target/linux/x86/kvm_guest/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOARDNAME:=KVM Guest -FEATURES:=ext4 pci usb -DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random diff --git a/trunk/target/linux/x86/modules.mk b/trunk/target/linux/x86/modules.mk deleted file mode 100644 index 3abe0174..00000000 --- a/trunk/target/linux/x86/modules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define KernelPackage/rdc321x-wdt - SUBMENU:=$(OTHER_MENU) - TITLE:=RDC321x watchdog - DEPENDS:=@TARGET_x86_rdc - KCONFIG:=CONFIG_RDC321X_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.ko - AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt) -endef - -define KernelPackage/rdc321x-wdt/description - RDC-321x watchdog driver -endef - -$(eval $(call KernelPackage,rdc321x-wdt)) - diff --git a/trunk/target/linux/x86/patches-3.18/006-yenta_mistery.patch b/trunk/target/linux/x86/patches-3.18/006-yenta_mistery.patch deleted file mode 100644 index 72144cb0..00000000 --- a/trunk/target/linux/x86/patches-3.18/006-yenta_mistery.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/pcmcia/yenta_socket.c -+++ b/drivers/pcmcia/yenta_socket.c -@@ -1233,6 +1233,17 @@ static int yenta_probe(struct pci_dev *d - - /* We must finish initialization here */ - -+#ifdef CONFIG_X86_RDC321X -+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */ -+#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060 -+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */ -+ -+ config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK); -+ config_writel(socket, 35*4, 0x00000022); -+ config_writel(socket, 36*4, 0x60200000); -+ config_writel(socket, 40*4, 0x7e020000); -+#endif -+ - if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) { - /* No IRQ or request_irq failed. Poll */ - socket->cb_irq = 0; /* But zero is a valid IRQ number. */ diff --git a/trunk/target/linux/x86/patches-3.18/009-rdc321x_select_embedded.patch b/trunk/target/linux/x86/patches-3.18/009-rdc321x_select_embedded.patch deleted file mode 100644 index e1599e4f..00000000 --- a/trunk/target/linux/x86/patches-3.18/009-rdc321x_select_embedded.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -531,6 +531,8 @@ config X86_RDC321X - depends on X86_EXTENDED_PLATFORM - select M486 - select X86_REBOOTFIXUPS -+ select EMBEDDED -+ select ARCH_REQUIRE_GPIOLIB - ---help--- - This option is needed for RDC R-321x system-on-chip, also known - as R-8610-(G). diff --git a/trunk/target/linux/x86/patches-3.18/010-rdc_cpu_ident.patch b/trunk/target/linux/x86/patches-3.18/010-rdc_cpu_ident.patch deleted file mode 100644 index 1f153fc6..00000000 --- a/trunk/target/linux/x86/patches-3.18/010-rdc_cpu_ident.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- /dev/null -+++ b/Documentation/x86/rdc.txt -@@ -0,0 +1,69 @@ -+ -+Introduction -+============ -+ -+RDC (http://www.rdc.com.tw) have been manufacturing x86-compatible SoC -+(system-on-chips) for a number of years. They are not the fastest of -+CPUs (clock speeds ranging from 133-150MHz) but 486SX compatibility -+coupled with very low power consumption[1] and low cost make them ideal -+for embedded applications. -+ -+ -+Where to find -+============= -+ -+RDC chips show up in numerous embedded devices, but be careful since -+many of them will not run Linux 2.6 without significant expertise. -+ -+There are several variants of what the linux kernel refers to generically -+as RDC321X: R8610, R321x, S3282 and AMRISC20000. -+ -+R321x: Found in various routers, see the libreCMC project for details, -+ http://wiki.librecmc.org/oldwiki/rdcport -+ -+R8610: Found on the RDC evaluation board -+ http://www.ivankuten.com/system-on-chip-soc/rdc-r8610/ -+ -+AMRISC20000: Found in the MGB-100 wireless hard disk -+ http://tintuc.no-ip.com/linux/tipps/mgb100/ -+ -+S3282: Found in various NAS devices, including the Bifferboard -+ http://www.bifferos.com -+ -+ -+Kernel Configuration -+==================== -+ -+Add support for this CPU with CONFIG_X86_RDC321X. Ensure that maths -+emulation is included (CONFIG_MATH_EMULATION selected) and avoid MCE -+(CONFIG_X86_MCE not selected). -+ -+ -+CPU detection -+============= -+ -+None of these chips support the cpuid instruction, so as with some -+other x86 compatible SoCs, we must check the north bridge and look -+for specific 'signature' PCI device config. -+ -+The current detection code has been tested only on the Bifferboard -+(S3282 CPU), please send bug reports or success stories with -+other devices to bifferos@yahoo.co.uk. -+ -+ -+Credits -+======= -+ -+Many thanks to RDC for providing the customer codes to allow -+detection of all known variants, without which this detection code -+would have been very hard to ascertain. -+ -+ -+References -+========== -+ -+[1] S3282 in certain NAS solutions consumes less than 1W -+ -+ -+mark@bifferos.com 2009 -+ ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -529,6 +529,7 @@ config X86_RDC321X - bool "RDC R-321x SoC" - depends on X86_32 - depends on X86_EXTENDED_PLATFORM -+ select PCI - select M486 - select X86_REBOOTFIXUPS - select EMBEDDED ---- a/arch/x86/include/asm/processor.h -+++ b/arch/x86/include/asm/processor.h -@@ -136,7 +136,8 @@ struct cpuinfo_x86 { - #define X86_VENDOR_CENTAUR 5 - #define X86_VENDOR_TRANSMETA 7 - #define X86_VENDOR_NSC 8 --#define X86_VENDOR_NUM 9 -+#define X86_VENDOR_RDC 9 -+#define X86_VENDOR_NUM 10 - - #define X86_VENDOR_UNKNOWN 0xff - ---- a/arch/x86/kernel/cpu/Makefile -+++ b/arch/x86/kernel/cpu/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix - obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o - obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o - obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o -+obj-$(CONFIG_X86_RDC321X) += rdc.o - - obj-$(CONFIG_PERF_EVENTS) += perf_event.o - ---- /dev/null -+++ b/arch/x86/kernel/cpu/rdc.c -@@ -0,0 +1,69 @@ -+/* -+ * See Documentation/x86/rdc.txt -+ * -+ * mark@bifferos.com -+ */ -+ -+#include -+#include -+#include "cpu.h" -+ -+ -+static void __cpuinit rdc_identify(struct cpuinfo_x86 *c) -+{ -+ u16 vendor, device; -+ u32 customer_id; -+ -+ if (!early_pci_allowed()) -+ return; -+ -+ /* RDC CPU is SoC (system-on-chip), Northbridge is always present */ -+ vendor = read_pci_config_16(0, 0, 0, PCI_VENDOR_ID); -+ device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID); -+ -+ if (vendor != PCI_VENDOR_ID_RDC || device != PCI_DEVICE_ID_RDC_R6020) -+ return; /* not RDC */ -+ /* -+ * NB: We could go on and check other devices, e.g. r6040 NIC, but -+ * that's probably overkill -+ */ -+ -+ customer_id = read_pci_config(0, 0, 0, 0x90); -+ -+ switch (customer_id) { -+ /* id names are from RDC */ -+ case 0x00321000: -+ strcpy(c->x86_model_id, "R3210/R3211"); -+ break; -+ case 0x00321001: -+ strcpy(c->x86_model_id, "AMITRISC20000/20010"); -+ break; -+ case 0x00321002: -+ strcpy(c->x86_model_id, "R3210X/Edimax"); -+ break; -+ case 0x00321003: -+ strcpy(c->x86_model_id, "R3210/Kcodes"); -+ break; -+ case 0x00321004: /* tested */ -+ strcpy(c->x86_model_id, "S3282/CodeTek"); -+ break; -+ case 0x00321007: -+ strcpy(c->x86_model_id, "R8610"); -+ break; -+ default: -+ pr_info("RDC CPU: Unrecognised Customer ID (0x%x) please report to linux-kernel@vger.kernel.org\n", customer_id); -+ break; -+ } -+ -+ strcpy(c->x86_vendor_id, "RDC"); -+ c->x86_vendor = X86_VENDOR_RDC; -+} -+ -+static const struct cpu_dev __cpuinitconst rdc_cpu_dev = { -+ .c_vendor = "RDC", -+ .c_ident = { "RDC" }, -+ .c_identify = rdc_identify, -+ .c_x86_vendor = X86_VENDOR_RDC, -+}; -+ -+cpu_dev_register(rdc_cpu_dev); diff --git a/trunk/target/linux/x86/patches-3.18/011-tune_lzma_options.patch b/trunk/target/linux/x86/patches-3.18/011-tune_lzma_options.patch deleted file mode 100644 index 4bb7b7bf..00000000 --- a/trunk/target/linux/x86/patches-3.18/011-tune_lzma_options.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -325,7 +325,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) - - quiet_cmd_lzma = LZMA $@ - cmd_lzma = (cat $(filter-out FORCE,$^) | \ -- lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ -+ lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ - (rm -f $@ ; false) - - quiet_cmd_lzo = LZO $@ ---- a/arch/x86/include/asm/boot.h -+++ b/arch/x86/include/asm/boot.h -@@ -23,7 +23,7 @@ - #error "Invalid value for CONFIG_PHYSICAL_ALIGN" - #endif - --#ifdef CONFIG_KERNEL_BZIP2 -+#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA) - #define BOOT_HEAP_SIZE 0x400000 - #else /* !CONFIG_KERNEL_BZIP2 */ - diff --git a/trunk/target/linux/x86/patches-3.18/012-export_erase_write.patch b/trunk/target/linux/x86/patches-3.18/012-export_erase_write.patch deleted file mode 100644 index a98525ee..00000000 --- a/trunk/target/linux/x86/patches-3.18/012-export_erase_write.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/drivers/mtd/mtdblock.c -+++ b/drivers/mtd/mtdblock.c -@@ -63,7 +63,7 @@ static void erase_callback(struct erase_ - wake_up(wait_q); - } - --static int erase_write (struct mtd_info *mtd, unsigned long pos, -+int erase_write (struct mtd_info *mtd, unsigned long pos, - int len, const char *buf) - { - struct erase_info erase; ---- a/include/linux/mtd/mtd.h -+++ b/include/linux/mtd/mtd.h -@@ -416,6 +416,9 @@ extern void register_mtd_user (struct mt - extern int unregister_mtd_user (struct mtd_notifier *old); - void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size); - -+int erase_write (struct mtd_info *mtd, unsigned long pos, -+ int len, const char *buf); -+ - void mtd_erase_callback(struct erase_info *instr); - - static inline int mtd_is_bitflip(int err) { diff --git a/trunk/target/linux/x86/patches-3.18/100-rdc_boards.patch b/trunk/target/linux/x86/patches-3.18/100-rdc_boards.patch deleted file mode 100644 index 1f3b161a..00000000 --- a/trunk/target/linux/x86/patches-3.18/100-rdc_boards.patch +++ /dev/null @@ -1,745 +0,0 @@ ---- a/arch/x86/Makefile -+++ b/arch/x86/Makefile -@@ -196,6 +196,9 @@ libs-y += arch/x86/lib/ - # See arch/x86/Kbuild for content of core part of the kernel - core-y += arch/x86/ - -+# RDC R-321X support -+core-$(CONFIG_X86_RDC321X) += arch/x86/mach-rdc321x/ -+ - # drivers-y are linked after core-y - drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/ - drivers-$(CONFIG_PCI) += arch/x86/pci/ ---- /dev/null -+++ b/arch/x86/mach-rdc321x/Makefile -@@ -0,0 +1,5 @@ -+# -+# Makefile for the RDC321x specific parts of the kernel -+# -+obj-$(CONFIG_X86_RDC321X) := platform.o reboot.o boards/sitecom.o boards/ar525w.o boards/bifferboard.o boards/r8610.o -+ ---- /dev/null -+++ b/arch/x86/mach-rdc321x/platform.c -@@ -0,0 +1,115 @@ -+/* -+ * Generic RDC321x platform devices -+ * -+ * Copyright (C) 2007-2009 OpenWrt.org -+ * Copyright (C) 2007 Florian Fainelli -+ * Copyright (C) 2008-2009 Daniel Gimpelevich -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+static struct rdc_platform_data rdcplat_data; -+ -+/* LEDS */ -+static struct platform_device rdc321x_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &rdcplat_data.led_data, -+ } -+}; -+ -+/* Button */ -+static struct platform_device rdc321x_buttons = { -+ .name = "gpio-keys-polled", -+ .id = -1, -+ .dev = { -+ .platform_data = &rdcplat_data.button_data, -+ } -+}; -+ -+static __initdata struct platform_device *rdc321x_devs[] = { -+ &rdc321x_leds, -+ &rdc321x_buttons, -+}; -+ -+const char *__initdata boards[] = { -+ "Sitecom", -+ "AR525W", -+ "Bifferboard", -+ "R8610", -+ 0 -+}; -+ -+static struct map_info rdc_map_info = { -+ .name = "rdc_flash", -+ .size = 0x800000, /* 8MB */ -+ .phys = 0xFF800000, /* (u32) -rdc_map_info.size */ -+ .bankwidth = 2, -+}; -+ -+static int __init rdc_board_setup(void) -+{ -+ struct mtd_info *mtdinfo; -+ struct mtd_part_parser_data *ppdata; -+ int res; -+ -+ simple_map_init(&rdc_map_info); -+ -+ while (1) { -+ rdc_map_info.virt = ioremap(rdc_map_info.phys, -+ rdc_map_info.size); -+ if (rdc_map_info.virt == NULL) -+ continue; -+ -+ mtdinfo = do_map_probe("cfi_probe", &rdc_map_info); -+ if (mtdinfo == NULL) -+ mtdinfo = do_map_probe("jedec_probe", &rdc_map_info); -+ if (mtdinfo != NULL) -+ break; -+ -+ iounmap(rdc_map_info.virt); -+ if ((rdc_map_info.size >>= 1) < 0x100000) /* 1MB */ -+ panic("RDC321x: Could not find start of flash!"); -+ rdc_map_info.phys = (u32) -rdc_map_info.size; -+ } -+ -+ /* -+ * TODO: add a new field to mtd_part_parser_data, and use that -+ * instead of this ugly casting -+ */ -+ ppdata = (struct mtd_part_parser_data *) &rdcplat_data; -+ res = mtd_device_parse_register(mtdinfo, boards, ppdata, NULL, 0); -+ if (res) { -+ panic("RDC321x: can't identify board type"); -+ return -ENOSYS; -+ } -+ -+ ROOT_DEV = 0; -+ -+ return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs)); -+} -+late_initcall(rdc_board_setup); ---- /dev/null -+++ b/arch/x86/mach-rdc321x/boards/ar525w.c -@@ -0,0 +1,251 @@ -+/* -+ * ar525w RDC321x platform devices -+ * -+ * Copyright (C) 2007-2009 OpenWrt.org -+ * Copyright (C) 2007 Florian Fainelli -+ * Copyright (C) 2008-2009 Daniel Gimpelevich -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+struct image_header { -+ char magic[4]; /* ASICII: GMTK */ -+ u32 checksum; /* CRC32 */ -+ u32 version; /* x.x.x.x */ -+ u32 kernelsz; /* The size of the kernel image */ -+ u32 imagesz; /* The length of this image file ( kernel + romfs + this header) */ -+ u32 pid; /* Product ID */ -+ u32 fastcksum; /* Partial CRC32 on (First(256), medium(256), last(512)) */ -+ u32 reserved; -+}; -+ -+static struct gpio_led ar525w_leds[] = { -+ { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1}, -+}; -+static struct gpio_keys_button ar525w_btns[] = { -+ { -+ .gpio = 6, -+ .code = BTN_0, -+ .desc = "Reset", -+ .active_low = 1, -+ } -+}; -+ -+static u32 __initdata crctab[257] = { -+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, -+ 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, -+ 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, -+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, -+ 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, -+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, -+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, -+ 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, -+ 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, -+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, -+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, -+ 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, -+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, -+ 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, -+ 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, -+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, -+ 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, -+ 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, -+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, -+ 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, -+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, -+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, -+ 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, -+ 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, -+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, -+ 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, -+ 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, -+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, -+ 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, -+ 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, -+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, -+ 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, -+ 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, -+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, -+ 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, -+ 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, -+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, -+ 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, -+ 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, -+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, -+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, -+ 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, -+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, -+ 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, -+ 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, -+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, -+ 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, -+ 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, -+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, -+ 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, -+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, -+ 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, -+ 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, -+ 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, -+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, -+ 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, -+ 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, -+ 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, -+ 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, -+ 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, -+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, -+ 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, -+ 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, -+ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, -+ 0 -+}; -+ -+static u32 __init crc32(u8 * buf, u32 len) -+{ -+ register int i; -+ u32 sum; -+ register u32 s0; -+ s0 = ~0; -+ for (i = 0; i < len; i++) { -+ s0 = (s0 >> 8) ^ crctab[(u8) (s0 & 0xFF) ^ buf[i]]; -+ } -+ sum = ~s0; -+ return sum; -+} -+ -+static int __init fixup_ar525w_header(struct mtd_info *master, struct image_header *header) -+{ -+ char *buffer; -+ int res; -+ u32 bufferlength = header->kernelsz + sizeof(struct image_header); -+ u32 len; -+ static char crcbuf[0x400]; -+ -+ printk(KERN_INFO "Fixing up AR525W header, old image size: %u, new image size: %u\n", -+ header->imagesz, bufferlength); -+ -+ buffer = vmalloc(bufferlength); -+ if (!buffer) { -+ printk(KERN_ERR "Can't allocate %u bytes\n", bufferlength); -+ return -ENOMEM; -+ } -+ -+ res = mtd_read(master, 0x0, bufferlength, &len, buffer); -+ if (res || len != bufferlength) -+ goto out; -+ -+ header = (struct image_header *) buffer; -+ header->imagesz = bufferlength; -+ header->checksum = 0; -+ header->fastcksum = 0; -+ -+ memcpy(crcbuf, buffer, 0x100); -+ memcpy(crcbuf + 0x100, buffer + (bufferlength >> 1) - ((bufferlength & 0x6) >> 1), 0x100); -+ memcpy(crcbuf + 0x200, buffer + bufferlength - 0x200, 0x200); -+ -+ header->fastcksum = crc32(crcbuf, sizeof(crcbuf)); -+ header->checksum = crc32(buffer, bufferlength); -+ -+ res = mtd_unlock(master, 0, master->erasesize); -+ if (res != 0 && res != -EOPNOTSUPP) { -+ printk(KERN_ERR "Can't unlock image header\n"); -+ goto out; -+ } -+ -+ res = erase_write (master, 0, master->erasesize, buffer); -+ if (res) -+ printk(KERN_ERR "Can't rewrite image header\n"); -+ -+out: -+ vfree(buffer); -+ return res; -+} -+ -+static int __init -+parse_ar525w_partitions(struct mtd_info *master, struct mtd_partition **pparts, -+ struct mtd_part_parser_data *plat_data) -+{ -+ struct image_header header; -+ int res; -+ size_t len; -+ struct mtd_partition *rdc_flash_parts; -+ struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data; -+ -+ if (master->size != 0x400000) //4MB -+ return -ENOSYS; -+ -+ res = mtd_read(master, 0x0, sizeof(header), &len, (char *)&header); -+ if (res) -+ return res; -+ -+ if (strncmp(header.magic, "GMTK", 4)) -+ return -ENOSYS; -+ -+ if (header.kernelsz > 0x400000 || header.kernelsz < master->erasesize) { -+ printk(KERN_ERR "AR525W image header found, but seems corrupt, kernel size %u\n", header.kernelsz); -+ return -EINVAL; -+ } -+ -+ if (header.kernelsz + sizeof(header) != header.imagesz) { -+ res = fixup_ar525w_header(master, &header); -+ if (res) -+ return res; -+ } -+ -+ rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL); -+ -+ rdc_flash_parts[0].name = "firmware"; -+ rdc_flash_parts[0].offset = 0x0; -+ rdc_flash_parts[0].size = 0x3E0000; -+ rdc_flash_parts[1].name = "rootfs"; -+ rdc_flash_parts[1].offset = header.kernelsz + sizeof(header); -+ rdc_flash_parts[1].size = rdc_flash_parts[0].size - rdc_flash_parts[1].offset; -+ rdc_flash_parts[2].name = "bootloader"; -+ rdc_flash_parts[2].offset = 0x3E0000; -+ rdc_flash_parts[2].size = 0x20000; -+ -+ *pparts = rdc_flash_parts; -+ -+ pdata->led_data.num_leds = ARRAY_SIZE(ar525w_leds); -+ pdata->led_data.leds = ar525w_leds; -+ pdata->button_data.nbuttons = ARRAY_SIZE(ar525w_btns); -+ pdata->button_data.buttons = ar525w_btns; -+ -+ return 3; -+} -+ -+static struct mtd_part_parser __initdata ar525w_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = parse_ar525w_partitions, -+ .name = "AR525W", -+}; -+ -+static int __init ar525w_setup(void) -+{ -+ return register_mtd_parser(&ar525w_parser); -+} -+ -+arch_initcall(ar525w_setup); ---- /dev/null -+++ b/arch/x86/mach-rdc321x/boards/bifferboard.c -@@ -0,0 +1,74 @@ -+/* -+ * Bifferboard RDC321x platform devices -+ * -+ * Copyright (C) 2010 bifferos@yahoo.co.uk -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+static int __init -+parse_bifferboard_partitions(struct mtd_info *master, -+ struct mtd_partition **pparts, -+ struct mtd_part_parser_data *plat_data) -+{ -+ int res; -+ size_t len; -+ struct mtd_partition *rdc_flash_parts; -+ u32 kernel_len; -+ u16 tmp; -+ -+ res = mtd_read(master, 0x4000 + 1036, 2, &len, (char *) &tmp); -+ if (res) -+ return res; -+ kernel_len = tmp * master->erasesize; -+ -+ rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL); -+ -+ *pparts = rdc_flash_parts; -+ -+ rdc_flash_parts[0].name = "kernel"; -+ rdc_flash_parts[0].offset = 0; -+ rdc_flash_parts[0].size = kernel_len; -+ rdc_flash_parts[1].name = "rootfs"; -+ rdc_flash_parts[1].offset = kernel_len; -+ rdc_flash_parts[1].size = master->size - kernel_len - 0x10000; -+ rdc_flash_parts[2].name = "biffboot"; -+ rdc_flash_parts[2].offset = master->size - 0x10000; -+ rdc_flash_parts[2].size = 0x10000; -+ -+ return 3; -+} -+ -+struct mtd_part_parser __initdata bifferboard_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = parse_bifferboard_partitions, -+ .name = "Bifferboard", -+}; -+ -+static int __init bifferboard_setup(void) -+{ -+ return register_mtd_parser(&bifferboard_parser); -+} -+arch_initcall(bifferboard_setup); ---- /dev/null -+++ b/arch/x86/mach-rdc321x/boards/r8610.c -@@ -0,0 +1,69 @@ -+/* -+ * R8610 RDC321x platform devices -+ * -+ * Copyright (C) 2009, Florian Fainelli -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+static int __init -+parse_r8610_partitions(struct mtd_info *master, struct mtd_partition **pparts, -+ struct mtd_part_parser_data *plat_data) -+{ -+ struct mtd_partition *rdc_flash_parts; -+ -+ rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 4, GFP_KERNEL); -+ -+ *pparts = rdc_flash_parts; -+ -+ rdc_flash_parts[0].name = "kernel"; -+ rdc_flash_parts[0].size = 0x001f0000; -+ rdc_flash_parts[0].offset = 0; -+ rdc_flash_parts[1].name = "config"; -+ rdc_flash_parts[1].size = 0x10000; -+ rdc_flash_parts[1].offset = MTDPART_OFS_APPEND; -+ rdc_flash_parts[2].name = "rootfs"; -+ rdc_flash_parts[2].size = 0x1E0000; -+ rdc_flash_parts[2].offset = MTDPART_OFS_APPEND; -+ rdc_flash_parts[3].name = "redboot"; -+ rdc_flash_parts[3].size = 0x20000; -+ rdc_flash_parts[3].offset = MTDPART_OFS_APPEND; -+ rdc_flash_parts[3].mask_flags = MTD_WRITEABLE; -+ -+ return 4; -+} -+ -+struct mtd_part_parser __initdata r8610_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = parse_r8610_partitions, -+ .name = "R8610", -+}; -+ -+static int __init r8610_setup(void) -+{ -+ return register_mtd_parser(&r8610_parser); -+} -+ -+arch_initcall(r8610_setup); ---- /dev/null -+++ b/arch/x86/mach-rdc321x/boards/sitecom.c -@@ -0,0 +1,115 @@ -+/* -+ * Sitecom RDC321x platform devices -+ * -+ * Copyright (C) 2007-2009 OpenWrt.org -+ * Copyright (C) 2007 Florian Fainelli -+ * Copyright (C) 2008-2009 Daniel Gimpelevich -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+struct image_header { -+ char magic[4]; -+ u32 kernel_length; -+ u32 ramdisk_length; -+ char magic2[4]; -+ u32 kernel_length2; -+}; -+ -+static struct gpio_led sitecom_leds[] = { -+ { .name = "rdc321x:power", .gpio = 15, .active_low = 1}, -+ { .name = "rdc321x:usb0", .gpio = 0, .active_low = 1}, -+ { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1}, -+}; -+ -+static struct gpio_keys_button sitecom_btns[] = { -+ { -+ .gpio = 6, -+ .code = BTN_0, -+ .desc = "Reset", -+ .active_low = 1, -+ } -+}; -+ -+static int __init -+parse_sitecom_partitions(struct mtd_info *master, struct mtd_partition **pparts, -+ struct mtd_part_parser_data *plat_data) -+{ -+ struct image_header header; -+ int res; -+ size_t len; -+ struct mtd_partition *rdc_flash_parts; -+ struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data; -+ -+ if (master->size != 0x400000) /* 4MB */ -+ return -ENOSYS; -+ -+ res = mtd_read(master, 0x8000, sizeof(header), &len, (char *)&header); -+ if (res) -+ return res; -+ -+ if (strncmp(header.magic, "CSYS", 4) || strncmp(header.magic2, "WRRM", 4)) -+ return -ENOSYS; -+ -+ rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 5, GFP_KERNEL); -+ -+ rdc_flash_parts[0].name = "firmware"; -+ rdc_flash_parts[0].offset = 0x8000; -+ rdc_flash_parts[0].size = 0x3F0000 - 0x8000; -+ rdc_flash_parts[1].name = "config"; -+ rdc_flash_parts[1].offset = 0; -+ rdc_flash_parts[1].size = 0x8000; -+ rdc_flash_parts[2].name = "kernel"; -+ rdc_flash_parts[2].offset = 0x8014; -+ rdc_flash_parts[2].size = header.kernel_length; -+ rdc_flash_parts[3].name = "rootfs"; -+ rdc_flash_parts[3].offset = 0x8014 + header.kernel_length; -+ rdc_flash_parts[3].size = 0x3F0000 - rdc_flash_parts[3].offset; -+ rdc_flash_parts[4].name = "bootloader"; -+ rdc_flash_parts[4].offset = 0x3F0000; -+ rdc_flash_parts[4].size = 0x10000; -+ -+ *pparts = rdc_flash_parts; -+ -+ pdata->led_data.num_leds = ARRAY_SIZE(sitecom_leds); -+ pdata->led_data.leds = sitecom_leds; -+ pdata->button_data.nbuttons = ARRAY_SIZE(sitecom_btns); -+ pdata->button_data.buttons = sitecom_btns; -+ -+ return 5; -+} -+ -+struct mtd_part_parser __initdata sitecom_parser = { -+ .owner = THIS_MODULE, -+ .parse_fn = parse_sitecom_partitions, -+ .name = "Sitecom", -+}; -+ -+static int __init sitecom_setup(void) -+{ -+ return register_mtd_parser(&sitecom_parser); -+} -+ -+arch_initcall(sitecom_setup); ---- /dev/null -+++ b/arch/x86/mach-rdc321x/reboot.c -@@ -0,0 +1,44 @@ -+/* -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include -+#include -+ -+static void rdc321x_reset(void) -+{ -+ unsigned i; -+ -+ /* write to southbridge config register 0x41 -+ enable pci reset on cpu reset, make internal port 0x92 writeable -+ and switch port 0x92 to internal */ -+ outl(0x80003840, 0xCF8); -+ i = inl(0xCFC); -+ i |= 0x1600; -+ outl(i, 0xCFC); -+ -+ /* soft reset */ -+ outb(1, 0x92); -+} -+ -+static int __init rdc_setup_reset(void) -+{ -+ machine_ops.emergency_restart = rdc321x_reset; -+ return 0; -+} -+ -+arch_initcall(rdc_setup_reset); ---- /dev/null -+++ b/arch/x86/include/asm/rdc_boards.h -@@ -0,0 +1,36 @@ -+/* -+ * RDC321x boards -+ * -+ * Copyright (C) 2007-2009 OpenWrt.org -+ * Copyright (C) 2007 Florian Fainelli -+ * Copyright (C) 2008-2009 Daniel Gimpelevich -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#ifndef _RDC_BOARDS_H__ -+#define _RDC_BOARDS_H__ -+ -+#include -+#include -+ -+struct rdc_platform_data { -+ struct gpio_led_platform_data led_data; -+ struct gpio_keys_platform_data button_data; -+}; -+ -+#endif diff --git a/trunk/target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch b/trunk/target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch deleted file mode 100644 index 0432686c..00000000 --- a/trunk/target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/mfd/rdc321x-southbridge.c -+++ b/drivers/mfd/rdc321x-southbridge.c -@@ -85,6 +85,8 @@ static int rdc321x_sb_probe(struct pci_d - rdc321x_gpio_pdata.sb_pdev = pdev; - rdc321x_wdt_pdata.sb_pdev = pdev; - -+ panic_on_unrecovered_nmi = 1; -+ - return mfd_add_devices(&pdev->dev, -1, - rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), - NULL, 0, NULL); diff --git a/trunk/target/linux/x86/patches-3.18/150-pit-tick-rate.patch b/trunk/target/linux/x86/patches-3.18/150-pit-tick-rate.patch deleted file mode 100644 index ea2da0ce..00000000 --- a/trunk/target/linux/x86/patches-3.18/150-pit-tick-rate.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/include/linux/timex.h -+++ b/include/linux/timex.h -@@ -158,6 +158,10 @@ int read_current_timer(unsigned long *ti - void ntp_notify_cmos_timer(void); - - /* The clock frequency of the i8253/i8254 PIT */ -+#ifdef CONFIG_X86_RDC321X -+#define PIT_TICK_RATE 1041816ul -+#else - #define PIT_TICK_RATE 1193182ul -+#endif - - #endif /* LINUX_TIMEX_H */ diff --git a/trunk/target/linux/x86/patches-3.18/160-kexec-fix.patch b/trunk/target/linux/x86/patches-3.18/160-kexec-fix.patch deleted file mode 100644 index ea32494a..00000000 --- a/trunk/target/linux/x86/patches-3.18/160-kexec-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 357954613bdbab0c1f3986589ff30cc4855a2efd Mon Sep 17 00:00:00 2001 -From: root -Date: Sun, 6 Dec 2009 18:26:43 +0000 -Subject: [PATCH 03/14] kexec fix - ---- - arch/x86/kernel/relocate_kernel_32.S | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - ---- a/arch/x86/kernel/relocate_kernel_32.S -+++ b/arch/x86/kernel/relocate_kernel_32.S -@@ -54,8 +54,10 @@ relocate_kernel: - movl %eax, CR0(%edi) - movl %cr3, %eax - movl %eax, CR3(%edi) -+#ifndef CONFIG_X86_RDC321X - movl %cr4, %eax - movl %eax, CR4(%edi) -+#endif - - /* read the arguments and say goodbye to the stack */ - movl 20+4(%esp), %ebx /* page_list */ -@@ -124,7 +126,9 @@ identity_mapped: - * Setting everything to zero seems safe. - */ - xorl %eax, %eax -+#ifndef CONFIG_X86_RDC321X - movl %eax, %cr4 -+#endif - - jmp 1f - 1: -@@ -195,8 +199,10 @@ identity_mapped: - ret - - virtual_mapped: -+#ifndef CONFIG_X86_RDC321X - movl CR4(%edi), %eax - movl %eax, %cr4 -+#endif - movl CR3(%edi), %eax - movl %eax, %cr3 - movl CR0(%edi), %eax diff --git a/trunk/target/linux/x86/rdc/base-files/etc/config/network b/trunk/target/linux/x86/rdc/base-files/etc/config/network deleted file mode 100644 index 69627f7c..00000000 --- a/trunk/target/linux/x86/rdc/base-files/etc/config/network +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2009 OpenWrt.org - -config interface loopback - option ifname lo - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - -config interface lan - option ifname eth1 - option type bridge - option proto static - option ipaddr 192.168.1.1 - option netmask 255.255.255.0 - option ip6assign 60 - -config interface wan - option ifname eth0 - option proto dhcp - -config interface wan6 - option ifname eth0 - option proto dhcpv6 - -config globals globals - option ula_prefix auto diff --git a/trunk/target/linux/x86/rdc/base-files/etc/diag.sh b/trunk/target/linux/x86/rdc/base-files/etc/diag.sh deleted file mode 100644 index 03796d77..00000000 --- a/trunk/target/linux/x86/rdc/base-files/etc/diag.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2013 OpenWrt.org - -. /lib/functions/leds.sh - -status_led="rdc321x:dmz" - -set_state() { - case "$1" in - preinit) - status_led_on - ;; - done) - status_led_off - ;; - esac -} diff --git a/trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc b/trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc deleted file mode 100644 index 0518766a..00000000 --- a/trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009-2012 OpenWrt.org - -. /lib/functions.sh - -r6040_module() { - insmod libphy - insmod swconfig - insmod ip17xx - sleep 1 - insmod r6040 -} - -set_ether_mac() { - kernel=$(grep firmware /proc/mtd | awk -F: '{print $1}') - [ -n "$kernel" ] && hdr=$(dd if=/dev/$kernel count=4 bs=1 2> /dev/null) - [ "$hdr" = "CSYS" ] && config=$(find_mtd_part config) - if [ -n "$config" ]; then - mac0=$(hexdump -n 6 -e '6/1 ":%X"' -s 24583 $config | cut -c2-) - [ "$mac0" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac0 - mac1=$(hexdump -n 6 -e '6/1 ":%X"' -s 24589 $config | cut -c2-) - [ "$mac1" = "FF:FF:FF:FF:FF:FF" -o "$mac1" = "0:0:0:0:0:0" ] && unset mac1 - fi - if [ -n "$mac0" ]; then - logger -t kernel -p user.info "r6040: Setting MAC for eth0 to $mac0" - ifconfig eth0 hw ether "$mac0" - fi - if [ -n "$mac1" ]; then - logger -t kernel -p user.info "r6040: Setting MAC for eth1 to $mac1" - ifconfig eth1 hw ether "$mac1" - fi -} - -boot_hook_add preinit_main r6040_module -boot_hook_add preinit_main set_ether_mac - diff --git a/trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh b/trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh deleted file mode 100644 index 6348a699..00000000 --- a/trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,10 +0,0 @@ -PART_NAME=firmware - -platform_check_image() { - [ "$(get_magic_word $(find_mtd_part firmware))" -eq "$(get_magic_word "$1")" ] && return 0 - - echo "Invalid image type. Please use an appropriate .bin file" - return 1 -} - -# use default for platform_do_upgrade() diff --git a/trunk/target/linux/x86/rdc/config-default b/trunk/target/linux/x86/rdc/config-default deleted file mode 100644 index 34007acb..00000000 --- a/trunk/target/linux/x86/rdc/config-default +++ /dev/null @@ -1,65 +0,0 @@ -CONFIG_ARCH_RANDOM=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARPD is not set -# CONFIG_BASE_FULL is not set -CONFIG_BASE_SMALL=1 -# CONFIG_BLK_DEV_INITRD is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BRIDGE=m -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CMDLINE="console=uart,io,0x3f8 rootfstype=squashfs,jffs2" -CONFIG_CMDLINE_BOOL=y -# CONFIG_CMDLINE_OVERRIDE is not set -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CPU_SUP_AMD is not set -# CONFIG_CPU_SUP_CENTAUR is not set -# CONFIG_CPU_SUP_CYRIX_32 is not set -# CONFIG_CPU_SUP_INTEL is not set -# CONFIG_CPU_SUP_TRANSMETA_32 is not set -# CONFIG_CPU_SUP_UMC_32 is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_EARLY_PRINTK is not set -# CONFIG_FIRMWARE_MEMMAP is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_RDC321X=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HPET_TIMER is not set -CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_IP_MROUTE is not set -CONFIG_IRQ_DOMAIN=y -# CONFIG_JFFS2_SUMMARY is not set -CONFIG_LEDS_GPIO=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set -# CONFIG_LEDS_TRIGGER_TIMER is not set -CONFIG_LLC=m -CONFIG_MFD_CORE=y -CONFIG_MFD_RDC321X=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MTRR is not set -CONFIG_NLS=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y -# CONFIG_PCI_QUIRKS is not set -CONFIG_PHYSICAL_START=0x100000 -CONFIG_PROCESSOR_SELECT=y -CONFIG_RDC321X_WDT=m -# CONFIG_SCx200 is not set -# CONFIG_SHMEM is not set -CONFIG_STP=m -CONFIG_VLAN_8021Q=m -# CONFIG_VM86 is not set -CONFIG_X86_EXTENDED_PLATFORM=y -# CONFIG_X86_GENERIC is not set -CONFIG_X86_INTERNODE_CACHE_SHIFT=4 -CONFIG_X86_L1_CACHE_SHIFT=4 -# CONFIG_X86_MCE is not set -# CONFIG_X86_PLATFORM_DEVICES is not set -# CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_RDC321X=y -CONFIG_X86_REBOOTFIXUPS=y -# CONFIG_X86_UP_APIC is not set -# CONFIG_X86_VERBOSE_BOOTUP is not set -# CONFIG_X86_WANT_INTEL_MID is not set diff --git a/trunk/target/linux/x86/rdc/profiles/ar525w.mk b/trunk/target/linux/x86/rdc/profiles/ar525w.mk deleted file mode 100644 index d38cb1f2..00000000 --- a/trunk/target/linux/x86/rdc/profiles/ar525w.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/ar525w - NAME:=Airlink AR525W - PACKAGES:=kmod-rt61-pci kmod-switch-ip17xx swconfig -endef -$(eval $(call Profile,ar525w)) diff --git a/trunk/target/linux/x86/rdc/profiles/bifferboard.mk b/trunk/target/linux/x86/rdc/profiles/bifferboard.mk deleted file mode 100644 index 35fea452..00000000 --- a/trunk/target/linux/x86/rdc/profiles/bifferboard.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/bifferboard - NAME:=Bifferboard - PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 \ - kmod-usb-storage kmod-scsi-core kmod-fs-ext4 -endef -$(eval $(call Profile,bifferboard)) diff --git a/trunk/target/linux/x86/rdc/profiles/r8610.mk b/trunk/target/linux/x86/rdc/profiles/r8610.mk deleted file mode 100644 index d5f8c0a8..00000000 --- a/trunk/target/linux/x86/rdc/profiles/r8610.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/r8610 - NAME:=RDC R8610 Evaluation Board - PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 \ - kmod-hwmon-core kmod-hwmon-w83627hf kmod-ide-core kmod-ide-it821x \ - kmod-rtc-core kmod-rtc-m48t86 kmod-fs-ext4 -endef -$(eval $(call Profile,r8610)) diff --git a/trunk/target/linux/x86/rdc/profiles/sitecom.mk b/trunk/target/linux/x86/rdc/profiles/sitecom.mk deleted file mode 100644 index e3b2981e..00000000 --- a/trunk/target/linux/x86/rdc/profiles/sitecom.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/sitecom - NAME:=Devices from Sitecom (WL-153, DC-230) - PACKAGES:=kmod-rt61-pci kmod-usb-core kmod-usb-ohci kmod-usb2 -endef -$(eval $(call Profile,sitecom)) diff --git a/trunk/target/linux/x86/rdc/target.mk b/trunk/target/linux/x86/rdc/target.mk deleted file mode 100644 index 9b03b15b..00000000 --- a/trunk/target/linux/x86/rdc/target.mk +++ /dev/null @@ -1,13 +0,0 @@ -BOARDNAME:=RDC R-321x -FEATURES:=squashfs pci usb gpio pcmcia -MAINTAINER:=Florian Fainelli -FEATURES += broken - -DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \ - wpad-mini kmod-libphy kmod-r6040 kmod-input-core \ - kmod-input-polldev kmod-button-hotplug kmod-rdc321x-wdt - -define Target/Description - Build firmware images for RDC321x based routers - (e.g. Airlink101 AR525W, Linksys WRT54GR, Sitecom WL-153) -endef diff --git a/trunk/target/linux/x86/xen_domu/base-files/etc/inittab b/trunk/target/linux/x86/xen_domu/base-files/etc/inittab deleted file mode 100644 index 469b8a9a..00000000 --- a/trunk/target/linux/x86/xen_domu/base-files/etc/inittab +++ /dev/null @@ -1,5 +0,0 @@ -::sysinit:/etc/init.d/rcS S boot -::shutdown:/etc/init.d/rcS K stop -tts/0::askfirst:/bin/ash --login -hvc0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login diff --git a/trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs b/trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs deleted file mode 100644 index 7b076051..00000000 --- a/trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Copyright (C) 2010 OpenWrt.org - -do_mount_xenfs() { - [ -f /etc/modules.d/??-xenfs ] && { - insmod $(cat /etc/modules.d/??-xenfs) - mount -o noatime none /proc/xen -t xenfs - } -} - -boot_hook_add preinit_mount_root do_mount_xenfs diff --git a/trunk/target/linux/x86/xen_domu/config-default b/trunk/target/linux/x86/xen_domu/config-default deleted file mode 100644 index f2c8ba84..00000000 --- a/trunk/target/linux/x86/xen_domu/config-default +++ /dev/null @@ -1,86 +0,0 @@ -# CONFIG_APM is not set -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -CONFIG_CPU_RMAP=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_FREEZER=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_HIBERNATE_CALLBACKS=y -# CONFIG_HIGHMEM64G is not set -CONFIG_HOTPLUG_CPU=y -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -CONFIG_IOMMU_HELPER=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_XZ is not set -# CONFIG_LGUEST_GUEST is not set -# CONFIG_M486 is not set -CONFIG_MMU_NOTIFIER=y -CONFIG_MPENTIUM4=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NR_CPUS=4 -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_SPINLOCKS=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_PCI_XEN=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_SCHED_MC=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SMP=y -CONFIG_STOP_MACHINE=y -CONFIG_SWIOTLB=y -CONFIG_SWIOTLB_XEN=y -CONFIG_SYS_HYPERVISOR=y -CONFIG_TREE_RCU=y -CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_VMWARE_BALLOON is not set -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_X86_32_SMP=y -# CONFIG_X86_BIGSMP is not set -CONFIG_X86_CMOV=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_X86_HT=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=7 -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_X86_PAE=y -CONFIG_X86_TSC=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_XEN=y -# CONFIG_XENFS is not set -CONFIG_XEN_BALLOON=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_DEBUG_FS=y -# CONFIG_XEN_DEV_EVTCHN is not set -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=64 -# CONFIG_XEN_NETDEV_FRONTEND is not set -# CONFIG_XEN_PCIDEV_FRONTEND is not set -CONFIG_XEN_PRIVCMD=m -# CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_XEN_PVHVM=y -CONFIG_XEN_SAVE_RESTORE=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_SCSI_FRONTEND=y -CONFIG_XEN_SYS_HYPERVISOR=y -# CONFIG_XEN_WDT is not set -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XPS=y diff --git a/trunk/target/linux/x86/xen_domu/target.mk b/trunk/target/linux/x86/xen_domu/target.mk deleted file mode 100644 index 80bac3b8..00000000 --- a/trunk/target/linux/x86/xen_domu/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOARDNAME:=Xen Paravirt Guest -DEFAULT_PACKAGES += kmod-xen-fs kmod-xen-evtchn kmod-xen-netdev kmod-xen-kbddev -FEATURES:=display diff --git a/trunk/toolchain/Config.in b/trunk/toolchain/Config.in index 7e5a4c67..b1ac001c 100644 --- a/trunk/toolchain/Config.in +++ b/trunk/toolchain/Config.in @@ -211,14 +211,14 @@ comment "C Library" choice prompt "C Library implementation" if TOOLCHAINOPTS - default LIBC_USE_EGLIBC if (aarch64 || aarch64_be) + default LIBC_USE_GLIBC if (aarch64 || aarch64_be) default LIBC_USE_UCLIBC help Select the C library implementation. - config LIBC_USE_EGLIBC - bool "Use eglibc" - select USE_EGLIBC + config LIBC_USE_GLIBC + bool "Use glibc" + select USE_GLIBC depends on !avr32 config LIBC_USE_UCLIBC @@ -233,7 +233,7 @@ choice endchoice -source "toolchain/eglibc/Config.in" +source "toolchain/glibc/Config.in" source "toolchain/uClibc/Config.in" source "toolchain/musl/Config.in" @@ -256,7 +256,7 @@ config INSIGHT help Enable if you want to build insight-gdb. -config USE_EGLIBC +config USE_GLIBC bool default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (aarch64 || aarch64_be || octeon) @@ -273,26 +273,26 @@ config USE_EXTERNAL_LIBC source "toolchain/gcc/Config.version" -source "toolchain/eglibc/Config.version" +source "toolchain/glibc/Config.version" source "toolchain/uClibc/Config.version" source "toolchain/musl/Config.version" config LIBC string - default "eglibc" if USE_EGLIBC + default "glibc" if USE_GLIBC default "uClibc" if USE_UCLIBC default "musl" if USE_MUSL config LIBC_VERSION string - default EGLIBC_VERSION if USE_EGLIBC + default GLIBC_VERSION if USE_GLIBC default UCLIBC_VERSION if USE_UCLIBC default MUSL_VERSION if USE_MUSL config TARGET_SUFFIX string - default "gnueabi" if USE_EGLIBC && (arm || armeb) - default "gnu" if USE_EGLIBC && !(arm || armeb) + default "gnueabi" if USE_GLIBC && (arm || armeb) + default "gnu" if USE_GLIBC && !(arm || armeb) default "uclibcgnueabi" if USE_UCLIBC && (arm || armeb) default "uclibc" if USE_UCLIBC && !(arm || armeb) default "muslgnueabi" if USE_MUSL && (arm || armeb) diff --git a/trunk/toolchain/eglibc/Config.in b/trunk/toolchain/eglibc/Config.in deleted file mode 100644 index dd6bb435..00000000 --- a/trunk/toolchain/eglibc/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -choice - prompt "eglibc version" - depends on TOOLCHAINOPTS && USE_EGLIBC - default EGLIBC_USE_VERSION_2_19 - help - Select the version of eglibc you wish to use. - - config EGLIBC_USE_VERSION_2_15 - bool "eglibc 2.15" - select EGLIBC_VERSION_2_15 - - config EGLIBC_USE_VERSION_2_19 - bool "eglibc 2.19" - select EGLIBC_VERSION_2_19 - -endchoice - -menu "eglibc configuration" - depends on TOOLCHAINOPTS && USE_EGLIBC - source toolchain/eglibc/config/Config.in -endmenu diff --git a/trunk/toolchain/eglibc/Config.version b/trunk/toolchain/eglibc/Config.version deleted file mode 100644 index 3c0f0efe..00000000 --- a/trunk/toolchain/eglibc/Config.version +++ /dev/null @@ -1,26 +0,0 @@ -if USE_EGLIBC - -config EGLIBC_VERSION - string - default "2.15" if EGLIBC_VERSION_2_15 - default "2.19" if EGLIBC_VERSION_2_19 - -config EGLIBC_VERSION_2_15 - bool - -config EGLIBC_VERSION_2_19 - default y if !TOOLCHAINOPTS - bool - -config EGLIBC_REVISION - string - default "18909" if EGLIBC_VERSION_2_15 - default "25243" if EGLIBC_VERSION_2_19 - default "" - -endif - -menu "eglibc configuration" - depends on !TOOLCHAINOPTS && USE_EGLIBC - source toolchain/eglibc/config/Config.in -endmenu diff --git a/trunk/toolchain/eglibc/Makefile b/trunk/toolchain/eglibc/Makefile deleted file mode 100644 index f880db81..00000000 --- a/trunk/toolchain/eglibc/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -PATH_PREFIX := . -VARIANT:=final -HOST_BUILD_PARALLEL:=0 - -include ./common.mk - -define Host/Compile - $(MAKE) -C $(CUR_BUILD_DIR) \ - PARALLELMFLAGS="$(HOST_JOBS)" \ - BUILD_CFLAGS="$(HOST_CFLAGS)" \ - all -endef - -define Host/Install - $(call Host/SetToolchainInfo) - $(MAKE) -C $(CUR_BUILD_DIR) \ - BUILD_CFLAGS="$(HOST_CFLAGS)" \ - install_root="$(TOOLCHAIN_DIR)" \ - install - ( cd $(TOOLCHAIN_DIR) ; \ - for d in lib usr/lib ; do \ - for f in libc.so libpthread.so libgcc_s.so ; do \ - if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \ - $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \ - fi \ - done \ - done \ - ) -endef - -$(eval $(call HostBuild)) diff --git a/trunk/toolchain/eglibc/common.mk b/trunk/toolchain/eglibc/common.mk deleted file mode 100644 index 9ef92c66..00000000 --- a/trunk/toolchain/eglibc/common.mk +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=eglibc -PKG_VERSION:=$(call qstrip,$(CONFIG_EGLIBC_VERSION)) -PKG_REVISION:=$(call qstrip,$(CONFIG_EGLIBC_REVISION)) - -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_VERSION:=$(PKG_REVISION) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 - -ifneq ($(CONFIG_EGLIBC_VERSION_2_15),) - PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_15 -endif -ifneq ($(CONFIG_EGLIBC_VERSION_2_19),) - PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_19 -endif - -PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION) - -HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR) -CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT) - -include $(INCLUDE_DIR)/toolchain-build.mk - -HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared -HOST_STAMP_CONFIGURED:=$(CUR_BUILD_DIR)/.configured -HOST_STAMP_BUILT:=$(CUR_BUILD_DIR)/.built -HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_$(VARIANT)_installed - -ifeq ($(ARCH),mips64) - ifdef CONFIG_MIPS64_ABI_N64 - TARGET_CFLAGS += -mabi=64 - endif - ifdef CONFIG_MIPS64_ABI_N32 - TARGET_CFLAGS += -mabi=n32 - endif - ifdef CONFIG_MIPS64_ABI_O32 - TARGET_CFLAGS += -mabi=32 - endif -endif - -EGLIBC_CONFIGURE:= \ - BUILD_CC="$(HOSTCC)" \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - libc_cv_slibdir="/lib" \ - use_ldconfig=no \ - $(HOST_BUILD_DIR)/libc/configure \ - --prefix= \ - --build=$(GNU_HOST_NAME) \ - --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_DIR)/include \ - --disable-profile \ - --without-gd \ - --without-cvs \ - --enable-add-ons \ - --$(if $(CONFIG_SOFT_FLOAT),without,with)-fp - -export libc_cv_ssp=no -export ac_cv_header_cpuid_h=yes -export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include - -define Host/SetToolchainInfo - $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk - $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk - $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk - $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk -endef - -define Host/Configure - [ -f $(HOST_BUILD_DIR)/.autoconf ] || { \ - cd $(HOST_BUILD_DIR)/libc; \ - autoconf --force && \ - touch $(HOST_BUILD_DIR)/.autoconf; \ - } - mkdir -p $(CUR_BUILD_DIR) - grep 'CONFIG_EGLIBC_OPTION_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_EGLIBC_\\(.*\\),\\1\\2,g" > $(CUR_BUILD_DIR)/option-groups.config - ( cd $(CUR_BUILD_DIR); rm -f config.cache; \ - $(EGLIBC_CONFIGURE) \ - ); -endef - -define Host/Prepare - $(call Host/Prepare/Default) - ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) - $(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults -ifneq ($(CONFIG_EGLIBC_VERSION_2_15),) - ln -sf ../ports $(HOST_BUILD_DIR)/libc/ -endif -endef - -define Host/Clean - rm -rf $(CUR_BUILD_DIR)* \ - $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \ - $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) -endef diff --git a/trunk/toolchain/eglibc/config/Config.in b/trunk/toolchain/eglibc/config/Config.in deleted file mode 100644 index 6f022234..00000000 --- a/trunk/toolchain/eglibc/config/Config.in +++ /dev/null @@ -1,903 +0,0 @@ -config EGLIBC_OPTION_EGLIBC_ADVANCED_INET6 - bool "IPv6 Advanced Sockets API support (RFC3542)" - default y - select EGLIBC_OPTION_EGLIBC_INET - help - This option group includes the functions specified by RFC 3542, - "Advanced Sockets Application Program Interface (API) for - IPv6". - - This option group includes the following functions: - - inet6_opt_append - inet6_opt_find - inet6_opt_finish - inet6_opt_get_val - inet6_opt_init - inet6_option_alloc - inet6_option_append - inet6_option_find - inet6_option_init - inet6_option_next - inet6_option_space - inet6_opt_next - inet6_opt_set_val - inet6_rth_add - inet6_rth_getaddr - inet6_rth_init - inet6_rth_reverse - inet6_rth_segments - inet6_rth_space - - -config EGLIBC_OPTION_EGLIBC_BACKTRACE - bool "Functions for producing backtraces" - default y - help - This option group includes functions for producing a list of - the function calls that are currently active in a thread, from - within the thread itself. These functions are often used - within signal handlers, to produce diagnostic output. - - This option group includes the following functions: - - backtrace - backtrace_symbols - backtrace_symbols_fd - - -config EGLIBC_OPTION_EGLIBC_BIG_MACROS - bool "Use extensive inline code" - default y - help - This option group specifies whether certain pieces of code - should be inlined to achieve maximum speed. If this option - group is not selected, function calls will be used instead, - hence reducing the library footprint. - - -config EGLIBC_OPTION_EGLIBC_BSD - bool "BSD-specific functions, and their compatibility stubs" - default y - help - This option group includes functions specific to BSD kernels. - A number of these functions have stub versions that are also - included in libraries built for non-BSD systems for - compatibility. - - This option group includes the following functions: - - chflags - fchflags - lchmod - revoke - setlogin - - -config EGLIBC_OPTION_EGLIBC_CXX_TESTS - bool "Tests that link against the standard C++ library." - default y - select EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO - select EGLIBC_OPTION_EGLIBC_LIBM - help - This option group does not include any C library functions; - instead, it controls which EGLIBC tests an ordinary 'make - tests' runs. With this group disabled, tests that would - normally link against the standard C++ library are not - run. - - The standard C++ library depends on the math library 'libm' and - the wide character I/O functions included in EGLIBC. If those - option groups are disabled, this test must also be disabled. - - -config EGLIBC_OPTION_EGLIBC_CATGETS - bool "Functions for accessing message catalogs" - default y - select EGLIBC_OPTION_EGLIBC_LOCALE_CODE - help - This option group includes functions for accessing message - catalogs: catopen, catclose, and catgets. - - This option group depends on the EGLIBC_OPTION_EGLIBC_LOCALE_CODE - option group; if you disable that, you must also disable this. - - -config EGLIBC_OPTION_EGLIBC_CHARSETS - bool "iconv/gconv character set conversion libraries" - default y - help - - This option group includes support for character sets other - than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their - various encodings. This affects both the character sets - supported by the wide and multibyte character functions, and - those supported by the 'iconv' functions. - - With this option group disabled, EGLIBC supports only the - following character sets: - - ANSI_X3.4 - ASCII - ANSI_X3.4-1968 - ANSI_X3.4-1986 - ASCII - CP367 - CSASCII - IBM367 - ISO-IR-6 - ISO646-US - ISO_646.IRV:1991 - OSF00010020 - US - US-ASCII - - 10646-1:1993 - ISO 10646, in big-endian UCS4 form - 10646-1:1993/UCS4 - CSUCS4 - ISO-10646 - ISO-10646/UCS4 - OSF00010104 - OSF00010105 - OSF00010106 - UCS-4 - UCS-4BE - UCS4 - - UCS-4LE - ISO 10646, in little-endian UCS4 form - - ISO-10646/UTF-8 - ISO 10646, in UTF-8 form - ISO-10646/UTF8 - ISO-IR-193 - OSF05010001 - UTF-8 - UTF8 - - ISO-10646/UCS2 - ISO 10646, in target-endian UCS2 form - OSF00010100 - OSF00010101 - OSF00010102 - UCS-2 - UCS2 - - UCS-2BE - ISO 10646, in big-endian UCS2 form - UNICODEBIG - - UCS-2LE - ISO 10646, in little-endian UCS2 form - UNICODELITTLE - - WCHAR_T - EGLIBC's internal form (target-endian, - 32-bit ISO 10646) - - -config EGLIBC_OPTION_EGLIBC_CRYPT - bool "Encryption library" - default y - help - This option group includes the `libcrypt' library which - provides functions for one-way encryption. Supported - encryption algorithms include MD5, SHA-256, SHA-512 and DES. - - -config EGLIBC_OPTION_EGLIBC_CRYPT_UFC - bool "Ultra fast `crypt' implementation" - default y - select EGLIBC_OPTION_EGLIBC_CRYPT - help - This option group provides ultra fast DES-based implementation of - the `crypt' function. When this option group is disabled, - (a) the library will not provide the setkey[_r] and encrypt[_r] - functions and (b) the crypt[_r] function will return NULL and set the - errno to ENOSYS if /salt/ passed does not correspond to either MD5, - SHA-256 or SHA-512 algorithm. - - -config EGLIBC_OPTION_EGLIBC_DB_ALIASES - bool "Functions for accessing the mail aliases database" - default y - help - This option group includes functions for looking up mail - aliases in '/etc/aliases' or using nsswitch. It includes the - following functions: - - endaliasent - getaliasbyname - getaliasbyname_r - getaliasent - getaliasent_r - setaliasent - - When this option group is disabled, the NSS service libraries - also lack support for querying their mail alias tables. - - -config EGLIBC_OPTION_EGLIBC_ENVZ - bool "Functions for handling envz-style environment vectors." - default y - help - This option group contains functions for creating and operating - on envz vectors. An "envz vector" is a vector of strings in a - contiguous block of memory, where each element is a name-value - pair, and elements are separated from their neighbors by null - characters. - - This option group includes the following functions: - - envz_add envz_merge - envz_entry envz_remove - envz_get envz_strip - - -config EGLIBC_OPTION_EGLIBC_FCVT - bool "Functions for converting floating-point numbers to strings" - default y - help - This option group includes functions for converting - floating-point numbers to strings. - - This option group includes the following functions: - - ecvt qecvt - ecvt_r qecvt_r - fcvt qfcvt - fcvt_r qfcvt_r - gcvt qgcvt - - -config EGLIBC_OPTION_EGLIBC_FMTMSG - bool "Functions for formatting messages" - default y - help - This option group includes the following functions: - - addseverity fmtmsg - - -config EGLIBC_OPTION_EGLIBC_FSTAB - bool "Access functions for 'fstab'" - default y - help - This option group includes functions for reading the mount - point specification table, '/etc/fstab'. These functions are - not included in the POSIX standard, which provides the - 'getmntent' family of functions instead. - - This option group includes the following functions: - - endfsent getfsspec - getfsent setfsent - getfsfile - - -config EGLIBC_OPTION_EGLIBC_FTRAVERSE - bool "Functions for traversing file hierarchies" - default y - help - This option group includes functions for traversing file - UNIX file hierachies. - - This option group includes the following functions: - - fts_open ftw - fts_read nftw - fts_children ftw64 - fts_set nftw64 - fts_close - - -config EGLIBC_OPTION_EGLIBC_GETLOGIN - bool "The getlogin function" - default y - select EGLIBC_OPTION_EGLIBC_UTMP - help - This function group includes the 'getlogin' and 'getlogin_r' - functions, which return the user name associated by the login - activity with the current process's controlling terminal. - - With this option group disabled, the 'glob' function will not - fall back on 'getlogin' to find the user's login name for tilde - expansion when the 'HOME' environment variable is not set. - - -config EGLIBC_OPTION_EGLIBC_IDN - bool "International domain names support" - default y - help - This option group includes the `libcidn' library which - provides support for international domain names. - - -config EGLIBC_OPTION_EGLIBC_INET - bool "Networking support" - default y - help - This option group includes networking-specific functions and - data. With EGLIBC_OPTION_EGLIBC_INET disabled, the EGLIBC - installation and API changes as follows: - - - The following libraries are not installed: - - libanl - libnsl - libnss_compat - libnss_dns - libnss_hesiod - libnss_nis - libnss_nisplus - libresolv - - - The following functions and variables are omitted from libc: - - authdes_create hstrerror svc_fdset - authdes_getucred htonl svc_getreq - authdes_pk_create htons svc_getreq_common - authnone_create if_freenameindex svc_getreq_poll - authunix_create if_indextoname svc_getreqset - authunix_create_default if_nameindex svc_max_pollfd - bindresvport if_nametoindex svc_pollfd - callrpc in6addr_any svcraw_create - cbc_crypt in6addr_loopback svc_register - clnt_broadcast inet6_opt_append svc_run - clnt_create inet6_opt_find svc_sendreply - clnt_pcreateerror inet6_opt_finish svctcp_create - clnt_perrno inet6_opt_get_val svcudp_bufcreate - clnt_perror inet6_opt_init svcudp_create - clntraw_create inet6_option_alloc svcudp_enablecache - clnt_spcreateerror inet6_option_append svcunix_create - clnt_sperrno inet6_option_find svcunixfd_create - clnt_sperror inet6_option_init svc_unregister - clnttcp_create inet6_option_next user2netname - clntudp_bufcreate inet6_option_space xdecrypt - clntudp_create inet6_opt_next xdr_accepted_reply - clntunix_create inet6_opt_set_val xdr_array - des_setparity inet6_rth_add xdr_authdes_cred - ecb_crypt inet6_rth_getaddr xdr_authdes_verf - endaliasent inet6_rth_init xdr_authunix_parms - endhostent inet6_rth_reverse xdr_bool - endnetent inet6_rth_segments xdr_bytes - endnetgrent inet6_rth_space xdr_callhdr - endprotoent inet_addr xdr_callmsg - endrpcent inet_aton xdr_char - endservent inet_lnaof xdr_cryptkeyarg - ether_aton inet_makeaddr xdr_cryptkeyarg2 - ether_aton_r inet_netof xdr_cryptkeyres - ether_hostton inet_network xdr_des_block - ether_line inet_nsap_addr xdr_double - ether_ntoa inet_nsap_ntoa xdr_enum - ether_ntoa_r inet_ntoa xdr_float - ether_ntohost inet_ntop xdr_free - freeaddrinfo inet_pton xdr_getcredres - freeifaddrs innetgr xdr_hyper - gai_strerror iruserok xdr_int - getaddrinfo iruserok_af xdr_int16_t - getaliasbyname key_decryptsession xdr_int32_t - getaliasbyname_r key_decryptsession_pk xdr_int64_t - getaliasent key_encryptsession xdr_int8_t - getaliasent_r key_encryptsession_pk xdr_keybuf - gethostbyaddr key_gendes xdr_key_netstarg - gethostbyaddr_r key_get_conv xdr_key_netstres - gethostbyname key_secretkey_is_set xdr_keystatus - gethostbyname2 key_setnet xdr_long - gethostbyname2_r key_setsecret xdr_longlong_t - gethostbyname_r netname2host xdrmem_create - gethostent netname2user xdr_netnamestr - gethostent_r ntohl xdr_netobj - getifaddrs ntohs xdr_opaque - getipv4sourcefilter passwd2des xdr_opaque_auth - get_myaddress pmap_getmaps xdr_pmap - getnameinfo pmap_getport xdr_pmaplist - getnetbyaddr pmap_rmtcall xdr_pointer - getnetbyaddr_r pmap_set xdr_quad_t - getnetbyname pmap_unset xdrrec_create - getnetbyname_r rcmd xdrrec_endofrecord - getnetent rcmd_af xdrrec_eof - getnetent_r registerrpc xdrrec_skiprecord - getnetgrent res_init xdr_reference - getnetgrent_r rexec xdr_rejected_reply - getnetname rexec_af xdr_replymsg - getprotobyname rexecoptions xdr_rmtcall_args - getprotobyname_r rpc_createerr xdr_rmtcallres - getprotobynumber rresvport xdr_short - getprotobynumber_r rresvport_af xdr_sizeof - getprotoent rtime xdrstdio_create - getprotoent_r ruserok xdr_string - getpublickey ruserok_af xdr_u_char - getrpcbyname ruserpass xdr_u_hyper - getrpcbyname_r setaliasent xdr_u_int - getrpcbynumber sethostent xdr_uint16_t - getrpcbynumber_r setipv4sourcefilter xdr_uint32_t - getrpcent setnetent xdr_uint64_t - getrpcent_r setnetgrent xdr_uint8_t - getrpcport setprotoent xdr_u_long - getsecretkey setrpcent xdr_u_longlong_t - getservbyname setservent xdr_union - getservbyname_r setsourcefilter xdr_unixcred - getservbyport svcauthdes_stats xdr_u_quad_t - getservbyport_r svcerr_auth xdr_u_short - getservent svcerr_decode xdr_vector - getservent_r svcerr_noproc xdr_void - getsourcefilter svcerr_noprog xdr_wrapstring - h_errlist svcerr_progvers xencrypt - h_errno svcerr_systemerr xprt_register - herror svcerr_weakauth xprt_unregister - h_nerr svc_exit - host2netname svcfd_create - - - The rpcgen, nscd, and rpcinfo commands are not installed. - - - The 'rpc' file (a text file listing RPC services) is not installed. - - Socket-related system calls do not fall in this option group, - because many are also used for other inter-process - communication mechanisms. For example, the 'syslog' routines - use Unix-domain sockets to communicate with the syslog daemon; - syslog is valuable in non-networked contexts. - - -config EGLIBC_OPTION_EGLIBC_INET_ANL - bool "Asynchronous name lookup" - default y - select EGLIBC_OPTION_EGLIBC_INET - help - This option group includes the `libanl' library which - provides support for asynchronous name lookup. - - -config EGLIBC_OPTION_EGLIBC_LIBM - bool "libm (math library)" - default y - help - This option group includes the 'libm' library, containing - mathematical functions. If this option group is omitted, then - an EGLIBC installation does not include shared or unshared versions - of the math library. - - Note that this does not remove all floating-point related - functionality from EGLIBC; for example, 'printf' and 'scanf' - can still print and read floating-point values with this option - group disabled. - - Note that the ISO Standard C++ library 'libstdc++' depends on - EGLIBC's math library 'libm'. If you disable this option - group, you will not be able to build 'libstdc++' against the - resulting EGLIBC installation. - - -config EGLIBC_OPTION_EGLIBC_LIBM_BIG - bool "Math library size" - default y - help - This option group enables default configuration of the math library. - Not selecting this option group removes most of the extended and - double precision math functions and replaces them with wrappers - to the single precision couterparts. - Doing so greatly degrades quality of calculations carried - out by the functions of the math library, but also significantly - reduces the size of the libm. - This option group is useful for systems that do not rely on precise - floating point math. - - -config EGLIBC_OPTION_EGLIBC_LOCALES - bool "Locale definitions" - default y - help - This option group includes all locale definitions other than - that for the "C" locale. If this option group is omitted, then - only the "C" locale is supported. - - -config EGLIBC_OPTION_EGLIBC_LOCALE_CODE - bool "Locale functions" - default y - select EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR - help - This option group includes locale support functions, programs, - and libraries. With EGLIBC_OPTION_EGLIBC_LOCALE_CODE disabled, - EGLIBC supports only the 'C' locale (also known as 'POSIX'), - and ignores the settings of the 'LANG' and 'LC_*' environment - variables. - - With EGLIBC_OPTION_EGLIBC_LOCALE_CODE disabled, the following - functions are omitted from libc: - - duplocale localeconv nl_langinfo rpmatch strfmon_l - freelocale newlocale nl_langinfo_l strfmon uselocale - - Furthermore, only the LC_CTYPE and LC_TIME categories of the - standard "C" locale are available. - - The EGLIBC_OPTION_EGLIBC_CATGETS option group depends on this option - group; if you disable EGLIBC_OPTION_EGLIBC_LOCALE_CODE, you must also - disable EGLIBC_OPTION_EGLIBC_CATGETS. - - -config EGLIBC_OPTION_EGLIBC_MEMUSAGE - bool "Memory profiling library" - default y - help - This option group includes the `libmemusage' library and - the `memusage' and `memusagestat' utilities. - These components provide memory profiling functions. - - EGLIBC_OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE - - Libmemusage library buffers the profiling data in memory - before writing it out to disk. By default, the library - allocates 1.5M buffer, which can be substantial for some - systems. EGLIBC_OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option - allows to change the default buffer size. It specifies - the number of entries the buffer should have. - On most architectures one buffer entry amounts to 48 bytes, - so setting this option to the value of 512 will reduce the size of - the memory buffer to 24K. - - -config EGLIBC_OPTION_EGLIBC_NIS - bool "Support for NIS, NIS+, and the special 'compat' services." - default n - select EGLIBC_OPTION_EGLIBC_INET - select EGLIBC_OPTION_EGLIBC_SUNRPC - help - This option group includes the NIS, NIS+, and 'compat' Name - Service Switch service libraries. When it is disabled, those - services libraries are not installed; you should remove any - references to them from your 'nsswitch.conf' file. - - This option group depends on the EGLIBC_OPTION_EGLIBC_INET option - group; you must enable that to enable this option group. - - -config EGLIBC_OPTION_EGLIBC_NSSWITCH - bool "Name service switch (nsswitch) support" - default y - select EGLIBC_OPTION_EGLIBC_INET - help - - This option group includes support for the 'nsswitch' facility. - With this option group enabled, all EGLIBC functions for - accessing various system databases (passwords and groups; - networking; aliases; public keys; and so on) consult the - '/etc/nsswitch.conf' configuration file to decide how to handle - queries. - - With this option group disabled, EGLIBC uses a fixed list of - services to satisfy queries on each database, as requested by - configuration files specified when EGLIBC is built. Your - 'option-groups.config' file must set the following two - variables: - - EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG - - Set this to the name of a file whose contents observe the - same syntax as an ordinary '/etc/nsswitch.conf' file. The - EGLIBC build process parses this file just as EGLIBC would - at run time if EGLIBC_NSSWITCH were enabled, and - produces a C library that uses the nsswitch service - libraries to search for database entries as this file - specifies, instead of consulting '/etc/nsswitch.conf' at run - time. - - This should be an absolute filename. The EGLIBC build - process may use it from several different working - directories. It may include references to Makefile - variables like 'common-objpfx' (the top of the build tree, - with a trailing slash), or '..' (the top of the source tree, - with a trailing slash). - - The EGLIBC source tree includes a sample configuration file - named 'nss/fixed-nsswitch.conf'; for simple configurations, - you will probably want to delete references to databases not - needed on your system. - - EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS - - The EGLIBC build process uses this file to decide which - functions to make available from which service libraries. - The file 'nss/fixed-nsswitch.functions' serves as a sample - configuration file for this setting, and explains its syntax - and meaning in more detail. - - This should be an absolute file name. The EGLIBC build - process may use it from several different working - directories. It may include references to Makefile - variables like 'common-objpfx' (the top of the build tree, - with a trailing slash), or '..' (the top of the source tree, - with a trailing slash). - - Be sure to mention each function in each service you wish to - use. If you do not mention a service's function here, the - EGLIBC database access functions will not find it, even if - it is listed in the EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG - file. - - In this arrangement, EGLIBC will not use the 'dlopen' and - 'dlsym' functions to find database access functions. Instead, - libc hard-codes references to the service libraries' database - access functions. You must explicitly link your program - against the name service libraries (those whose names start - with 'libnss_', in the sysroot's '/lib' directory) whose - functions you intend to use. This arrangement helps - system-wide static analysis tools decide which functions a - system actually uses. - - Note that some nsswitch service libraries require other option - groups to be enabled; for example, the EGLIBC_OPTION_EGLIBC_INET - option group must be enabled to use the 'libnss_dns.so.2' - service library, which uses the Domain Name System network - protocol to answer queries. - - -config EGLIBC_OPTION_EGLIBC_RCMD - bool "Support for 'rcmd' and related library functions" - default y - select EGLIBC_OPTION_EGLIBC_INET - help - This option group includes functions for running commands on - remote machines via the 'rsh' protocol, and doing authentication - related to those functions. This also includes functions that - use the 'rexec' protocol. - - This option group includes the following functions: - - rcmd ruserok - rcmd_af ruserok_af - rexec iruserok - rexec_af iruserok_af - rresvport ruserpass - rresvport_af - - -config EGLIBC_OPTION_EGLIBC_RTLD_DEBUG - bool "Runtime linker debug print outs" - default y - help - This option group enables debug output of the runtime linker - which is activated via LD_DEBUG and LD_TRACE_PRELINKING - environment variables. Disabling this option group yields - a smaller runtime linker binary. - BEWARE: Disabling this option group is likely to break - the `ldd' utility which may also be used by the prelinker. - In particular, the `--unused' ldd option will not work correctly. - - -config EGLIBC_OPTION_EGLIBC_SPAWN - bool "Support for POSIX posix_spawn functions" - default y - help - This option group includes the POSIX functions for executing - programs in child processes without using 'fork' or 'vfork'. - - This option group includes the following functions: - - posix_spawn - posix_spawnattr_destroy - posix_spawnattr_getflags - posix_spawnattr_getpgroup - posix_spawnattr_getschedparam - posix_spawnattr_getschedpolicy - posix_spawnattr_getsigdefault - posix_spawnattr_getsigmask - posix_spawnattr_init - posix_spawnattr_setflags - posix_spawnattr_setpgroup - posix_spawnattr_setschedparam - posix_spawnattr_setschedpolicy - posix_spawnattr_setsigdefault - posix_spawnattr_setsigmask - posix_spawn_file_actions_addclose - posix_spawn_file_actions_adddup2 - posix_spawn_file_actions_addopen - posix_spawn_file_actions_destroy - posix_spawn_file_actions_init - posix_spawnp - - This option group also provides the ability for the iconv, - localedef, and locale programs to operate transparently on - compressed charset definitions. When this option group is - disabled, those programs will only operate on uncompressed - charmap files. - - -config EGLIBC_OPTION_EGLIBC_STREAMS - bool "Support for accessing STREAMS." - default y - help - This option group includes functions for reading and writing - messages to and from STREAMS. The STREAMS interface provides a - uniform mechanism for implementing networking services and other - character-based I/O. (STREAMS are not to be confused with - FILE objects, also called 'streams'.) - - This option group includes the following functions: - - getmsg putpmsg - getpmsg fattach - isastream fdetach - putmsg - - -config EGLIBC_OPTION_EGLIBC_SUNRPC - bool "Support for the Sun 'RPC' protocol." - default n - select EGLIBC_OPTION_EGLIBC_INET - help - This option group includes support for the Sun RPC protocols, - including the 'rpcgen' and 'rpcinfo' programs. - - -config EGLIBC_OPTION_EGLIBC_UTMP - bool "Older access functions for 'utmp' login records" - default y - help - This option group includes the older 'utent' family of - functions for accessing user login records in the 'utmp' file. - POSIX omits these functions in favor of the 'utxent' family, - and they are obsolete on systems other than Linux. - - This option group includes the following functions: - - endutent - getutent - getutent_r - getutid - getutid_r - getutline - getutline_r - logwtmp - pututline - setutent - updwtmp - utmpname - - This option group includes the following libraries: - - libutil.so (and libutil.a) - - -config EGLIBC_OPTION_EGLIBC_UTMPX - bool "POSIX access functions for 'utmp' login records" - default y - select EGLIBC_OPTION_EGLIBC_UTMP - help - This option group includes the POSIX functions for reading and - writing user login records in the 'utmp' file (usually - '/var/run/utmp'). The POSIX functions operate on 'struct - utmpx' structures, as opposed to the family of older 'utent' - functions, which operate on 'struct utmp' structures. - - This option group includes the following functions: - - endutxent - getutmp - getutmpx - getutxent - getutxid - getutxline - pututxline - setutxent - updwtmpx - utmpxname - - -config EGLIBC_OPTION_EGLIBC_WORDEXP - bool "Shell-style word expansion" - default y - help - This option group includes the 'wordexp' function for - performing word expansion in the manner of the shell, and the - accompanying 'wordfree' function. - - -config EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR - bool "ISO C library wide character functions, excluding I/O" - default y - help - This option group includes the functions defined by the ISO C - standard for working with wide and multibyte characters in - memory. Functions for reading and writing wide and multibyte - characters from and to files call in the - EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO option group. - - This option group includes the following functions: - - btowc mbsinit wcscspn wcstoll - iswalnum mbsrtowcs wcsftime wcstombs - iswalpha mbstowcs wcslen wcstoul - iswblank mbtowc wcsncat wcstoull - iswcntrl swprintf wcsncmp wcstoumax - iswctype swscanf wcsncpy wcsxfrm - iswdigit towctrans wcspbrk wctob - iswgraph towlower wcsrchr wctomb - iswlower towupper wcsrtombs wctrans - iswprint vswprintf wcsspn wctype - iswpunct vswscanf wcsstr wmemchr - iswspace wcrtomb wcstod wmemcmp - iswupper wcscat wcstof wmemcpy - iswxdigit wcschr wcstoimax wmemmove - mblen wcscmp wcstok wmemset - mbrlen wcscoll wcstol - mbrtowc wcscpy wcstold - - -config EGLIBC_OPTION_POSIX_REGEXP - bool "Regular expressions" - default y - help - This option group includes the POSIX regular expression - functions, and the associated non-POSIX extensions and - compatibility functions. - - With EGLIBC_OPTION_POSIX_REGEXP disabled, the following functions are - omitted from libc: - - re_comp re_max_failures regcomp - re_compile_fastmap re_search regerror - re_compile_pattern re_search_2 regexec - re_exec re_set_registers regfree - re_match re_set_syntax rpmatch - re_match_2 re_syntax_options - - Furthermore, the compatibility regexp interface defined in the - header file, 'compile', 'step', and 'advance', is - omitted. - - -config EGLIBC_OPTION_POSIX_REGEXP_GLIBC - bool "Regular expressions from GLIBC" - default y - select EGLIBC_OPTION_POSIX_REGEXP - help - This option group specifies which regular expression - library to use. The choice is between regex - implementation from GLIBC and regex implementation from - libiberty. The GLIBC variant is fully POSIX conformant and - optimized for speed; regex from libiberty is more than twice - as small while still is enough for most practical purposes. - - -config EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO - bool "Input and output functions for wide characters" - default y - select EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR - help - This option group includes functions for reading and writing - wide characters to and from streams. - - This option group includes the following functions: - - fgetwc fwprintf putwchar vwscanf - fgetws fwscanf ungetwc wprintf - fputwc getwc vfwprintf wscanf - fputws getwchar vfwscanf - fwide putwc vwprintf - - This option group further includes the following unlocked - variants of the above functions: - - fgetwc_unlocked getwc_unlocked - fgetws_unlocked getwchar_unlocked - fputwc_unlocked putwc_unlocked - fputws_unlocked putwchar_unlocked - - Note that the GNU standard C++ library, 'libstdc++.so', uses - some of these functions; you will not be able to link or run - C++ programs if you disable this option group. - - This option group also affects the behavior of the following - functions: - - fdopen - fopen - fopen64 - freopen - freopen64 - - These functions all take an OPENTYPE parameter which may - contain a string of the form ",ccs=CHARSET", indicating that - the underlying file uses the character set named CHARSET. - This produces a wide-oriented stream, which is only useful - when the functions included in this option group are present. - If the user attempts to open a file specifying a character set - in the OPENTYPE parameter, and EGLIBC was built with this - option group disabled, the function returns NULL, and sets - errno to EINVAL. diff --git a/trunk/toolchain/eglibc/headers/Makefile b/trunk/toolchain/eglibc/headers/Makefile deleted file mode 100644 index f9f411b1..00000000 --- a/trunk/toolchain/eglibc/headers/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PATH_PREFIX:=.. -VARIANT:=headers - -include ../common.mk - -define Host/Compile - -endef - -define Host/Install - $(call Host/SetToolchainInfo) - mkdir -p $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/{include,lib} - $(MAKE) -C $(CUR_BUILD_DIR) \ - BUILD_CFLAGS="$(HOST_CFLAGS)" \ - install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \ - install-bootstrap-headers=yes \ - install-headers - $(MAKE) -C $(CUR_BUILD_DIR) \ - csu/subdir_lib - ( cd $(CUR_BUILD_DIR); \ - $(CP) csu/crt1.o csu/crti.o csu/crtn.o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/lib/ \ - ) - $(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \ - -o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/lib/libc.so -endef - -$(eval $(call HostBuild)) diff --git a/trunk/toolchain/eglibc/include/libintl.h b/trunk/toolchain/eglibc/include/libintl.h deleted file mode 100644 index 69cb887a..00000000 --- a/trunk/toolchain/eglibc/include/libintl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __FAKE_LIBINTL_H -#define __FAKE_LIBINTL_H - -#define _(X) (X) - -#endif diff --git a/trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch b/trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch deleted file mode 100644 index 55b26c7d..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/libc/aclocal.m4 -+++ b/libc/aclocal.m4 -@@ -88,6 +88,12 @@ - fi - rm -fr contest*]) - -+dnl Test a compiler option or options with an empty input file. -+dnl LIBC_TRY_CC_OPTION([options], [action-if-true], [action-if-false]) -+AC_DEFUN([LIBC_TRY_CC_OPTION], -+[AS_IF([AC_TRY_COMMAND([${CC-cc} $1 -xc /dev/null -S -o /dev/null])], -+ [$2], [$3])]) -+ - AC_DEFUN([LIBC_PROG_BINUTILS], - [# Was a --with-binutils option given? - if test -n "$path_binutils"; then ---- a/libc/configure -+++ b/libc/configure -@@ -7404,7 +7404,14 @@ - else - libc_cv_cc_nofma= - for opt in -ffp-contract=off -mno-fused-madd; do -- LIBC_TRY_CC_OPTION($opt, libc_cv_cc_nofma=$opt; break) -+ if { ac_try='${CC-cc} $opt -xc /dev/null -S -o /dev/null' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ libc_cv_cc_nofma=$opt; break -+fi - done - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cc_nofma" >&5 ---- a/libc/configure.in -+++ b/libc/configure.in -@@ -2238,10 +2238,9 @@ - libc_cv_cc_submachine, [dnl - libc_cv_cc_submachine=no - for opt in "-march=$submachine" "-mcpu=$submachine"; do -- if AC_TRY_COMMAND([${CC-cc} $opt -xc /dev/null -S -o /dev/null]); then -+ LIBC_TRY_CC_OPTION([$opt], [ - libc_cv_cc_submachine="$opt" -- break -- fi -+ break], []) - done]) - if test "x$libc_cv_cc_submachine" = xno; then - AC_MSG_ERROR([${CC-cc} does not support $submachine]) diff --git a/trunk/toolchain/eglibc/patches/2.15/005-versions.patch b/trunk/toolchain/eglibc/patches/2.15/005-versions.patch deleted file mode 100644 index da9d2bac..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/005-versions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libc/configure.in -+++ b/libc/configure.in -@@ -1037,7 +1037,7 @@ - critic_missing="$critic_missing gcc") - AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, - [GNU Make[^0-9]*\([0-9][0-9.]*\)], -- [3.79* | 3.[89]*], critic_missing="$critic_missing make") -+ [3.79* | 3.[89]* | 4.* ], critic_missing="$critic_missing make") - - AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, - [GNU gettext.* \([0-9]*\.[0-9.]*\)], diff --git a/trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch b/trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch deleted file mode 100644 index d1e19aa4..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch +++ /dev/null @@ -1,110 +0,0 @@ -partially revert commit 4bff6e0175ed195871f4e01cc4c4c33274b8f6e3 - caused segmentation faults in dlopen - -References: -http://comments.gmane.org/gmane.comp.lib.glibc.user/1227 -http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - -diff --git a/libc/elf/dl-close.c b/libc/elf/dl-close.c -index 4b17bf8..733cc1b 100644 ---- a/libc/elf/dl-close.c -+++ b/libc/elf/dl-close.c -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)) -diff --git a/libc/elf/dl-deps.c b/libc/elf/dl-deps.c -index 51cb2fa..eddcbf0 100644 ---- a/libc/elf/dl-deps.c -+++ b/libc/elf/dl-deps.c -@@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -689,6 +690,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -697,7 +699,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - - if (errno_reason) - _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, -diff --git a/libc/elf/dl-libc.c b/libc/elf/dl-libc.c -index f44fa10..7563093 100644 ---- a/libc/elf/dl-libc.c -+++ b/libc/elf/dl-libc.c -@@ -284,6 +284,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/libc/elf/rtld.c b/libc/elf/rtld.c -index b93a01f..2fc83ce 100644 ---- a/libc/elf/rtld.c -+++ b/libc/elf/rtld.c -@@ -2277,6 +2277,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/libc/include/link.h b/libc/include/link.h -index e877104..b1b4065 100644 ---- a/libc/include/link.h -+++ b/libc/include/link.h -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch b/trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch deleted file mode 100644 index 8fe5cf3f..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/libc/sunrpc/proto.h -+++ b/libc/sunrpc/proto.h -@@ -56,12 +56,14 @@ void add_type(int len, const char *type) - $build's C library and $host's GLIBC. */ - #ifdef _CROSS_RPCGEN_ - -+#undef stpcpy -+ - /* Rather then defining _GNU_SOURCE before including $build's - we just declare stpcpy here. */ - extern char *stpcpy (char *, const char *); - --/* Use $build's i18n support as we can't use $host's. */ --#define _(X) (gettext (X)) -+/* Do not use i18n support */ -+#define _(X) (X) - - /* rpcgen sources check for __GNU_LIBRARY__ to tweak for GLIBC code - that rpcgen generates. The proper fix would be to rename all those checks ---- a/libc/sunrpc/rpc/types.h -+++ b/libc/sunrpc/rpc/types.h -@@ -70,18 +70,23 @@ typedef unsigned long rpcport_t; - #endif - - #ifndef __u_char_defined --typedef __u_char u_char; --typedef __u_short u_short; --typedef __u_int u_int; --typedef __u_long u_long; --typedef __quad_t quad_t; --typedef __u_quad_t u_quad_t; --typedef __fsid_t fsid_t; -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+#if __WORDSIZE == 64 -+typedef long int quad_t; -+typedef unsigned long int u_quad_t; -+#elif defined __GLIBC_HAVE_LONG_LONG -+typedef long long int quad_t; -+typedef unsigned long long int u_quad_t; -+#endif -+typedef u_quad_t fsid_t; - # define __u_char_defined - #endif --#ifndef __daddr_t_defined --typedef __daddr_t daddr_t; --typedef __caddr_t caddr_t; -+#if !defined(__daddr_t_defined) && defined(linux) -+typedef long int daddr_t; -+typedef char *caddr_t; - # define __daddr_t_defined - #endif - ---- a/libc/sunrpc/rpc_main.c -+++ b/libc/sunrpc/rpc_main.c -@@ -997,9 +997,10 @@ mkfile_output (struct commandline *cmd) - abort (); - temp = rindex (cmd->infile, '.'); - cp = stpcpy (mkfilename, "Makefile."); -- if (temp != NULL) -- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; -- else -+ if (temp != NULL) { -+ strncpy(cp, cmd->infile, temp - cmd->infile); -+ cp[temp - cmd->infile - 1] = 0; -+ } else - stpcpy (cp, cmd->infile); - - } diff --git a/trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch b/trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch deleted file mode 100644 index 221eb287..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/libc/timezone/zic.c -+++ b/libc/timezone/zic.c -@@ -8,6 +8,8 @@ static char elsieid[] = "@(#)zic.c 8.19" - #ifdef CROSS_ZIC - #define REPORT_BUGS_TO "" - #define PKGVERSION "" -+#undef _ -+#define _(X) (X) - #else - #include "config.h" - #endif -@@ -490,6 +492,7 @@ char * argv[]; - #ifdef unix - (void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH)); - #endif /* defined unix */ -+#ifndef CROSS_ZIC - #if HAVE_GETTEXT - (void) setlocale(LC_ALL, ""); - #ifdef TZ_DOMAINDIR -@@ -497,6 +500,7 @@ char * argv[]; - #endif /* defined TEXTDOMAINDIR */ - (void) textdomain(TZ_DOMAIN); - #endif /* HAVE_GETTEXT */ -+#endif - progname = argv[0]; - if (TYPE_BIT(zic_t) < 64) { - (void) fprintf(stderr, "%s: %s\n", progname, diff --git a/trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch b/trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch deleted file mode 100644 index 4c58fb4f..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libc/sunrpc/Makefile -+++ b/libc/sunrpc/Makefile -@@ -175,7 +175,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$ - $(+link) - - $(addprefix $(objpfx)cross-,$(rpcgen-objs)): $(objpfx)cross-%.o: %.c -- gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \ -+ gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ $(HOST_CFLAGS) \ - $(OUTPUT_OPTION) $(compile-mkdep-flags) - - $(objpfx)cross-rpcgen: $(addprefix $(objpfx)cross-,$(rpcgen-objs)) ---- a/libc/timezone/Makefile -+++ b/libc/timezone/Makefile -@@ -182,7 +182,7 @@ $(objpfx)zic: $(addprefix $(objpfx), $(z - - $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c - gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ -- -DCROSS_ZIC $(compile-mkdep-flags) -+ -DCROSS_ZIC $(HOST_CFLAGS) $(compile-mkdep-flags) - - $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) - gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ diff --git a/trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch b/trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch deleted file mode 100644 index 70e7e604..00000000 --- a/trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -add /usr/lib to default search path for the dynamic linker - ---- a/libc/Makeconfig -+++ b/libc/Makeconfig -@@ -539,6 +539,9 @@ - default-rpath = $(libdir) - endif - -+# Add /usr/lib to default search path for the dynamic linker -+user-defined-trusted-dirs := /usr/lib -+ - ifndef link-extra-libs - link-extra-libs = $(LDLIBS-$(@F)) - link-extra-libs-static = $(link-extra-libs) diff --git a/trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch b/trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch deleted file mode 100644 index 5c0d45b5..00000000 --- a/trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/libc/sunrpc/rpc/types.h -+++ b/libc/sunrpc/rpc/types.h -@@ -75,18 +75,23 @@ typedef unsigned long rpcport_t; - #endif - - #ifndef __u_char_defined --typedef __u_char u_char; --typedef __u_short u_short; --typedef __u_int u_int; --typedef __u_long u_long; --typedef __quad_t quad_t; --typedef __u_quad_t u_quad_t; --typedef __fsid_t fsid_t; -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+#if __WORDSIZE == 64 -+typedef long int quad_t; -+typedef unsigned long int u_quad_t; -+#elif defined __GLIBC_HAVE_LONG_LONG -+typedef long long int quad_t; -+typedef unsigned long long int u_quad_t; -+#endif -+typedef u_quad_t fsid_t; - # define __u_char_defined - #endif --#ifndef __daddr_t_defined --typedef __daddr_t daddr_t; --typedef __caddr_t caddr_t; -+#if !defined(__daddr_t_defined) && defined(linux) -+typedef long int daddr_t; -+typedef char *caddr_t; - # define __daddr_t_defined - #endif - ---- a/libc/sunrpc/rpc_main.c -+++ b/libc/sunrpc/rpc_main.c -@@ -958,9 +958,10 @@ mkfile_output (struct commandline *cmd) - abort (); - temp = rindex (cmd->infile, '.'); - cp = stpcpy (mkfilename, "Makefile."); -- if (temp != NULL) -- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; -- else -+ if (temp != NULL) { -+ strncpy(cp, cmd->infile, temp - cmd->infile); -+ cp[temp - cmd->infile - 1] = 0; -+ } else - stpcpy (cp, cmd->infile); - - } diff --git a/trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch b/trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch deleted file mode 100644 index fa192ca1..00000000 --- a/trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -add /usr/lib to default search path for the dynamic linker - ---- a/libc/Makeconfig -+++ b/libc/Makeconfig -@@ -501,6 +501,9 @@ else - default-rpath = $(libdir) - endif - -+# Add /usr/lib to default search path for the dynamic linker -+user-defined-trusted-dirs := /usr/lib -+ - ifndef link-extra-libs - link-extra-libs = $(LDLIBS-$(@F)) - link-extra-libs-static = $(link-extra-libs) diff --git a/trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch b/trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch deleted file mode 100644 index 623885ca..00000000 --- a/trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: eglibc-2.19-r25243/libc/aclocal.m4 -=================================================================== ---- eglibc-2.19-r25243.orig/libc/aclocal.m4 2013-11-06 15:03:08.000000000 -0800 -+++ eglibc-2.19-r25243/libc/aclocal.m4 2014-11-22 15:43:05.343256863 -0800 -@@ -1,7 +1,7 @@ - dnl We require that everyone use exactly the same Autoconf version so that - dnl the internal functions defined and used by the main configure script - dnl match those expected by the fragments. --m4_define([GLIBC_AUTOCONF_VERSION], [2.68]) -+m4_define([GLIBC_AUTOCONF_VERSION], [2.69]) - m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [], - [m4_fatal(m4_flatten( - Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have