From a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 15 Dec 2009 09:11:09 +0100 Subject: rename U-Boot-v2 project to barebox This has been done with the following script: find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \ -e 's/u2boot/barebox/g' \ -e 's/U2Boot/barebox/g' \ -e 's/U-boot V2/barebox/g' \ -e 's/u-boot v2/barebox/g' \ -e 's/U-Boot V2/barebox/g' \ -e 's/U-Boot-v2/barebox/g' \ -e 's/U_BOOT/BAREBOX/g' \ -e 's/UBOOT/BAREBOX/g' \ -e 's/uboot/barebox/g' \ -e 's/u-boot/barebox/g' \ -e 's/u_boot/barebox/g' \ -e 's/U-Boot/barebox/g' \ -e 's/U-boot/barebox/g' \ -e 's/U-BOOT/barebox/g' find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \ xargs -0 -r rename 's/u[-_]?boot/barebox/' It needs some manual fixup following in the next patch Signed-off-by: Sascha Hauer --- board/pcm037/env/config | 6 +++--- board/pcm037/lowlevel_init.S | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'board/pcm037') diff --git a/board/pcm037/env/config b/board/pcm037/env/config index 008925540d..fb1f5afddb 100644 --- a/board/pcm037/env/config +++ b/board/pcm037/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/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S index a32d375dde..8988db23a2 100644 --- a/board/pcm037/lowlevel_init.S +++ b/board/pcm037/lowlevel_init.S @@ -156,7 +156,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 */ -- cgit v1.2.3