diff options
4 files changed, 12 insertions, 12 deletions
| diff --git a/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch index 2f3155588..b4d57cb53 100644 --- a/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch +++ b/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch @@ -15,15 +15,15 @@  +				parts[i].size = fl->next->img->flash_base;  +				parts[i].size &= ~(master->erasesize - 1);  +				parts[i].size -= parts[i].offset; -+			}  +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED -+			else { ++				nrparts--; ++			} else {  +				i++;  +				parts[i].offset = parts[i-1].size + parts[i-1].offset;  +				parts[i].size = fl->next->img->flash_base - parts[i].offset;  +				parts[i].name = nullname; -+			}   #endif ++			}  +		}   		tmp_fl = fl;   		fl = fl->next; diff --git a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch index 2f3155588..b4d57cb53 100644 --- a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch +++ b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch @@ -15,15 +15,15 @@  +				parts[i].size = fl->next->img->flash_base;  +				parts[i].size &= ~(master->erasesize - 1);  +				parts[i].size -= parts[i].offset; -+			}  +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED -+			else { ++				nrparts--; ++			} else {  +				i++;  +				parts[i].offset = parts[i-1].size + parts[i-1].offset;  +				parts[i].size = fl->next->img->flash_base - parts[i].offset;  +				parts[i].name = nullname; -+			}   #endif ++			}  +		}   		tmp_fl = fl;   		fl = fl->next; diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch index b473d59ec..0f15bab3d 100644 --- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch +++ b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch @@ -15,15 +15,15 @@  +				parts[i].size = fl->next->img->flash_base;  +				parts[i].size &= ~(master->erasesize - 1);  +				parts[i].size -= parts[i].offset; -+			}  +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED -+			else { ++				nrparts--; ++			} else {  +				i++;  +				parts[i].offset = parts[i-1].size + parts[i-1].offset;  +				parts[i].size = fl->next->img->flash_base - parts[i].offset;  +				parts[i].name = nullname; -+			}   #endif ++			}  +		}   		tmp_fl = fl;   		fl = fl->next; diff --git a/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch index b473d59ec..0f15bab3d 100644 --- a/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch +++ b/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch @@ -15,15 +15,15 @@  +				parts[i].size = fl->next->img->flash_base;  +				parts[i].size &= ~(master->erasesize - 1);  +				parts[i].size -= parts[i].offset; -+			}  +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED -+			else { ++				nrparts--; ++			} else {  +				i++;  +				parts[i].offset = parts[i-1].size + parts[i-1].offset;  +				parts[i].size = fl->next->img->flash_base - parts[i].offset;  +				parts[i].name = nullname; -+			}   #endif ++			}  +		}   		tmp_fl = fl;   		fl = fl->next; | 
