From 4101aeac54ded9591c52ac03a1b765afc394d6c0 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Mon, 11 Jul 2022 21:08:40 +0100 Subject: x1000: simplify NAND command macros There is actually no need to parameterize most commands with row or column cycles, usually the opcode and row/column address width are linked. When this is not the case we can use raw SFC commands or define new macros. Change-Id: I22459d732dc01012e6a8ae026c4fb85495d372b4 --- bootloader/x1000/utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bootloader/x1000') diff --git a/bootloader/x1000/utils.c b/bootloader/x1000/utils.c index 5bad511b23..a2fd500f5d 100644 --- a/bootloader/x1000/utils.c +++ b/bootloader/x1000/utils.c @@ -375,22 +375,22 @@ static void probe_flash(int log_fd) mdelay(10); /* Try various read ID commands (cf. Linux's SPI NAND identify routine) */ - sfc_exec(NANDCMD_READID(0, 0), 0, buffer, readid_len|SFC_READ); + sfc_exec(NANDCMD_READID_OPCODE, 0, buffer, readid_len|SFC_READ); fdprintf(log_fd, "readID opcode = %02x %02x %02x %02x\n", buffer[0], buffer[1], buffer[2], buffer[3]); - sfc_exec(NANDCMD_READID(1, 0), 0, buffer, readid_len|SFC_READ); + sfc_exec(NANDCMD_READID_ADDR, 0, buffer, readid_len|SFC_READ); fdprintf(log_fd, "readID address = %02x %02x %02x %02x\n", buffer[0], buffer[1], buffer[2], buffer[3]); - sfc_exec(NANDCMD_READID(0, 8), 0, buffer, readid_len|SFC_READ); + sfc_exec(NANDCMD_READID_DUMMY, 0, buffer, readid_len|SFC_READ); fdprintf(log_fd, "readID dummy = %02x %02x %02x %02x\n", buffer[0], buffer[1], buffer[2], buffer[3]); /* Try reading Ingenic SFC boot block */ - sfc_exec(NANDCMD_PAGE_READ(3), 0, NULL, 0); + sfc_exec(NANDCMD_PAGE_READ, 0, NULL, 0); mdelay(500); - sfc_exec(NANDCMD_READ_CACHE_SLOW(2), 0, buffer, 16|SFC_READ); + sfc_exec(NANDCMD_READ_CACHE_SLOW, 0, buffer, 16|SFC_READ); fdprintf(log_fd, "sfc params0 = %02x %02x %02x %02x\n", buffer[ 0], buffer[ 1], buffer[ 2], buffer[ 3]); -- cgit v1.2.3