Updated x86 and xburst from upstream.
authorRISCi_ATOM <bob@bobcall.me>
Thu, 19 May 2016 17:29:07 +0000 (17:29 +0000)
committerRISCi_ATOM <bob@bobcall.me>
Thu, 19 May 2016 17:29:07 +0000 (17:29 +0000)
28 files changed:
trunk/target/linux/sunxi/image/Makefile
trunk/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch
trunk/target/linux/x86/64/target.mk
trunk/target/linux/x86/Makefile
trunk/target/linux/x86/config-3.18
trunk/target/linux/x86/ep80579/config-3.3 [new file with mode: 0644]
trunk/target/linux/x86/ep80579/target.mk [new file with mode: 0644]
trunk/target/linux/x86/generic/config-default [new file with mode: 0644]
trunk/target/linux/x86/generic/profiles/000-Generic.mk [new file with mode: 0644]
trunk/target/linux/x86/generic/target.mk [new file with mode: 0644]
trunk/target/linux/x86/geode/target.mk
trunk/target/linux/x86/image/Makefile
trunk/target/linux/x86/kvm_guest/config-default
trunk/target/linux/x86/kvm_guest/target.mk
trunk/target/linux/x86/patches-3.18/001-x86-platform-Fix-Geode-LX-timekeeping-in-the-generic.patch [deleted file]
trunk/target/linux/x86/patches-3.18/010-rdc_cpu_ident.patch
trunk/target/linux/x86/rdc/base-files/etc/config/network [new file with mode: 0644]
trunk/target/linux/x86/rdc/base-files/etc/diag.sh [new file with mode: 0644]
trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc [new file with mode: 0644]
trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh [new file with mode: 0644]
trunk/target/linux/x86/rdc/config-default [new file with mode: 0644]
trunk/target/linux/x86/rdc/profiles/ar525w.mk [new file with mode: 0644]
trunk/target/linux/x86/rdc/profiles/bifferboard.mk [new file with mode: 0644]
trunk/target/linux/x86/rdc/profiles/r8610.mk [new file with mode: 0644]
trunk/target/linux/x86/rdc/profiles/sitecom.mk [new file with mode: 0644]
trunk/target/linux/x86/rdc/target.mk [new file with mode: 0644]
trunk/target/linux/x86/xen_domu/target.mk
trunk/target/linux/xburst/patches-3.18/001-ubi-Read-only-the-vid-header-instead-of-the-whole-pa.patch

index e37c1747ff39e476412863f2509747e28df67e80..b80c855bad4f7ee0bdc25f67022648f9b45d8b90 100644 (file)
@@ -11,28 +11,12 @@ include $(INCLUDE_DIR)/host.mk
 FAT32_BLOCK_SIZE=1024
 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
 
-BOARDS:= \
-       sun4i-a10-cubieboard \
-       sun4i-a10-olinuxino-lime \
-       sun4i-a10-pcduino \
-       sun5i-a13-olinuxino \
-       sun6i-a31-colombus \
-       sun6i-a31-m9 \
-       sun7i-a20-bananapi \
-       sun7i-a20-bananapro \
-       sun7i-a20-cubieboard2 \
-       sun7i-a20-cubietruck \
-       sun7i-a20-olinuxino-lime \
-       sun7i-a20-olinuxino-micro \
-       sun7i-a20-pcduino3 \
-       sun7i-a20-lamobo-r1
-
 define Image/BuildKernel
        mkimage -A arm -O linux -T kernel -C none \
                -a 0x40008000 -e 0x40008000 \
                -n 'ARM libreCMC Linux-$(LINUX_VERSION)' \
                -d $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
-       
+
     ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
        $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
        echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
@@ -42,27 +26,27 @@ define Image/BuildKernel
                $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
        )
     endif
-
-       $(foreach board,$(BOARDS),
-               $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/
-       )
 endef
 
 define Image/Build/SDCard
        rm -f $(KDIR)/boot.img
        mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS)
-       
-       mcopy -i $(KDIR)/boot.img $(BIN_DIR)/uboot-sunxi-$(PROFILE)/$(IMG_PREFIX)-$(PROFILE)-boot.scr ::boot.scr
-       mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(2).dtb ::dtb
+
+       mcopy -i $(KDIR)/boot.img $(KDIR)/uboot-sunxi-$(PROFILE)-boot.scr ::boot.scr
+       mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(2).dtb ::dtb
        mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
-       
+
        ./gen_sunxi_sdcard_img.sh \
                $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \
                $(KDIR)/boot.img \
                $(KDIR)/root.$(1) \
                $(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \
                $(CONFIG_TARGET_ROOTFS_PARTSIZE) \
-               $(BIN_DIR)/uboot-sunxi-$(PROFILE)/$(IMG_PREFIX)-$(PROFILE)-u-boot-with-spl.bin
+               $(KDIR)/uboot-sunxi-$(PROFILE)-u-boot-with-spl.bin
+
+  ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
+       gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img
+  endif
 endef
 
 define Image/Build/Profile/A10-OLinuXino-Lime
@@ -124,7 +108,7 @@ endef
 define Image/Build
        $(call Image/Build/$(1),$(1))
        $(call Image/Build/Profile/$(PROFILE),$(1))
-       
+
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 endef
 
index d2a15047287c81ba6f32b7e47a771ccac7a1e656..dcbb3a4767d30143ec1260780bd7299e6d494a96 100644 (file)
@@ -49,7 +49,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
        put_device(&card->dev);
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -1205,6 +1205,34 @@ EXPORT_SYMBOL(mmc_of_parse_voltage);
+@@ -1231,6 +1231,34 @@ EXPORT_SYMBOL(mmc_of_parse_voltage);
  
  #endif /* CONFIG_OF */
  
index 9cf1671206f530185e9651ebfbd73b4eaf5dca5a..1f22eb3934b7f3faefbbc2f51e70d2359db3c686 100644 (file)
@@ -1,6 +1,6 @@
 ARCH:=x86_64
 BOARDNAME:=x86_64
-DEFAULT_PACKAGES += kmod-acpi-button kmod-button-hotplug kmod-e1000e kmod-e1000 kmod-r8169
+DEFAULT_PACKAGES += kmod-e1000e kmod-e1000 kmod-r8169
 ARCH_PACKAGES:=x86_64
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
index 17c347c9f52a5fb5a8ef2bca06df8b8576694b60..ba733c02480b248aa95331da2bcd8fee3e25f812 100644 (file)
@@ -10,7 +10,7 @@ ARCH:=i386
 BOARD:=x86
 BOARDNAME:=x86
 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz
-SUBTARGETS=generic xen_domu kvm_guest 64
+SUBTARGETS=generic xen_domu ep80579 geode kvm_guest rdc 64
 MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 
 KERNEL_PATCHVER:=3.18
index bb647c8526f9f47993c5c6dd3ae3d79c29c7c853..d7a2d61539f9171e8ee690cddc23f6fe5879f68f 100644 (file)
@@ -77,7 +77,6 @@ CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_AES_586=y
 CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
 CONFIG_CRYPTO_HASH=y
@@ -385,7 +384,6 @@ CONFIG_X86_ALIGNMENT_16=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
-# CONFIG_X86_DECODER_SELFTEST is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_FEATURE_NAMES=y
diff --git a/trunk/target/linux/x86/ep80579/config-3.3 b/trunk/target/linux/x86/ep80579/config-3.3
new file mode 100644 (file)
index 0000000..78ee0ce
--- /dev/null
@@ -0,0 +1,11 @@
+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
new file mode 100644 (file)
index 0000000..1f02f1e
--- /dev/null
@@ -0,0 +1,11 @@
+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
new file mode 100644 (file)
index 0000000..9e963bf
--- /dev/null
@@ -0,0 +1,201 @@
+# 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_ATIIXP=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
new file mode 100644 (file)
index 0000000..90f989a
--- /dev/null
@@ -0,0 +1,18 @@
+#
+# 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
new file mode 100644 (file)
index 0000000..7191292
--- /dev/null
@@ -0,0 +1,7 @@
+BOARDNAME:=Generic
+
+define Target/Description
+       Build firmware images for x86 based boards
+       (e.g : Soekris, ...)
+endef
+
index 106cfebbd428ee8f5e4ac1a8b72b9b04c043683d..57ccdc6c86745e8adfced028bf69a5f569b04bc5 100644 (file)
@@ -1,7 +1,7 @@
 BOARDNAME:=AMD Geode based systems
 FEATURES:=squashfs ext4 pci usb gpio
 DEFAULT_PACKAGES += \
-                       kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-cbc \
+                       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 \
index 8e5637214faeb2b107e15bc4b2baeba197245eb7..e7e02f15fbb3d1638b26982e7ddff305464e6851 100644 (file)
@@ -149,8 +149,8 @@ ifneq ($(CONFIG_VMDK_IMAGES),)
 endif
 
 define Image/Build/gzip
-       gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
-       gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+       gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
+       gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
 endef
 
 ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
index b54b1df6faabeb586e4ac556a77cf4860139a7cc..f26e2681323e8f7feb1e56bde2a4824ed39aa90c 100644 (file)
@@ -19,14 +19,12 @@ CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_THERMAL is not set
 # CONFIG_ACPI_WMI is not set
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=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_HIGHMEM64G is not set
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
@@ -47,21 +45,17 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_KVM_GUEST=y
 # CONFIG_LGUEST is not set
 # CONFIG_LGUEST_GUEST is not set
+CONFIG_NLS=y
 CONFIG_NO_HZ=y
-# CONFIG_M486 is not set
-CONFIG_MPENTIUM4=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=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_MMCONFIG=y
-CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
 CONFIG_PNP_DEBUG_MESSAGES=y
@@ -70,8 +64,6 @@ CONFIG_RAS=y
 # CONFIG_SAMSUNG_Q10 is not set
 # CONFIG_SCSI_VIRTIO is not set
 CONFIG_SERIAL_8250_PNP=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SMP=y
 # CONFIG_THINKPAD_ACPI is not set
 # CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
@@ -84,19 +76,14 @@ CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTUALIZATION=y
 # CONFIG_VMWARE_BALLOON is not set
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_X86_32_SMP=y
 # CONFIG_X86_ACPI_CPUFREQ is not set
-# CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_E_POWERSAVER is not set
 # CONFIG_X86_GENERIC is not set
-CONFIG_X86_HT=y
 # 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_PAE=y
 # 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
-# CONFIG_XEN is not set
index 6194778653fda590ee2454b94b720a3384d3ef76..d3f950fe2cc1b275b8db214fb6badeb7488217ff 100644 (file)
@@ -1,4 +1,3 @@
 BOARDNAME:=KVM Guest
 FEATURES:=ext4 pci usb
-DEFAULT_PACKAGES += kmod-acpi-button kmod-button-hotplug kmod-virtio-balloon kmod-virtio-net kmod-virtio-random
-CPU_TYPE := pentium4
+DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random
diff --git a/trunk/target/linux/x86/patches-3.18/001-x86-platform-Fix-Geode-LX-timekeeping-in-the-generic.patch b/trunk/target/linux/x86/patches-3.18/001-x86-platform-Fix-Geode-LX-timekeeping-in-the-generic.patch
deleted file mode 100644 (file)
index 8bd1699..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From: David Woodhouse <dwmw2@infradead.org>
-Date: Thu, 17 Sep 2015 10:16:54 +0100
-Subject: [PATCH] x86/platform: Fix Geode LX timekeeping in the generic x86
- build
-
-In 2007, commit 07190a08eef36 ("Mark TSC on GeodeLX reliable")
-bypassed verification of the TSC on Geode LX. However, this code
-(now in the check_system_tsc_reliable() function in
-arch/x86/kernel/tsc.c) was only present if CONFIG_MGEODE_LX was
-set.
-
-OpenWRT has recently started building its generic Geode target
-for Geode GX, not LX, to include support for additional
-platforms. This broke the timekeeping on LX-based devices,
-because the TSC wasn't marked as reliable:
-https://dev.openwrt.org/ticket/20531
-
-By adding a runtime check on is_geode_lx(), we can also include
-the fix if CONFIG_MGEODEGX1 or CONFIG_X86_GENERIC are set, thus
-fixing the problem.
-
-Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Closes #20531
----
-
---- a/arch/x86/kernel/tsc.c
-+++ b/arch/x86/kernel/tsc.c
-@@ -21,6 +21,7 @@
- #include <asm/hypervisor.h>
- #include <asm/nmi.h>
- #include <asm/x86_init.h>
-+#include <asm/geode.h>
- unsigned int __read_mostly cpu_khz;   /* TSC clocks / usec, not used here */
- EXPORT_SYMBOL(cpu_khz);
-@@ -1004,15 +1005,17 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
- static void __init check_system_tsc_reliable(void)
- {
--#ifdef CONFIG_MGEODE_LX
--      /* RTSC counts during suspend */
-+#if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC)
-+      if (is_geode_lx()) {
-+              /* RTSC counts during suspend */
- #define RTSC_SUSP 0x100
--      unsigned long res_low, res_high;
-+              unsigned long res_low, res_high;
--      rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
--      /* Geode_LX - the OLPC CPU has a very reliable TSC */
--      if (res_low & RTSC_SUSP)
--              tsc_clocksource_reliable = 1;
-+              rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
-+              /* Geode_LX - the OLPC CPU has a very reliable TSC */
-+              if (res_low & RTSC_SUSP)
-+                      tsc_clocksource_reliable = 1;
-+      }
- #endif
-       if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE))
-               tsc_clocksource_reliable = 1;
index 64d38c1b7ac3c99d67015fdc7e16d685fed1431e..1f153fc60c47908fdaa9330e87a98be6f5514297 100644 (file)
@@ -21,8 +21,8 @@
 +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 OpenWrt project for details,
-+   http://wiki.openwrt.org/oldwiki/rdcport
++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/
diff --git a/trunk/target/linux/x86/rdc/base-files/etc/config/network b/trunk/target/linux/x86/rdc/base-files/etc/config/network
new file mode 100644 (file)
index 0000000..69627f7
--- /dev/null
@@ -0,0 +1,26 @@
+# 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
new file mode 100644 (file)
index 0000000..03796d7
--- /dev/null
@@ -0,0 +1,17 @@
+#!/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
new file mode 100644 (file)
index 0000000..0518766
--- /dev/null
@@ -0,0 +1,36 @@
+#!/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
new file mode 100644 (file)
index 0000000..6348a69
--- /dev/null
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..34007ac
--- /dev/null
@@ -0,0 +1,65 @@
+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
new file mode 100644 (file)
index 0000000..d38cb1f
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# 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
new file mode 100644 (file)
index 0000000..35fea45
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# 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
new file mode 100644 (file)
index 0000000..d5f8c0a
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# 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
new file mode 100644 (file)
index 0000000..e3b2981
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# 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
new file mode 100644 (file)
index 0000000..9b03b15
--- /dev/null
@@ -0,0 +1,13 @@
+BOARDNAME:=RDC R-321x
+FEATURES:=squashfs pci usb gpio pcmcia
+MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+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
index 31d110c5c3104cc2c79d08074cd39872df644819..f7a69bf1321486bfbac8fc1ff7cdedd6697c9393 100644 (file)
@@ -1,4 +1,3 @@
 BOARDNAME:=Xen Paravirt Guest
 DEFAULT_PACKAGES += kmod-xen-fs kmod-xen-evtchn kmod-xen-netdev kmod-xen-kbddev
 FEATURES:=display ext4 targz
-CPU_TYPE := pentium4
index 19eaf3af3e93480d13b178b2741d581f77272080..93851d72838ec5dcf28032d9fcae2588edb91f83 100644 (file)
@@ -9,7 +9,7 @@ Subject: [PATCH 1/7] ubi: Read only the vid header instead of the whole page
 
 --- a/drivers/mtd/ubi/io.c
 +++ b/drivers/mtd/ubi/io.c
-@@ -1009,7 +1009,7 @@ int ubi_io_read_vid_hdr(struct ubi_devic
+@@ -1014,7 +1014,7 @@ int ubi_io_read_vid_hdr(struct ubi_devic
  
        p = (char *)vid_hdr - ubi->vid_hdr_shift;
        read_err = ubi_io_read(ubi, p, pnum, ubi->vid_hdr_aloffset,