diff options
Diffstat (limited to 'drivers/nand')
| -rw-r--r-- | drivers/nand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/nand/atmel_nand.c | 4 | ||||
| -rw-r--r-- | drivers/nand/nand_imx.c | 6 | ||||
| -rw-r--r-- | drivers/nand/nand_s3c2410.c | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/nand/Kconfig b/drivers/nand/Kconfig index 72b2be049a..031b94d4e5 100644 --- a/drivers/nand/Kconfig +++ b/drivers/nand/Kconfig @@ -15,7 +15,7 @@ config NAND_IMX config NAND_IMX_BOOT bool - prompt "Support Starting U-Boot from NAND" + prompt "Support Starting barebox from NAND" depends on NAND_IMX || NAND_IMX_V2 config NAND_OMAP_GPMC diff --git a/drivers/nand/atmel_nand.c b/drivers/nand/atmel_nand.c index e8f85fc621..c3669e5a31 100644 --- a/drivers/nand/atmel_nand.c +++ b/drivers/nand/atmel_nand.c @@ -11,8 +11,8 @@ * Add Hardware ECC support for AT91SAM9260 / AT91SAM9263 * Richard Genoud (richard.genoud@gmail.com), Adeneo Copyright (C) 2007 * - * Derived from Das U-Boot source code - * (u-boot-1.1.5/board/atmel/at91sam9263ek/nand.c) + * Derived from Das barebox source code + * (barebox-1.1.5/board/atmel/at91sam9263ek/nand.c) * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas * * diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index 5c02ee0515..5fe288f023 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -1148,11 +1148,11 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_nand_boot_test_help[] = "Usage: nand_boot_test <dest> <size>\n"; -U_BOOT_CMD_START(nand_boot_test) +BAREBOX_CMD_START(nand_boot_test) .cmd = do_nand_boot_test, .usage = "list a file or directory", - U_BOOT_CMD_HELP(cmd_nand_boot_test_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nand_boot_test_help) +BAREBOX_CMD_END #endif #endif /* CONFIG_NAND_IMX_BOOT */ diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c index b1fe377bef..2f98c76221 100644 --- a/drivers/nand/nand_s3c2410.c +++ b/drivers/nand/nand_s3c2410.c @@ -439,7 +439,7 @@ static void __nand_boot_init nfc_addr(unsigned long host, uint32_t offs) * @param[in] page Start page to read from * @param[in] pagesize Size of each page in the NAND * - * This function must be located in the first 4kiB of the U-Boot-v2 image + * This function must be located in the first 4kiB of the barebox image * (guess why). When this routine is running the SDRAM is up and running * and it runs from the correct address (physical=linked address). * TODO Could we access the platform data from the boardfile? @@ -504,11 +504,11 @@ static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_nand_boot_test_help[] = "Usage: nand_boot_test <dest> <size> <pagesize>\n"; -U_BOOT_CMD_START(nand_boot_test) +BAREBOX_CMD_START(nand_boot_test) .cmd = do_nand_boot_test, .usage = "load an image from NAND", - U_BOOT_CMD_HELP(cmd_nand_boot_test_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nand_boot_test_help) +BAREBOX_CMD_END #endif #endif /* CONFIG_S3C24XX_NAND_BOOT */ |