From abf5e610ae923515288e74e0d631a161ef4046a9 Mon Sep 17 00:00:00 2001 From: JuS Date: Thu, 3 Mar 2016 12:10:44 +0100 Subject: [PATCH] Merge Datei-Leichen Entfernt --- ...-bugs-after-cleaning-the-kernel-tree.patch | 19 ------ ...el-gpio_keys-load-module-on-pre-init.patch | 21 ------ ...-lzma-loader-fix-O32-ABI-conformance.patch | 36 ----------- ...bvious-bugs-causing-compile-warnings.patch | 64 ------------------- ...s-split-ubdev01-flash-layout-from-XM.patch | 39 ----------- ...ix-firmware_max_length-for-XM-layout.patch | 45 ------------- ...its-for-macronix-flash-chips-at-init.patch | 22 ------- ...86-generic-enable-pata_atiixp-driver.patch | 24 ------- 8 files changed, 270 deletions(-) delete mode 100644 patches/openwrt/0049-brcm2708-gpu-fw-move-pkg-build-dir-to-kernel-build-dir-to-fix-rebuild-bugs-after-cleaning-the-kernel-tree.patch delete mode 100644 patches/openwrt/0050-kernel-gpio_keys-load-module-on-pre-init.patch delete mode 100644 patches/openwrt/0051-ar71xx-lzma-loader-fix-O32-ABI-conformance.patch delete mode 100644 patches/openwrt/0052-firmware-utils-mkfwimage-add-Wall-fix-obvious-bugs-causing-compile-warnings.patch delete mode 100644 patches/openwrt/0053-ar71xx-firmware-utils-split-ubdev01-flash-layout-from-XM.patch delete mode 100644 patches/openwrt/0054-firmware-utils-mkfwimage-fix-firmware_max_length-for-XM-layout.patch delete mode 100644 patches/openwrt/0055-kernel-disable-software-protection-bits-for-macronix-flash-chips-at-init.patch delete mode 100644 patches/openwrt/0056-x86-generic-enable-pata_atiixp-driver.patch diff --git a/patches/openwrt/0049-brcm2708-gpu-fw-move-pkg-build-dir-to-kernel-build-dir-to-fix-rebuild-bugs-after-cleaning-the-kernel-tree.patch b/patches/openwrt/0049-brcm2708-gpu-fw-move-pkg-build-dir-to-kernel-build-dir-to-fix-rebuild-bugs-after-cleaning-the-kernel-tree.patch deleted file mode 100644 index 1fab9e46..00000000 --- a/patches/openwrt/0049-brcm2708-gpu-fw-move-pkg-build-dir-to-kernel-build-dir-to-fix-rebuild-bugs-after-cleaning-the-kernel-tree.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 28 Feb 2016 02:29:56 +0100 -Subject: brcm2708-gpu-fw: move pkg build dir to kernel build dir to fix rebuild bugs after cleaning the kernel tree - -Backport of r48732 - -diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile -index eee85e0..286984b 100644 ---- a/package/kernel/brcm2708-gpu-fw/Makefile -+++ b/package/kernel/brcm2708-gpu-fw/Makefile -@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_REV).tar.gz - PKG_SOURCE_URL:=https://github.com/Hexxeh/rpi-firmware/archive/ - PKG_MD5SUM:=f5683c1dcb255714942f7c9fd61b3a0a - --PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_REV) -+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_REV) - - include $(INCLUDE_DIR)/package.mk - diff --git a/patches/openwrt/0050-kernel-gpio_keys-load-module-on-pre-init.patch b/patches/openwrt/0050-kernel-gpio_keys-load-module-on-pre-init.patch deleted file mode 100644 index cba048f6..00000000 --- a/patches/openwrt/0050-kernel-gpio_keys-load-module-on-pre-init.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 28 Feb 2016 03:42:29 +0100 -Subject: kernel/gpio_keys: load module on pre-init - -fix rescue mode on wdr4900 - -Backport of r48793 - -diff --git a/package/kernel/linux/modules/input.mk b/package/kernel/linux/modules/input.mk -index 86ff33c..eed9aa2 100644 ---- a/package/kernel/linux/modules/input.mk -+++ b/package/kernel/linux/modules/input.mk -@@ -75,7 +75,7 @@ define KernelPackage/input-gpio-keys - CONFIG_KEYBOARD_GPIO \ - CONFIG_INPUT_KEYBOARD=y - FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko -- AUTOLOAD:=$(call AutoProbe,gpio_keys) -+ AUTOLOAD:=$(call AutoProbe,gpio_keys,1) - endef - - define KernelPackage/input-gpio-keys/description diff --git a/patches/openwrt/0051-ar71xx-lzma-loader-fix-O32-ABI-conformance.patch b/patches/openwrt/0051-ar71xx-lzma-loader-fix-O32-ABI-conformance.patch deleted file mode 100644 index 2d08f3b4..00000000 --- a/patches/openwrt/0051-ar71xx-lzma-loader-fix-O32-ABI-conformance.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 28 Feb 2016 04:49:51 +0100 -Subject: ar71xx/lzma-loader: fix O32 ABI conformance - -According to the calling convention of the o32 ABI the caller -function must reserve stack space for $a0-$a3 registers in case -the callee needs to save its arguments. - -The assembly code of the loader does not reserve stack space for -these registers thus when the 'loader_main' function needs to save -its arguments, those will be stored in the 'workspace' area instead -of the stack. - -Because the workspace area is also used by other part of the code, the -saved register values gets overwritten and this often leads to failed -kernel boots. - -Fix the code to reserve stack space for the registers to avoid this -error. - -Backport of r48279 - -diff --git a/target/linux/ar71xx/image/lzma-loader/src/head.S b/target/linux/ar71xx/image/lzma-loader/src/head.S -index 543996a..47a7c9b 100644 ---- a/target/linux/ar71xx/image/lzma-loader/src/head.S -+++ b/target/linux/ar71xx/image/lzma-loader/src/head.S -@@ -109,6 +109,9 @@ __bss_check: - /* Setup new "C" stack */ - la sp, _stack - -+ /* reserve stack space for a0-a3 registers */ -+ subu sp, 16 -+ - /* jump to the decompressor routine */ - la t0, loader_main - jr t0 diff --git a/patches/openwrt/0052-firmware-utils-mkfwimage-add-Wall-fix-obvious-bugs-causing-compile-warnings.patch b/patches/openwrt/0052-firmware-utils-mkfwimage-add-Wall-fix-obvious-bugs-causing-compile-warnings.patch deleted file mode 100644 index 781fd5d4..00000000 --- a/patches/openwrt/0052-firmware-utils-mkfwimage-add-Wall-fix-obvious-bugs-causing-compile-warnings.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 25 Feb 2016 21:39:03 +0100 -Subject: firmware-utils: mkfwimage: add -Wall, fix obvious bugs causing compile warnings - -Signed-off-by: Matthias Schiffer - -diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile -index bd69cb4..6d88845 100644 ---- a/tools/firmware-utils/Makefile -+++ b/tools/firmware-utils/Makefile -@@ -32,7 +32,7 @@ define Host/Compile - $(call cc,mkzynfw) - $(call cc,lzma2eva,-lz) - $(call cc,mkcasfw) -- $(call cc,mkfwimage,-lz) -+ $(call cc,mkfwimage,-lz -Wall) - $(call cc,mkfwimage2,-lz) - $(call cc,imagetag imagetag_cmdline cyg_crc32) - $(call cc,add_header) -diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c -index e3a03c1..00bf439 100644 ---- a/tools/firmware-utils/src/mkfwimage.c -+++ b/tools/firmware-utils/src/mkfwimage.c -@@ -104,8 +104,6 @@ typedef struct part_data { - - #define OPTIONS "B:hv:m:o:r:k:" - --static int debug = 0; -- - typedef struct image_info { - char magic[16]; - char version[256]; -@@ -236,9 +234,9 @@ static int create_image_layout(const char* kernelfile, const char* rootfsfile, c - fw_layout_t* p; - - p = &fw_layout_data[0]; -- while ((strlen(p->name) != 0) && (strncmp(p->name, board_name, sizeof(board_name)) != 0)) -+ while (*p->name && (strcmp(p->name, board_name) != 0)) - p++; -- if (p->name == NULL) { -+ if (!*p->name) { - printf("BUG! Unable to find default fw layout!\n"); - exit(-1); - } -@@ -247,7 +245,7 @@ static int create_image_layout(const char* kernelfile, const char* rootfsfile, c - strcpy(kernel->partition_name, "kernel"); - kernel->partition_index = 1; - kernel->partition_baseaddr = p->kern_start; -- if ( (kernel->partition_length = filelength(kernelfile)) < 0) return (-1); -+ if ( (kernel->partition_length = filelength(kernelfile)) == (u_int32_t)-1) return (-1); - kernel->partition_memaddr = p->kern_entry; - kernel->partition_entryaddr = p->kern_entry; - strncpy(kernel->filename, kernelfile, sizeof(kernel->filename)); -@@ -263,8 +261,8 @@ static int create_image_layout(const char* kernelfile, const char* rootfsfile, c - rootfs->partition_entryaddr = 0x00000000; - strncpy(rootfs->filename, rootfsfile, sizeof(rootfs->filename)); - --printf("kernel: %d 0x%08x\n", kernel->partition_length, kernel->partition_baseaddr); --printf("root: %d 0x%08x\n", rootfs->partition_length, rootfs->partition_baseaddr); -+ printf("kernel: %d 0x%08x\n", kernel->partition_length, kernel->partition_baseaddr); -+ printf("root: %d 0x%08x\n", rootfs->partition_length, rootfs->partition_baseaddr); - im->part_count = 2; - - return 0; diff --git a/patches/openwrt/0053-ar71xx-firmware-utils-split-ubdev01-flash-layout-from-XM.patch b/patches/openwrt/0053-ar71xx-firmware-utils-split-ubdev01-flash-layout-from-XM.patch deleted file mode 100644 index 3dcad272..00000000 --- a/patches/openwrt/0053-ar71xx-firmware-utils-split-ubdev01-flash-layout-from-XM.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 25 Feb 2016 21:40:19 +0100 -Subject: ar71xx, firmware-utils: split ubdev01 flash layout from XM - -The ubdev01 profile defines its own MTDPARTS with smaller firmware -partition, so give it its own UBNT_BOARD in mkfwimage. - -Signed-off-by: Matthias Schiffer - -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 4b29d9c..0806f15 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -2031,7 +2031,7 @@ $(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510,cpe210-220-510-520,C - $(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x)) - $(eval $(call SingleProfile,UAPPRO,64k,UBNTUNIFIOUTDOORPLUS,ubnt-unifi-outdoor-plus,UBNT-UOP,ttyS0,115200,BZ,BZ,ar7240)) - --$(eval $(call SingleProfile,UBDEV,64kraw,UBDEV01,ubdev01,UBNT-UF,ttyS0,115200,XM,XM,ar7240)) -+$(eval $(call SingleProfile,UBDEV,64kraw,UBDEV01,ubdev01,UBNT-UF,ttyS0,115200,UBDEV01,XM,ar7240)) - - $(eval $(call SingleProfile,UBNT,64k,UBNTRS,ubnt-rs,UBNT-RS,ttyS0,115200,RS,RSx,ar7100)) - $(eval $(call SingleProfile,UBNT,64k,UBNTRSPRO,ubnt-rspro,UBNT-RSPRO,ttyS0,115200,RSPRO,RSPRO,ar7100pro)) -diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c -index 00bf439..5dae284 100644 ---- a/tools/firmware-utils/src/mkfwimage.c -+++ b/tools/firmware-utils/src/mkfwimage.c -@@ -81,6 +81,12 @@ fw_layout_t fw_layout_data[] = { - .kern_entry = 0x80002000, - .firmware_max_length= 0x006A0000, - }, -+ { -+ .name = "UBDEV01", -+ .kern_start = 0x9f050000, -+ .kern_entry = 0x80002000, -+ .firmware_max_length= 0x006A0000, -+ }, - { .name = "", - }, - }; diff --git a/patches/openwrt/0054-firmware-utils-mkfwimage-fix-firmware_max_length-for-XM-layout.patch b/patches/openwrt/0054-firmware-utils-mkfwimage-fix-firmware_max_length-for-XM-layout.patch deleted file mode 100644 index ab1c34db..00000000 --- a/patches/openwrt/0054-firmware-utils-mkfwimage-fix-firmware_max_length-for-XM-layout.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 25 Feb 2016 21:42:14 +0100 -Subject: firmware-utils: mkfwimage: fix firmware_max_length for XM layout - -The new u-boot version bundled with the 5.6.x firmwares from Ubiquiti gets -confused by the smaller rootfs partition size; this can lead to various -issues: - -1. We've gotten reports that flashing from the 5.6.x stock firmware to - OpenWrt will brick devices; I wasn't able to reproduce this myself -2. Flashing from 5.5.x stock firmware to OpenWrt and back to stock (via - TFTP recovery), following by an update to 5.6.x via web interface can - yield a bricked device with the following properties: - - It can't be booted without entering commands over a serial console, as - u-boot supplies the wrong MTD layout - - The web interface won't accept any image with the original flash - layout, so stock firmware upgrades are impossible - - As the TFTP recovery doesn't update u-boot, returning to the old - u-boot from firmware 5.5.x is impossible - -To recover from 2., creating an OpenWrt image which doesn't set u-boot as -read-only and flashing a backup of the old u-boot from there is the only -way known to me. (Fixing the mtdparts variable in u-boot-env from OpenWrt -might also work; settings this from u-boot over serial didn't have -any permanent effect.) - -Fix all of this by setting the correct flash layout also used by the stock -firmware. Flashing has been tested from both firmware 5.5.x and 5.6.x. The -fixed layout also matches the mtdparts defined by OpenWrt. - -Signed-off-by: Matthias Schiffer - -diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c -index 5dae284..d8d5239 100644 ---- a/tools/firmware-utils/src/mkfwimage.c -+++ b/tools/firmware-utils/src/mkfwimage.c -@@ -79,7 +79,7 @@ fw_layout_t fw_layout_data[] = { - .name = "XM", - .kern_start = 0x9f050000, - .kern_entry = 0x80002000, -- .firmware_max_length= 0x006A0000, -+ .firmware_max_length= 0x00760000, - }, - { - .name = "UBDEV01", diff --git a/patches/openwrt/0055-kernel-disable-software-protection-bits-for-macronix-flash-chips-at-init.patch b/patches/openwrt/0055-kernel-disable-software-protection-bits-for-macronix-flash-chips-at-init.patch deleted file mode 100644 index 2b16474a..00000000 --- a/patches/openwrt/0055-kernel-disable-software-protection-bits-for-macronix-flash-chips-at-init.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 26 Feb 2016 04:24:06 +0100 -Subject: kernel: disable software protection bits for macronix flash chips at init - -Backport of r47626 - -diff --git a/target/linux/generic/patches-3.18/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-3.18/465-m25p80-mx-disable-software-protection.patch -new file mode 100644 -index 0000000..d7d7eec ---- /dev/null -+++ b/target/linux/generic/patches-3.18/465-m25p80-mx-disable-software-protection.patch -@@ -0,0 +1,10 @@ -+--- a/drivers/mtd/spi-nor/spi-nor.c -++++ b/drivers/mtd/spi-nor/spi-nor.c -+@@ -962,6 +962,7 @@ int spi_nor_scan(struct spi_nor *nor, co -+ -+ if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL || -+ JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL || -++ JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX || -+ JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) { -+ write_enable(nor); -+ write_sr(nor, 0); diff --git a/patches/openwrt/0056-x86-generic-enable-pata_atiixp-driver.patch b/patches/openwrt/0056-x86-generic-enable-pata_atiixp-driver.patch deleted file mode 100644 index 9bc53737..00000000 --- a/patches/openwrt/0056-x86-generic-enable-pata_atiixp-driver.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Matthias Schiffer -Date: Wed, 2 Mar 2016 18:26:15 +0100 -Subject: x86/generic: enable pata_atiixp driver - -This enables booting from devices that use an ATI PATA controller for -the boot device, such as the embedded CF cards in Fujitsu-Siemens Futro -thin-clients. - -Signed-off-by: Felix Kaechele - -Backport of r48861 - -diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default -index eb4b357..9e963bf 100644 ---- a/target/linux/x86/generic/config-default -+++ b/target/linux/x86/generic/config-default -@@ -153,6 +153,7 @@ 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