diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-10-10 21:59:42 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-16 09:42:51 -0400 |
| commit | c68c03f52badc90951dbf8a054c0e500e04bf365 (patch) | |
| tree | 30fee12332240549a47bdb2cf2ee27a1a7d64b02 /common | |
| parent | 95688de311e238ccfba21c50b1b67ceffbdc7fc5 (diff) | |
| download | u-boot-c68c03f52badc90951dbf8a054c0e500e04bf365.tar.gz | |
Drop CONFIG_HAS_DATAFLASH
Last user of this option went away in commit:
fdc7718999 ("board: usb_a9263: Update to support DT and DM")
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 15 | ||||
| -rw-r--r-- | common/image.c | 62 |
2 files changed, 0 insertions, 77 deletions
diff --git a/common/board_r.c b/common/board_r.c index 94697e7bc1..a3b9bfb8ee 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -18,9 +18,6 @@ #endif #include <command.h> #include <console.h> -#ifdef CONFIG_HAS_DATAFLASH -#include <dataflash.h> -#endif #include <dm.h> #include <environment.h> #include <fdtdec.h> @@ -447,15 +444,6 @@ static int initr_mmc(void) } #endif -#ifdef CONFIG_HAS_DATAFLASH -static int initr_dataflash(void) -{ - AT91F_DataflashInit(); - dataflash_print_info(); - return 0; -} -#endif - /* * Tell if it's OK to load the environment early in boot. * @@ -803,9 +791,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_MMC initr_mmc, #endif -#ifdef CONFIG_HAS_DATAFLASH - initr_dataflash, -#endif initr_env, #ifdef CONFIG_SYS_BOOTPARAMS_LEN initr_malloc_bootparams, diff --git a/common/image.c b/common/image.c index 332b5f2843..01f48bf772 100644 --- a/common/image.c +++ b/common/image.c @@ -15,10 +15,6 @@ #include <status_led.h> #endif -#ifdef CONFIG_HAS_DATAFLASH -#include <dataflash.h> -#endif - #ifdef CONFIG_LOGBUFFER #include <logbuff.h> #endif @@ -903,64 +899,6 @@ ulong genimg_get_image(ulong img_addr) { ulong ram_addr = img_addr; -#ifdef CONFIG_HAS_DATAFLASH - ulong h_size, d_size; - - if (addr_dataflash(img_addr)) { - void *buf; - - /* ger RAM address */ - ram_addr = CONFIG_SYS_LOAD_ADDR; - - /* get header size */ - h_size = image_get_header_size(); -#if IMAGE_ENABLE_FIT - if (sizeof(struct fdt_header) > h_size) - h_size = sizeof(struct fdt_header); -#endif - - /* read in header */ - debug(" Reading image header from dataflash address " - "%08lx to RAM address %08lx\n", img_addr, ram_addr); - - buf = map_sysmem(ram_addr, 0); - read_dataflash(img_addr, h_size, buf); - - /* get data size */ - switch (genimg_get_format(buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) - case IMAGE_FORMAT_LEGACY: - d_size = image_get_data_size(buf); - debug(" Legacy format image found at 0x%08lx, " - "size 0x%08lx\n", - ram_addr, d_size); - break; -#endif -#if IMAGE_ENABLE_FIT - case IMAGE_FORMAT_FIT: - d_size = fit_get_size(buf) - h_size; - debug(" FIT/FDT format image found at 0x%08lx, " - "size 0x%08lx\n", - ram_addr, d_size); - break; -#endif - default: - printf(" No valid image found at 0x%08lx\n", - img_addr); - return ram_addr; - } - - /* read in image data */ - debug(" Reading image remaining data from dataflash address " - "%08lx to RAM address %08lx\n", img_addr + h_size, - ram_addr + h_size); - - read_dataflash(img_addr + h_size, d_size, - (char *)(buf + h_size)); - - } -#endif /* CONFIG_HAS_DATAFLASH */ - return ram_addr; } |