diff options
Diffstat (limited to 'board/freescale-mx35-3-stack')
| -rw-r--r-- | board/freescale-mx35-3-stack/3stack.c | 2 | ||||
| -rw-r--r-- | board/freescale-mx35-3-stack/env/config | 6 | ||||
| -rw-r--r-- | board/freescale-mx35-3-stack/flash_header.c | 2 | ||||
| -rw-r--r-- | board/freescale-mx35-3-stack/lowlevel_init.S | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c index efaa6d4a38..77dcf7a0c9 100644 --- a/board/freescale-mx35-3-stack/3stack.c +++ b/board/freescale-mx35-3-stack/3stack.c @@ -19,7 +19,7 @@ * * Derived from: * - * * mx35_3stack.c - board file for u-boot-v1 + * * mx35_3stack.c - board file for barebox-v1 * Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de> * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. * diff --git a/board/freescale-mx35-3-stack/env/config b/board/freescale-mx35-3-stack/env/config index d6afdfbeba..9fcb3dc7b9 100644 --- a/board/freescale-mx35-3-stack/env/config +++ b/board/freescale-mx35-3-stack/env/config @@ -12,13 +12,13 @@ autoboot_timeout=3 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root" bootargs="console=ttymxc0,115200" -nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nor="/dev/mtdblock3" -nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" rootpart_nand="/dev/mtdblock7" -# 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/freescale-mx35-3-stack/flash_header.c b/board/freescale-mx35-3-stack/flash_header.c index a2496a52d0..968a948a8d 100644 --- a/board/freescale-mx35-3-stack/flash_header.c +++ b/board/freescale-mx35-3-stack/flash_header.c @@ -45,5 +45,5 @@ struct imx_flash_header __flash_header_0x400 flash_header = { .dcd_block_len = sizeof (dcd_entry), }; -unsigned long __image_len_0x400 u_boot_len = 0x40000; +unsigned long __image_len_0x400 barebox_len = 0x40000; diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/board/freescale-mx35-3-stack/lowlevel_init.S index a00d2af056..4e0a10293d 100644 --- a/board/freescale-mx35-3-stack/lowlevel_init.S +++ b/board/freescale-mx35-3-stack/lowlevel_init.S @@ -175,7 +175,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 |