X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=blobdiff_plain;f=common%2Ffdt_support.c;h=5aa8e3422e8de71c1fb4efa057bd187356e32a46;hp=dfdc04dfbae3bac471651c0233010d404de8f7a7;hb=98f705c9cefdfdba62c069821bbba10273a0a8ed;hpb=d4db3b86a5e090e21db710bedbbe3e50d4c56428

diff --git a/common/fdt_support.c b/common/fdt_support.c
index dfdc04dfba..5aa8e3422e 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -642,84 +642,6 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) {
 }
 #endif
 
-#ifdef CONFIG_FDT_FIXUP_NOR_FLASH_SIZE
-/*
- * Provide a weak default function to return the flash bank size.
- * There might be multiple non-identical flash chips connected to one
- * chip-select, so we need to pass an index as well.
- */
-u32 __flash_get_bank_size(int cs, int idx)
-{
-	extern flash_info_t flash_info[];
-
-	/*
-	 * As default, a simple 1:1 mapping is provided. Boards with
-	 * a different mapping need to supply a board specific mapping
-	 * routine.
-	 */
-	return flash_info[cs].size;
-}
-u32 flash_get_bank_size(int cs, int idx)
-	__attribute__((weak, alias("__flash_get_bank_size")));
-
-/*
- * This function can be used to update the size in the "reg" property
- * of all NOR FLASH device nodes. This is necessary for boards with
- * non-fixed NOR FLASH sizes.
- */
-int fdt_fixup_nor_flash_size(void *blob)
-{
-	char compat[][16] = { "cfi-flash", "jedec-flash" };
-	int off;
-	int len;
-	struct fdt_property *prop;
-	u32 *reg, *reg2;
-	int i;
-
-	for (i = 0; i < 2; i++) {
-		off = fdt_node_offset_by_compatible(blob, -1, compat[i]);
-		while (off != -FDT_ERR_NOTFOUND) {
-			int idx;
-
-			/*
-			 * Found one compatible node, so fixup the size
-			 * int its reg properties
-			 */
-			prop = fdt_get_property_w(blob, off, "reg", &len);
-			if (prop) {
-				int tuple_size = 3 * sizeof(reg);
-
-				/*
-				 * There might be multiple reg-tuples,
-				 * so loop through them all
-				 */
-				reg = reg2 = (u32 *)&prop->data[0];
-				for (idx = 0; idx < (len / tuple_size); idx++) {
-					/*
-					 * Update size in reg property
-					 */
-					reg[2] = flash_get_bank_size(reg[0],
-								     idx);
-
-					/*
-					 * Point to next reg tuple
-					 */
-					reg += 3;
-				}
-
-				fdt_setprop(blob, off, "reg", reg2, len);
-			}
-
-			/* Move to next compatible node */
-			off = fdt_node_offset_by_compatible(blob, off,
-							    compat[i]);
-		}
-	}
-
-	return 0;
-}
-#endif
-
 int fdt_increase_size(void *fdt, int add_len)
 {
 	int newlen;