diff options
Diffstat (limited to 'board/ipe337')
| -rw-r--r-- | board/ipe337/Makefile | 2 | ||||
| -rw-r--r-- | board/ipe337/barebox.lds.S (renamed from board/ipe337/u-boot.lds.S) | 18 | ||||
| -rw-r--r-- | board/ipe337/cmd_alternate.c | 6 | ||||
| -rw-r--r-- | board/ipe337/env/bin/init | 2 | ||||
| -rw-r--r-- | board/ipe337/env/bin/update_bareboxenv (renamed from board/ipe337/env/bin/update_ubootenv) | 2 | ||||
| -rw-r--r-- | board/ipe337/env/config | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/board/ipe337/Makefile b/board/ipe337/Makefile index e161238123..172dfb688c 100644 --- a/board/ipe337/Makefile +++ b/board/ipe337/Makefile @@ -1,4 +1,4 @@ obj-y += ipe337.o obj-y += cmd_alternate.o -extra-y += u-boot.lds +extra-y += barebox.lds diff --git a/board/ipe337/u-boot.lds.S b/board/ipe337/barebox.lds.S index 09240edbe3..4299b8208b 100644 --- a/board/ipe337/u-boot.lds.S +++ b/board/ipe337/barebox.lds.S @@ -1,5 +1,5 @@ /* - * U-boot - u-boot.lds.S + * barebox - barebox.lds.S * * Copyright (c) 2005-2007 Analog Device Inc. * @@ -26,7 +26,7 @@ */ #include <config.h> -#include <asm-generic/u-boot.lds.h> +#include <asm-generic/barebox.lds.h> OUTPUT_ARCH("bfin") SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); @@ -67,16 +67,16 @@ SECTIONS .got : { *(.got) } . = .; - ___u_boot_cmd_start = .; - .u_boot_cmd : { U_BOOT_CMDS } - ___u_boot_cmd_end = .; + ___barebox_cmd_start = .; + .barebox_cmd : { BAREBOX_CMDS } + ___barebox_cmd_end = .; - ___u_boot_initcalls_start = .; - .u_boot_initcalls : { INITCALLS } - ___u_boot_initcalls_end = .; + ___barebox_initcalls_start = .; + .barebox_initcalls : { INITCALLS } + ___barebox_initcalls_end = .; ___usymtab_start = .; - __usymtab : { U_BOOT_SYMS } + __usymtab : { BAREBOX_SYMS } ___usymtab_end = .; . = ALIGN(4); diff --git a/board/ipe337/cmd_alternate.c b/board/ipe337/cmd_alternate.c index 78ed77c2dd..538f0bfd67 100644 --- a/board/ipe337/cmd_alternate.c +++ b/board/ipe337/cmd_alternate.c @@ -48,9 +48,9 @@ static const __maybe_unused char cmd_alternate_help[] = "Usage: alternate <file>" "\n"; -U_BOOT_CMD_START(alternate) +BAREBOX_CMD_START(alternate) .cmd = do_alternate, .usage = "count zero bits in a file", - U_BOOT_CMD_HELP(cmd_alternate_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_alternate_help) +BAREBOX_CMD_END diff --git a/board/ipe337/env/bin/init b/board/ipe337/env/bin/init index 9ca41d6152..e864dc5a42 100644 --- a/board/ipe337/env/bin/init +++ b/board/ipe337/env/bin/init @@ -15,7 +15,7 @@ if [ $? != 0 ]; then echo "Type update_system [<imagename>] to update rootfs into flash." echo "Type update_application [<imagename>] to update applications into flash." echo "Type update_persistent [<imagename>] to update persistent into flash." - echo "Type update_ubootenv [<imagename>] to update ubootenv into flash (use with care!)." + echo "Type update_bareboxenv [<imagename>] to update bareboxenv into flash (use with care!)." echo "Type reset_ageing to initialize the ageing partittion (use with care!)." echo exit diff --git a/board/ipe337/env/bin/update_ubootenv b/board/ipe337/env/bin/update_bareboxenv index 301072ff5e..b0a32c626b 100644 --- a/board/ipe337/env/bin/update_ubootenv +++ b/board/ipe337/env/bin/update_bareboxenv @@ -3,6 +3,6 @@ . /env/config image=$envimage -part=/dev/nor0.ubootenv +part=/dev/nor0.bareboxenv . /env/bin/_update $1 diff --git a/board/ipe337/env/config b/board/ipe337/env/config index 39a47ff00b..7c5ee76e30 100644 --- a/board/ipe337/env/config +++ b/board/ipe337/env/config @@ -4,7 +4,7 @@ kernel=net root=net -# use 'dhcp' todo dhcp in uboot and in kernel +# use 'dhcp' todo dhcp in barebox and in kernel #ip=dhcp eth0.ipaddr=192.168.23.164 @@ -23,5 +23,5 @@ autoboot_timeout=1 nfsroot="/ptx/work/octopus/wsa/svn/OSELAS.BSP-Pipetronix-ipe337-trunk/root" bootargs="console=ttyBF0,115200" -mtdparts="128k(uboot)ro,128k(ubootenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)" +mtdparts="128k(barebox)ro,128k(bareboxenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)" ageing=/dev/nor0.ageing |