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 --- arch/arm/mach-imx/clko.c | 6 +++--- arch/arm/mach-imx/include/mach/barebox.lds.h | 22 ++++++++++++++++++++++ arch/arm/mach-imx/include/mach/u-boot.lds.h | 22 ---------------------- arch/arm/mach-imx/speed.c | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 arch/arm/mach-imx/include/mach/barebox.lds.h delete mode 100644 arch/arm/mach-imx/include/mach/u-boot.lds.h (limited to 'arch/arm/mach-imx') diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c index 6a8072213c..b6efe8780a 100644 --- a/arch/arm/mach-imx/clko.c +++ b/arch/arm/mach-imx/clko.c @@ -46,9 +46,9 @@ static __maybe_unused char cmd_clko_help[] = " -s Clock select. See Ref. Manual for valid sources. Use -1\n" " for disabling clock output\n"; -U_BOOT_CMD_START(clko) +BAREBOX_CMD_START(clko) .cmd = do_clko, .usage = "Adjust CLKO setting", - U_BOOT_CMD_HELP(cmd_clko_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_clko_help) +BAREBOX_CMD_END diff --git a/arch/arm/mach-imx/include/mach/barebox.lds.h b/arch/arm/mach-imx/include/mach/barebox.lds.h new file mode 100644 index 0000000000..8e1eccda5b --- /dev/null +++ b/arch/arm/mach-imx/include/mach/barebox.lds.h @@ -0,0 +1,22 @@ + +#ifdef CONFIG_ARCH_IMX_INTERNAL_BOOT + +#define PRE_IMAGE \ + .pre_image : { \ + KEEP(*(.flash_header_start*)) \ + . = 0x100; \ + KEEP(*(.flash_header_0x100*)) \ + KEEP(*(.dcd_entry_0x100*)) \ + KEEP(*(.image_len_0x100*)) \ + . = 0x400; \ + KEEP(*(.flash_header_0x400*)) \ + KEEP(*(.dcd_entry_0x400*)) \ + KEEP(*(.image_len_0x400*)) \ + . = 0x1000; \ + KEEP(*(.flash_header_0x1000*)) \ + KEEP(*(.dcd_entry_0x1000*)) \ + KEEP(*(.image_len_0x1000*)) \ + . = 0x2000; \ + } +#endif + diff --git a/arch/arm/mach-imx/include/mach/u-boot.lds.h b/arch/arm/mach-imx/include/mach/u-boot.lds.h deleted file mode 100644 index 8e1eccda5b..0000000000 --- a/arch/arm/mach-imx/include/mach/u-boot.lds.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifdef CONFIG_ARCH_IMX_INTERNAL_BOOT - -#define PRE_IMAGE \ - .pre_image : { \ - KEEP(*(.flash_header_start*)) \ - . = 0x100; \ - KEEP(*(.flash_header_0x100*)) \ - KEEP(*(.dcd_entry_0x100*)) \ - KEEP(*(.image_len_0x100*)) \ - . = 0x400; \ - KEEP(*(.flash_header_0x400*)) \ - KEEP(*(.dcd_entry_0x400*)) \ - KEEP(*(.image_len_0x400*)) \ - . = 0x1000; \ - KEEP(*(.flash_header_0x1000*)) \ - KEEP(*(.dcd_entry_0x1000*)) \ - KEEP(*(.image_len_0x1000*)) \ - . = 0x2000; \ - } -#endif - diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c index e9b5ca01fd..76ab6b9bed 100644 --- a/arch/arm/mach-imx/speed.c +++ b/arch/arm/mach-imx/speed.c @@ -76,8 +76,8 @@ static int do_clocks (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(dump_clocks) +BAREBOX_CMD_START(dump_clocks) .cmd = do_clocks, .usage = "show clock frequencies", -U_BOOT_CMD_END +BAREBOX_CMD_END -- cgit v1.2.3