mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
fec8fe8069
Refreshed all patches Remove upstreamed patches. - 103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch - 403-mtd_fix_cfi_cmdset_0002_status_check.patch - 001-4.11-01-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch - 001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - 001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - 900-gen_stats-fix-netlink-stats-padding.patch Introduce a new backported patch to address ext4 breakage, introduced in 4.9.112 - backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch This patch has been slightly altered to compensate for a new helper function introduced in later kernels. Also add ARM64_SSBD symbol to ARM64 targets still running kernel 4.9 Compile-tested on: ar71xx, bcm2710 Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
31 lines
890 B
Diff
31 lines
890 B
Diff
--- a/drivers/mtd/redboot.c
|
|
+++ b/drivers/mtd/redboot.c
|
|
@@ -31,6 +31,8 @@
|
|
#include <linux/module.h>
|
|
#include <linux/mod_devicetable.h>
|
|
|
|
+#include <asm/mach-types.h>
|
|
+
|
|
struct fis_image_desc {
|
|
unsigned char name[16]; // Null terminated name
|
|
uint32_t flash_base; // Address within FLASH of image
|
|
@@ -48,7 +50,8 @@ struct fis_list {
|
|
struct fis_list *next;
|
|
};
|
|
|
|
-static int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK;
|
|
+int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK;
|
|
+
|
|
module_param(directory, int, 0);
|
|
|
|
static inline int redboot_checksum(struct fis_image_desc *img)
|
|
@@ -76,6 +79,8 @@ static int parse_redboot_partitions(stru
|
|
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
|
|
static char nullstring[] = "unallocated";
|
|
#endif
|
|
+ if (machine_is_sidewinder())
|
|
+ directory = -5;
|
|
|
|
if ( directory < 0 ) {
|
|
offset = master->size + directory * master->erasesize;
|