1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-08 20:22:10 +02:00

microblaze: board: Use bi_flashstart instead of CONFIG_SYS_FLASH_BASE

Prepare for device-tree driven configuration.

Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephan Linz <linz@li-pro.net>
This commit is contained in:
Michal Simek
2012-07-10 10:21:25 +02:00
parent 2380b8f529
commit c60a57912a

View File

@@ -136,9 +136,8 @@ void board_init_f(ulong not_used)
#if defined(CONFIG_CMD_FLASH) #if defined(CONFIG_CMD_FLASH)
puts ("Flash: "); puts ("Flash: ");
bd->bi_flashstart = CONFIG_SYS_FLASH_BASE; bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
if (0 < (flash_size = flash_init ())) { flash_size = flash_init();
bd->bi_flashsize = flash_size; if (bd->bi_flashstart && flash_size > 0) {
bd->bi_flashoffset = CONFIG_SYS_FLASH_BASE + flash_size;
# ifdef CONFIG_SYS_FLASH_CHECKSUM # ifdef CONFIG_SYS_FLASH_CHECKSUM
print_size (flash_size, ""); print_size (flash_size, "");
/* /*
@@ -149,13 +148,16 @@ void board_init_f(ulong not_used)
s = getenv ("flashchecksum"); s = getenv ("flashchecksum");
if (s && (*s == 'y')) { if (s && (*s == 'y')) {
printf (" CRC: %08X", printf (" CRC: %08X",
crc32 (0, (const unsigned char *) CONFIG_SYS_FLASH_BASE, flash_size) crc32(0, (const u8 *)bd->bi_flashstart,
flash_size)
); );
} }
putc ('\n'); putc ('\n');
# else /* !CONFIG_SYS_FLASH_CHECKSUM */ # else /* !CONFIG_SYS_FLASH_CHECKSUM */
print_size (flash_size, "\n"); print_size (flash_size, "\n");
# endif /* CONFIG_SYS_FLASH_CHECKSUM */ # endif /* CONFIG_SYS_FLASH_CHECKSUM */
bd->bi_flashsize = flash_size;
bd->bi_flashoffset = bd->bi_flashstart + flash_size;
} else { } else {
puts ("Flash init FAILED"); puts ("Flash init FAILED");
bd->bi_flashstart = 0; bd->bi_flashstart = 0;