diff options
Diffstat (limited to 'arch/ppc/lib')
| -rw-r--r-- | arch/ppc/lib/board.c | 2 | ||||
| -rw-r--r-- | arch/ppc/lib/board_data.c | 2 | ||||
| -rw-r--r-- | arch/ppc/lib/ppclinux.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/lib/board.c b/arch/ppc/lib/board.c index bd701a8f1f..7f8118e16f 100644 --- a/arch/ppc/lib/board.c +++ b/arch/ppc/lib/board.c @@ -75,6 +75,6 @@ void board_init_r (ulong end_of_ram) /* Initialization complete - start the monitor */ - start_uboot(); + start_barebox(); } diff --git a/arch/ppc/lib/board_data.c b/arch/ppc/lib/board_data.c index 28644de10a..b28830f792 100644 --- a/arch/ppc/lib/board_data.c +++ b/arch/ppc/lib/board_data.c @@ -34,7 +34,7 @@ int init_board_data(bd_t *bd) #ifdef CFG_EXTBDINFO strncpy ((char *)bd->bi_s_version, "1.2", sizeof (bd->bi_s_version)); - strncpy ((char *)bd->bi_r_version, U_BOOT_VERSION, sizeof (bd->bi_r_version)); + strncpy ((char *)bd->bi_r_version, BAREBOX_VERSION, sizeof (bd->bi_r_version)); bd->bi_procfreq = gd->cpu_clk; /* Processor Speed, In Hz */ bd->bi_plb_busfreq = gd->bus_clk; diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index 6fe0141fb7..35a9d31a8e 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -81,7 +81,7 @@ static int do_bootm_linux(struct image_data *idata) ((unsigned long)initrd_data + ((initrd_len + 3) & ~3)); } else if (len1) { /* We could check here if this is a multifile image - * with only a kernel and an oftree. Original U-Boot + * with only a kernel and an oftree. Original barebox * did not do this, so leave it out for now. */ initrd_data = (void *)((unsigned long)data + ((os_len + 3) & ~3)); @@ -97,7 +97,7 @@ static int do_bootm_linux(struct image_data *idata) #ifdef CONFIG_OF_FLAT_TREE if (idata->oftree) { - /* The oftree can be given either as an uboot image or as a + /* The oftree can be given either as an barebox image or as a * binary blob. First try to read it as an image. */ oftree_handle = map_image(idata->oftree, 1); |