iCE40/nextpnr - clone of git://git.panaceas.org/iCE40/nextpnr

diff options

author	gatecat <gatecat@ds0.me>	2021-03-30 22:36:51 +0100
committer	GitHub <noreply@github.com>	2021-03-30 22:36:51 +0100
commit	edecc06fcfbedf23773cd8ba04f1eb6f5bd64358 (patch)
tree	32aa9fc88383ac445694351ab6b63c3bcc608a41 /3rdparty/imgui
parent	4dc45ffdc8d61a03115b422904be3b9c7f31b1d5 (diff)
parent	8675945b2681611fbed2c97660d0e848a6fd099c (diff)
download	nextpnr-edecc06fcfbedf23773cd8ba04f1eb6f5bd64358.tar.gz nextpnr-edecc06fcfbedf23773cd8ba04f1eb6f5bd64358.tar.bz2 nextpnr-edecc06fcfbedf23773cd8ba04f1eb6f5bd64358.zip

Merge pull request #656 from litghost/fix_dedicated_interconnect_bug

Fix bug where DedicateInterconnect incorrectly allows some placements.

Diffstat (limited to '3rdparty/imgui')

0 files changed, 0 insertions, 0 deletions

--- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -12,6 +12,23 @@ menuconfig MTD if MTD +menu "OpenWrt specific MTD options" + +config MTD_ROOTFS_ROOT_DEV + bool "Automatically set 'rootfs' partition to be root filesystem" + default y + +config MTD_SPLIT_FIRMWARE + bool "Automatically split firmware partition for kernel+rootfs" + default y + +config MTD_SPLIT_FIRMWARE_NAME + string "Firmware partition name" + depends on MTD_SPLIT_FIRMWARE + default "firmware" + +endmenu + config MTD_TESTS tristate "MTD tests support (DANGEROUS)" depends on m --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -30,9 +30,11 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/of.h> +#include <linux/magic.h> #include <linux/err.h> #include "mtdcore.h" +#include "mtdsplit/mtdsplit.h" /* Our partition linked list */ static LIST_HEAD(mtd_partitions); @@ -46,13 +48,14 @@ struct mtd_part { struct list_head list; }; +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part); + /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve * the pointer to that structure with this macro. */ #define PART(x) ((struct mtd_part *)(x)) - /* * MTD methods which simply translate the effective address and pass through * to the _real_ device. @@ -548,8 +551,10 @@ out_register: return slave; } -int mtd_add_partition(struct mtd_info *master, const char *name, - long long offset, long long length) + +static int +__mtd_add_partition(struct mtd_info *master, const char *name, + long long offset, long long length, bool dup_check) { struct mtd_partition part; struct mtd_part *p, *new; @@ -581,21 +586,24 @@ int mtd_add_partition(struct mtd_info *m end = offset + length; mutex_lock(&mtd_partitions_mutex); - list_for_each_entry(p, &mtd_partitions, list) - if (p->master == master) { - if ((start >= p->offset) && - (start < (p->offset + p->mtd.size))) - goto err_inv; - - if ((end >= p->offset) && - (end < (p->offset + p->mtd.size))) - goto err_inv; - } + if (dup_check) { + list_for_each_entry(p, &mtd_partitions, list) + if (p->master == master) { + if ((start >= p->offset) && + (start < (p->offset + p->mtd.size))) + goto err_inv; + + if ((end >= p->offset) && + (end < (p->offset + p->mtd.size))) + goto err_inv; + } + } list_add(&new->list, &mtd_partitions); mutex_unlock(&mtd_partitions_mutex); add_mtd_device(&new->mtd); + mtd_partition_split(master, new); return ret; err_inv: @@ -605,6 +613,12 @@ err_inv: } EXPORT_SYMBOL_GPL(mtd_add_partition); +int mtd_add_partition(struct mtd_info *master, const char *name, + long long offset, long long length) +{ + return __mtd_add_partition(master, name, offset, length, true); +} + int mtd_del_partition(struct mtd_info *master, int partno) { struct mtd_part *slave, *next; @@ -628,6 +642,35 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); +#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME +#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME +#else +#define SPLIT_FIRMWARE_NAME "unused" +#endif + +static void split_firmware(struct mtd_info *master, struct mtd_part *part) +{ +} + +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, + int offset, int size) +{ +} + +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +{ + static int rootfs_found = 0; + + if (rootfs_found) + return; + + if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && + config_enabled(CONFIG_MTD_SPLIT_FIRMWARE)) + split_firmware(master, part); + + arch_split_mtd_part(master, part->mtd.name, part->offset, + part->mtd.size); +} /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to @@ -657,6 +700,7 @@ int add_mtd_partitions(struct mtd_info * mutex_unlock(&mtd_partitions_mutex); add_mtd_device(&slave->mtd); + mtd_partition_split(master, slave); cur_offset = slave->offset + slave->mtd.size; } --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m long long offset, long long length); int mtd_del_partition(struct mtd_info *master, int partno); uint64_t mtd_get_device_size(const struct mtd_info *mtd); +extern void __weak arch_split_mtd_part(struct mtd_info *master, + const char *name, int offset, int size); #endif


context:
space:
mode: