Your ROOT_URL in app.ini is https://src.whiteboxsystems.nl/ but you are visiting http://src.whiteboxsystems.nl/Whitebox/u-boot/commit/f81c3d7232622a2b8c6832d3378dfa775d0e40c0 You should set ROOT_URL correctly, otherwise the web may not work correctly.

Merge branch 'master' of /home/wd/git/u-boot/custodians

master
Wolfgang Denk 16 years ago
commit f81c3d7232
  1. 4
      drivers/mtd/nand/nand_util.c
  2. 2
      nand_spl/nand_boot_fsl_elbc.c

@ -508,6 +508,8 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
size_t block_offset = offset & (nand->erasesize - 1);
size_t write_size;
WATCHDOG_RESET ();
if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) {
printf ("Skip bad block 0x%08llx\n",
offset & ~(nand->erasesize - 1));
@ -578,6 +580,8 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
size_t block_offset = offset & (nand->erasesize - 1);
size_t read_length;
WATCHDOG_RESET ();
if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) {
printf ("Skipping bad block 0x%08llx\n",
offset & ~(nand->erasesize - 1));

@ -120,7 +120,7 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
pos += page_size;
offs += page_size;
} while (offs & (block_size - 1));
} while ((offs & (block_size - 1)) && (pos < uboot_size));
}
}

Loading…
Cancel
Save