diff options
Diffstat (limited to 'board/pcm043')
| -rw-r--r-- | board/pcm043/env/config | 6 | ||||
| -rw-r--r-- | board/pcm043/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/pcm043/pcm043.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/board/pcm043/env/config b/board/pcm043/env/config index 3558c3a119..c1ab234e63 100644 --- a/board/pcm043/env/config +++ b/board/pcm043/env/config @@ -12,12 +12,12 @@ autoboot_timeout=3 nfsroot="/path/to/nfs_root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)" rootpart_nand="/dev/mtdblock3" -# use 'dhcp' to do dhcp in uboot and in kernel +# use 'dhcp' to do dhcp in barebox and in kernel ip=dhcp # or set your networking parameters here diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S index 56ebae4335..9df064cb49 100644 --- a/board/pcm043/lowlevel_init.S +++ b/board/pcm043/lowlevel_init.S @@ -219,7 +219,7 @@ copy_loop: ldr pc, =1f /* Jump to SDRAM */ 1: - bl nand_boot /* Load U-Boot from NAND Flash */ + bl nand_boot /* Load barebox from NAND Flash */ /* rebase the return address */ ldr r1, =IMX_NFC_BASE - TEXT_BASE diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c index cbd910a214..d93ef80c95 100644 --- a/board/pcm043/pcm043.c +++ b/board/pcm043/pcm043.c @@ -383,11 +383,11 @@ static const __maybe_unused char cmd_cpufreq_help[] = "\n" "Set CPU frequency to <freq> MHz\n"; -U_BOOT_CMD_START(cpufreq) +BAREBOX_CMD_START(cpufreq) .cmd = do_cpufreq, .usage = "adjust CPU frequency", - U_BOOT_CMD_HELP(cmd_cpufreq_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cpufreq_help) +BAREBOX_CMD_END #ifdef CONFIG_NAND_IMX_BOOT void __bare_init nand_boot(void) |