diff options
Diffstat (limited to 'board/freescale-mx25-3-stack')
| -rw-r--r-- | board/freescale-mx25-3-stack/3stack.c | 4 | ||||
| -rw-r--r-- | board/freescale-mx25-3-stack/env/config | 6 | ||||
| -rw-r--r-- | board/freescale-mx25-3-stack/lowlevel_init.S | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c index 3ee87e355b..3a528fa365 100644 --- a/board/freescale-mx25-3-stack/3stack.c +++ b/board/freescale-mx25-3-stack/3stack.c @@ -80,7 +80,7 @@ struct mx25_nand_flash_header __flash_header mx25_3ds_header = { extern unsigned long __bss_start; -unsigned long __image_len u_boot_len = 0x40000; +unsigned long __image_len barebox_len = 0x40000; static struct fec_platform_data fec_info = { .xcv_type = RMII, @@ -208,7 +208,7 @@ static int imx25_devices_init(void) #endif /* FEC does only work when the CPLD is initialized. - * Currently we do not do this in U-Boot, so it + * Currently we do not do this in barebox, so it * does only work when Linux has been started after * the last powercycle. */ diff --git a/board/freescale-mx25-3-stack/env/config b/board/freescale-mx25-3-stack/env/config index 149619a5ac..a5e492e339 100644 --- a/board/freescale-mx25-3-stack/env/config +++ b/board/freescale-mx25-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),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),108416k(root),-(kernel1)" +nand_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),108416k(root),-(kernel1)" 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-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S index d622bd3628..bf03390c15 100644 --- a/board/freescale-mx25-3-stack/lowlevel_init.S +++ b/board/freescale-mx25-3-stack/lowlevel_init.S @@ -129,7 +129,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 */ ldr r1, =IMX_NFC_BASE - TEXT_BASE sub r10, r10, r1 /* adjust return address from NFC SRAM */ |