For CONFIG_OMAP2420H4 there is a call to flash_probe(), which is defined in board/omap2420h4/flash.c. flash.c is not part of the Makefile, so compilation for omap2420h4 fails with a linker error. omap2420h4 seems to use the common cfi driver anyway, so it's probably best to remove board/omap2420h4/flash.c. This one simply removes the call to flash_probe to be able to compile omap2420h4 again. Signed-off-by: Sascha Hauer --- --- common/env_flash.c | 13 ------------- 1 file changed, 13 deletions(-) Index: u-boot-git/common/env_flash.c =================================================================== --- u-boot-git.orig/common/env_flash.c +++ u-boot-git/common/env_flash.c @@ -107,13 +107,6 @@ int env_init(void) ulong addr1 = (ulong)&(flash_addr->data); ulong addr2 = (ulong)&(flash_addr_new->data); -#ifdef CONFIG_OMAP2420H4 - int flash_probe(void); - - if(flash_probe() == 0) - goto bad_flash; -#endif - crc1_ok = (crc32(0, flash_addr->data, ENV_SIZE) == flash_addr->crc); crc2_ok = (crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc); @@ -259,12 +252,6 @@ Done: int env_init(void) { -#ifdef CONFIG_OMAP2420H4 - int flash_probe(void); - - if(flash_probe() == 0) - goto bad_flash; -#endif if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) { gd->env_addr = (ulong)&(env_ptr->data); gd->env_valid = 1; -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9