From: Vivien Didelot Date: Mon, 6 Oct 2014 21:24:24 +0000 (-0400) Subject: ts5x00: bump to Linux 3.17 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3ed92624aac3dc13767f5be36690cd7802db2083;p=buildroot.git ts5x00: bump to Linux 3.17 The support for the TS-5400 platform is mainlined since Linux 3.17. This commit removes the outdated support patch and bumps the kernel headers (and thus Linux) to 3.17.x. Signed-off-by: Vivien Didelot Signed-off-by: Peter Korsgaard --- diff --git a/board/ts/ts5x00/linux-3.14.config b/board/ts/ts5x00/linux-3.14.config deleted file mode 100644 index 60cd8a0fe3..0000000000 --- a/board/ts/ts5x00/linux-3.14.config +++ /dev/null @@ -1,113 +0,0 @@ -CONFIG_PARTITION_ADVANCED=y -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_MELAN=y -CONFIG_X86_GENERIC=y -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_NOHIGHMEM=y -# CONFIG_COMPACTION is not set -# CONFIG_BOUNCE is not set -# CONFIG_CROSS_MEMORY_ATTACH is not set -# CONFIG_RELOCATABLE is not set -# CONFIG_SUSPEND is not set -# CONFIG_ACPI is not set -CONFIG_CPU_IDLE=y -CONFIG_TS5500=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_BLK_DEV is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=y -# CONFIG_ATA_VERBOSE_ERROR is not set -# CONFIG_SATA_PMP is not set -CONFIG_ATA_GENERIC=y -CONFIG_PATA_LEGACY=y -CONFIG_NETDEVICES=y -# CONFIG_NET_CORE is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_VENDOR_ADAPTEC is not set -# CONFIG_NET_VENDOR_ALTEON is not set -# CONFIG_NET_VENDOR_AMD is not set -# CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_ATHEROS is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_TULIP=y -CONFIG_DM9102=y -# CONFIG_NET_VENDOR_DLINK is not set -# CONFIG_NET_VENDOR_EMULEX is not set -# CONFIG_NET_VENDOR_EXAR is not set -# CONFIG_NET_VENDOR_HP is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MELLANOX is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MYRI is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_NVIDIA is not set -# CONFIG_NET_VENDOR_OKI is not set -# CONFIG_NET_PACKET_ENGINE is not set -# CONFIG_NET_VENDOR_QLOGIC is not set -# CONFIG_NET_VENDOR_REALTEK is not set -# CONFIG_NET_VENDOR_RDC is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SILAN is not set -# CONFIG_NET_VENDOR_SIS is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_SUN is not set -# CONFIG_NET_VENDOR_TEHUTI is not set -# CONFIG_NET_VENDOR_TI is not set -# CONFIG_NET_VENDOR_VIA is not set -# CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_PHYLIB=y -CONFIG_DAVICOM_PHY=y -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_TS5500=y -CONFIG_SENSORS_MAX197=y -CONFIG_WATCHDOG=y -CONFIG_SC520_WDT=y -CONFIG_USB=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_PL2303=y -# CONFIG_X86_PLATFORM_DEVICES is not set -# CONFIG_IOMMU_SUPPORT is not set -# CONFIG_DMIID is not set -CONFIG_EXT4_FS=y -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -# CONFIG_VIRTUALIZATION is not set -CONFIG_XZ_DEC=y diff --git a/board/ts/ts5x00/linux-3.17.config b/board/ts/ts5x00/linux-3.17.config new file mode 100644 index 0000000000..60cd8a0fe3 --- /dev/null +++ b/board/ts/ts5x00/linux-3.17.config @@ -0,0 +1,113 @@ +CONFIG_PARTITION_ADVANCED=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_MELAN=y +CONFIG_X86_GENERIC=y +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_NOHIGHMEM=y +# CONFIG_COMPACTION is not set +# CONFIG_BOUNCE is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set +# CONFIG_RELOCATABLE is not set +# CONFIG_SUSPEND is not set +# CONFIG_ACPI is not set +CONFIG_CPU_IDLE=y +CONFIG_TS5500=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_BLK_DEV is not set +CONFIG_BLK_DEV_SD=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_SATA_PMP is not set +CONFIG_ATA_GENERIC=y +CONFIG_PATA_LEGACY=y +CONFIG_NETDEVICES=y +# CONFIG_NET_CORE is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +CONFIG_NET_TULIP=y +CONFIG_DM9102=y +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_HP is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_PHYLIB=y +CONFIG_DAVICOM_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_GPIOLIB=y +CONFIG_GPIO_TS5500=y +CONFIG_SENSORS_MAX197=y +CONFIG_WATCHDOG=y +CONFIG_SC520_WDT=y +CONFIG_USB=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_PL2303=y +# CONFIG_X86_PLATFORM_DEVICES is not set +# CONFIG_IOMMU_SUPPORT is not set +# CONFIG_DMIID is not set +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y +# CONFIG_VIRTUALIZATION is not set +CONFIG_XZ_DEC=y diff --git a/board/ts/ts5x00/patches/linux/linux-001-add-support-for-ts5400.patch b/board/ts/ts5x00/patches/linux/linux-001-add-support-for-ts5400.patch deleted file mode 100644 index 0e5c37bed2..0000000000 --- a/board/ts/ts5x00/patches/linux/linux-001-add-support-for-ts5400.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 510acd057785ff52bfdfed6360a44a42f44e078f Mon Sep 17 00:00:00 2001 -From: Vivien Didelot -Date: Mon, 7 Jul 2014 15:56:11 -0400 -Subject: [PATCH] x86: (ts5500) add board support for TS-5400 - -This patch extends the TS-5500 board support to identify the compatible -TS-5400 Single Board Computer (ID 0x40). - -It also adds a new "name" sysfs attribute for more human readable -identification, actually printing "TS-5500" or "TS-5400". - -Signed-off-by: Vivien Didelot ---- - arch/x86/platform/ts5500/ts5500.c | 34 +++++++++++++++++++++++++++------- - 1 file changed, 27 insertions(+), 7 deletions(-) - -diff --git a/arch/x86/platform/ts5500/ts5500.c b/arch/x86/platform/ts5500/ts5500.c -index 9471b94..127fce2 100644 ---- a/arch/x86/platform/ts5500/ts5500.c -+++ b/arch/x86/platform/ts5500/ts5500.c -@@ -31,7 +31,6 @@ - - /* Product code register */ - #define TS5500_PRODUCT_CODE_ADDR 0x74 --#define TS5500_PRODUCT_CODE 0x60 /* TS-5500 product code */ - - /* SRAM/RS-485/ADC options, and RS-485 RTS/Automatic RS-485 flags register */ - #define TS5500_SRAM_RS485_ADC_ADDR 0x75 -@@ -64,9 +63,17 @@ - #define TS5500_ADC_CONV_MSB_ADDR 0x197 /* MSB register */ - #define TS5500_ADC_CONV_DELAY 12 /* usec */ - -+static const struct ts5x00_info { -+ const int id; -+ const char * const name; -+} ts5x00_info[] = { -+ { 0x40, "TS-5400" }, -+ { 0x60, "TS-5500" }, -+}; -+ - /** - * struct ts5500_sbc - TS-5500 board description -- * @id: Board product ID. -+ * @info: Board identification. - * @sram: Flag for SRAM option. - * @rs485: Flag for RS-485 option. - * @adc: Flag for Analog/Digital converter option. -@@ -75,7 +82,7 @@ - * @jumpers: Bitfield for jumpers' state. - */ - struct ts5500_sbc { -- int id; -+ const struct ts5x00_info *info; - bool sram; - bool rs485; - bool adc; -@@ -117,18 +124,21 @@ static int __init ts5500_check_signature(void) - static int __init ts5500_detect_config(struct ts5500_sbc *sbc) - { - u8 tmp; -+ int i; - int ret = 0; - - if (!request_region(TS5500_PRODUCT_CODE_ADDR, 4, "ts5500")) - return -EBUSY; - - tmp = inb(TS5500_PRODUCT_CODE_ADDR); -- if (tmp != TS5500_PRODUCT_CODE) { -- pr_err("This platform is not a TS-5500 (found ID 0x%x)\n", tmp); -+ for (i = 0; i < ARRAY_SIZE(ts5x00_info) && !sbc->info; ++i) -+ if (tmp == ts5x00_info[i].id) -+ sbc->info = &ts5x00_info[i]; -+ if (!sbc->info) { -+ pr_err("Not a known TS-5x00 platform (found ID 0x%x)\n", tmp); - ret = -ENODEV; - goto cleanup; - } -- sbc->id = tmp; - - tmp = inb(TS5500_SRAM_RS485_ADC_ADDR); - sbc->sram = tmp & TS5500_SRAM; -@@ -152,7 +162,15 @@ static ssize_t ts5500_show_id(struct device *dev, - { - struct ts5500_sbc *sbc = dev_get_drvdata(dev); - -- return sprintf(buf, "0x%.2x\n", sbc->id); -+ return sprintf(buf, "0x%.2x\n", sbc->info->id); -+} -+ -+static ssize_t ts5500_show_name(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ struct ts5500_sbc *sbc = dev_get_drvdata(dev); -+ -+ return sprintf(buf, "%s\n", sbc->info->name); - } - - static ssize_t ts5500_show_jumpers(struct device *dev, -@@ -180,6 +198,7 @@ TS5500_SHOW(ereset) - TS5500_SHOW(itr) - - static DEVICE_ATTR(id, S_IRUGO, ts5500_show_id, NULL); -+static DEVICE_ATTR(name, S_IRUGO, ts5500_show_name, NULL); - static DEVICE_ATTR(jumpers, S_IRUGO, ts5500_show_jumpers, NULL); - static DEVICE_ATTR(sram, S_IRUGO, ts5500_show_sram, NULL); - static DEVICE_ATTR(rs485, S_IRUGO, ts5500_show_rs485, NULL); -@@ -189,6 +208,7 @@ static DEVICE_ATTR(itr, S_IRUGO, ts5500_show_itr, NULL); - - static struct attribute *ts5500_attributes[] = { - &dev_attr_id.attr, -+ &dev_attr_name.attr, - &dev_attr_jumpers.attr, - &dev_attr_sram.attr, - &dev_attr_rs485.attr, --- -1.9.1 - diff --git a/configs/ts5x00_defconfig b/configs/ts5x00_defconfig index 0bb26ada28..336f6d936e 100644 --- a/configs/ts5x00_defconfig +++ b/configs/ts5x00_defconfig @@ -1,13 +1,12 @@ BR2_i386=y BR2_x86_i586=y -BR2_KERNEL_HEADERS_3_14=y +BR2_KERNEL_HEADERS_3_17=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_OVERLAY="board/ts/ts5x00/fs-overlay" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_SAME_AS_HEADERS=y -BR2_LINUX_KERNEL_PATCH="board/ts/ts5x00/patches/linux/" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/ts/ts5x00/linux-3.14.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/ts/ts5x00/linux-3.17.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y