From 99d46724d1d7e3f5648e453c602ae6c72ebc38f4 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 12 Nov 2012 07:56:37 +0000 Subject: [PATCH] [atheros] move redboot boardconfig patch into target folder git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34166 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.3/140-redboot_boardconfig.patch} | 0 ...scan.patch => 141-redboot_partition_scan.patch} | 0 ...ch => 142-redboot_various_erase_size_fix.patch} | 0 .../patches-3.6/421-redboot_boardconfig.patch | 60 ---------------------- 4 files changed, 60 deletions(-) rename target/linux/{generic/patches-3.3/421-redboot_boardconfig.patch => atheros/patches-3.3/140-redboot_boardconfig.patch} (100%) rename target/linux/atheros/patches-3.3/{140-redboot_partition_scan.patch => 141-redboot_partition_scan.patch} (100%) rename target/linux/atheros/patches-3.3/{141-redboot_various_erase_size_fix.patch => 142-redboot_various_erase_size_fix.patch} (100%) delete mode 100644 target/linux/generic/patches-3.6/421-redboot_boardconfig.patch diff --git a/target/linux/generic/patches-3.3/421-redboot_boardconfig.patch b/target/linux/atheros/patches-3.3/140-redboot_boardconfig.patch similarity index 100% rename from target/linux/generic/patches-3.3/421-redboot_boardconfig.patch rename to target/linux/atheros/patches-3.3/140-redboot_boardconfig.patch diff --git a/target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch b/target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch similarity index 100% rename from target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch rename to target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch diff --git a/target/linux/atheros/patches-3.3/141-redboot_various_erase_size_fix.patch b/target/linux/atheros/patches-3.3/142-redboot_various_erase_size_fix.patch similarity index 100% rename from target/linux/atheros/patches-3.3/141-redboot_various_erase_size_fix.patch rename to target/linux/atheros/patches-3.3/142-redboot_various_erase_size_fix.patch diff --git a/target/linux/generic/patches-3.6/421-redboot_boardconfig.patch b/target/linux/generic/patches-3.6/421-redboot_boardconfig.patch deleted file mode 100644 index 4191b0d426..0000000000 --- a/target/linux/generic/patches-3.6/421-redboot_boardconfig.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -30,6 +30,8 @@ - #include - #include - -+#define BOARD_CONFIG_PART "boardconfig" -+ - struct fis_image_desc { - unsigned char name[16]; // Null terminated name - uint32_t flash_base; // Address within FLASH of image -@@ -60,6 +62,7 @@ static int parse_redboot_partitions(stru - struct mtd_partition **pparts, - struct mtd_part_parser_data *data) - { -+ unsigned long max_offset = 0; - int nrparts = 0; - struct fis_image_desc *buf; - struct mtd_partition *parts; -@@ -225,14 +228,14 @@ static int parse_redboot_partitions(stru - } - } - #endif -- parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL); -+ parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL); - - if (!parts) { - ret = -ENOMEM; - goto out; - } - -- nullname = (char *)&parts[nrparts]; -+ nullname = (char *)&parts[nrparts + 1]; - #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED - if (nulllen > 0) { - strcpy(nullname, nullstring); -@@ -251,6 +254,8 @@ static int parse_redboot_partitions(stru - } - #endif - for ( ; iimg->size; - parts[i].offset = fl->img->flash_base; - parts[i].name = names; -@@ -284,6 +289,14 @@ static int parse_redboot_partitions(stru - fl = fl->next; - kfree(tmp_fl); - } -+ if(master->size - max_offset >= master->erasesize) -+ { -+ parts[nrparts].size = master->size - max_offset; -+ parts[nrparts].offset = max_offset; -+ parts[nrparts].name = names; -+ strcpy(names, BOARD_CONFIG_PART); -+ nrparts++; -+ } - ret = nrparts; - *pparts = parts; - out: -- 2.11.0