[U-Boot] [PATCH] tools/kwbimage.c: fix parser error handling
From: Andreas Bießmann
The two error checks for image_boot_mode_id and image_nand_ecc_mode_id where
wrong and would never fail, fix that!
This was detected by Apple's clang compiler:
---8<---
HOSTCC tools/kwbimage.o
tools/kwbimage.c:553:20: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
if (el->bootfrom < 0) {
^ ~
tools/kwbimage.c:571:23: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
if (el->nandeccmode < 0) {
~~~ ^ ~
2 warnings generated.
--->8---
Signed-off-by: Andreas Bießmann
---
tools/kwbimage.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 42870ed..8fd70ef 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -548,13 +548,14 @@ static int image_create_config_parse_oneline(char *line,
el->version = atoi(value);
} else if (!strcmp(keyword, "BOOT_FROM")) {
char *value = strtok_r(NULL, deliminiters, &saveptr);
- el->type = IMAGE_CFG_BOOT_FROM;
- el->bootfrom = image_boot_mode_id(value);
- if (el->bootfrom < 0) {
+ int ret = image_boot_mode_id(value);
+ if (ret < 0) {
fprintf(stderr,
"Invalid boot media '%s'\n", value);
return -1;
}
+ el->type = IMAGE_CFG_BOOT_FROM;
+ el->bootfrom = ret;
} else if (!strcmp(keyword, "NAND_BLKSZ")) {
char *value = strtok_r(NULL, deliminiters, &saveptr);
el->type = IMAGE_CFG_NAND_BLKSZ;
@@ -566,13 +567,14 @@ static int image_create_config_parse_oneline(char *line,
strtoul(value, NULL, 16);
} else if (!strcmp(keyword, "NAND_ECC_MODE")) {
char *value = strtok_r(NULL, deliminiters, &saveptr);
- el->type = IMAGE_CFG_NAND_ECC_MODE;
- el->nandeccmode = image_nand_ecc_mode_id(value);
- if (el->nandeccmode < 0) {
+ int ret = image_nand_ecc_mode_id(value);
+ if (ret < 0) {
fprintf(stderr,
"Invalid NAND ECC mode '%s'\n", value);
return -1;
}
+ el->type = IMAGE_CFG_NAND_ECC_MODE;
+ el->nandeccmode = ret;
} else if (!strcmp(keyword, "NAND_PAGE_SIZE")) {
char *value = strtok_r(NULL, deliminiters, &saveptr);
el->type = IMAGE_CFG_NAND_PAGESZ;
--
1.9.3 (Apple Git-50)
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2] Fix u-boot compile on darwin host
From: Andreas Bießmann This series make u-boot compile on OS X again, tested with Yosemite and Lion. Andreas Bießmann (2): tools/socfpgaimage.c: fix build on darwin tools/kwbimage.c: fix build on darwin tools/kwbimage.c | 6 -- tools/socfpgaimage.c | 16 2 files changed, 12 insertions(+), 10 deletions(-) -- 1.9.3 (Apple Git-50) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] tools/socfpgaimage.c: fix build on darwin
From: Andreas Bießmann
socfpgaimage utilizes htole32 and friends, unfortunately these functions are
not available on darwin. Fix it by using the cpu_to_le32 and friends defined
in compiler.h as other parts in mkimage do.
This patch fixes the following error:
---8<---
HOSTCC tools/socfpgaimage.o
tools/socfpgaimage.c:77:22: warning: implicit declaration of function 'htole32'
is invalid in C99 [-Wimplicit-function-declaration]
header.validation = htole32(VALIDATION_WORD);
^
tools/socfpgaimage.c:80:22: warning: implicit declaration of function 'htole16'
is invalid in C99 [-Wimplicit-function-declaration]
header.length_u32 = htole16(length_bytes/4);
^
tools/socfpgaimage.c:95:6: warning: implicit declaration of function 'le32toh'
is invalid in C99 [-Wimplicit-function-declaration]
if (le32toh(header.validation) != VALIDATION_WORD)
^
tools/socfpgaimage.c:97:6: warning: implicit declaration of function 'le16toh'
is invalid in C99 [-Wimplicit-function-declaration]
if (le16toh(header.checksum) != hdr_checksum(&header))
^
4 warnings generated.
...
HOSTLD tools/dumpimage
Undefined symbols for architecture x86_64:
"_htole16", referenced from:
_socfpgaimage_set_header in socfpgaimage.o
"_htole32", referenced from:
_socfpgaimage_set_header in socfpgaimage.o
"_le16toh", referenced from:
_verify_buffer in socfpgaimage.o
"_le32toh", referenced from:
_verify_buffer in socfpgaimage.o
ld: symbol(s) not found for architecture x86_64
--->8---
Signed-off-by: Andreas Bießmann
---
tools/socfpgaimage.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c
index 396d8a5..917873e 100644
--- a/tools/socfpgaimage.c
+++ b/tools/socfpgaimage.c
@@ -74,12 +74,12 @@ static uint16_t hdr_checksum(struct socfpga_header *header)
static void build_header(uint8_t *buf, uint8_t version, uint8_t flags,
uint16_t length_bytes)
{
- header.validation = htole32(VALIDATION_WORD);
+ header.validation = cpu_to_le32(VALIDATION_WORD);
header.version = version;
header.flags = flags;
- header.length_u32 = htole16(length_bytes/4);
+ header.length_u32 = cpu_to_le16(length_bytes/4);
header.zero = 0;
- header.checksum = htole16(hdr_checksum(&header));
+ header.checksum = cpu_to_le16(hdr_checksum(&header));
memcpy(buf, &header, sizeof(header));
}
@@ -92,12 +92,12 @@ static int verify_header(const uint8_t *buf)
{
memcpy(&header, buf, sizeof(header));
- if (le32toh(header.validation) != VALIDATION_WORD)
+ if (le32_to_cpu(header.validation) != VALIDATION_WORD)
return -1;
- if (le16toh(header.checksum) != hdr_checksum(&header))
+ if (le16_to_cpu(header.checksum) != hdr_checksum(&header))
return -1;
- return le16toh(header.length_u32) * 4;
+ return le16_to_cpu(header.length_u32) * 4;
}
/* Sign the buffer and return the signed buffer size */
@@ -116,7 +116,7 @@ static int sign_buffer(uint8_t *buf,
/* Calculate and apply the CRC */
calc_crc = ~pbl_crc32(0, (char *)buf, len);
- *((uint32_t *)(buf + len)) = htole32(calc_crc);
+ *((uint32_t *)(buf + len)) = cpu_to_le32(calc_crc);
if (!pad_64k)
return len + 4;
@@ -150,7 +150,7 @@ static int verify_buffer(const uint8_t *buf)
calc_crc = ~pbl_crc32(0, (const char *)buf, len);
- buf_crc = le32toh(*((uint32_t *)(buf + len)));
+ buf_crc = le32_to_cpu(*((uint32_t *)(buf + len)));
if (buf_crc != calc_crc) {
fprintf(stderr, "CRC32 does not match (%08x != %08x)\n",
--
1.9.3 (Apple Git-50)
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] tools/kwbimage.c: fix build on darwin
From: Andreas Bießmann
kwbimage uses get_current_dir_name(3) which is a gnu extension and not
available on darwin host. Fix this by converting to portable getcwd(3)
function.
This patch fixes the following error:
---8<---
HOSTCC tools/kwbimage.o
tools/kwbimage.c:399:16: warning: implicit declaration of function
'get_current_dir_name' is invalid in C99 [-Wimplicit-function-declaration]
char *cwd = get_current_dir_name();
^
tools/kwbimage.c:399:10: warning: incompatible integer to pointer conversion
initializing 'char *' with an expression of type 'int' [-Wint-conversion]
char *cwd = get_current_dir_name();
^ ~~
2 warnings generated.
...
Undefined symbols for architecture x86_64:
"_get_current_dir_name", referenced from:
_image_headersz_v1 in kwbimage.o
ld: symbol(s) not found for architecture x86_64
--->8---
Signed-off-by: Andreas Bießmann
Cc: Stefan Roese
---
tools/kwbimage.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index ca4fc78..8fd70ef 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -12,6 +12,7 @@
*/
#include "imagetool.h"
+#include
#include
#include
#include "kwbimage.h"
@@ -396,13 +397,14 @@ static size_t image_headersz_v1(struct image_tool_params
*params,
ret = stat(binarye->binary.file, &s);
if (ret < 0) {
- char *cwd = get_current_dir_name();
+ char cwd[PATH_MAX];
+ memset(cwd, 0, sizeof(cwd));
+ getcwd(cwd, sizeof(cwd));
fprintf(stderr,
"Didn't find the file '%s' in '%s' which is
mandatory to generate the image\n"
"This file generally contains the DDR3 training
code, and should be extracted from an existing bootable\n"
"image for your board. See 'kwbimage -x' to
extract it from an existing image.\n",
binarye->binary.file, cwd);
- free(cwd);
return 0;
}
--
1.9.3 (Apple Git-50)
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] spl: move comment to the right place
From: Andreas Bießmann
Commit ae83d882f5fdf7aa7c5aec09cfafb593153c25d6 moved the fixed size mentioned
in the comment but missed the comment.
Signed-off-by: Andreas Bießmann
---
common/spl/spl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index b16664f..d85bab3 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -23,6 +23,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
#endif
#ifndef CONFIG_SYS_MONITOR_LEN
+/* Unknown U-Boot size, let's assume it will not be more than 200 KB */
#define CONFIG_SYS_MONITOR_LEN (200 * 1024)
#endif
@@ -92,7 +93,6 @@ void spl_parse_image_header(const struct image_header *header)
/* Signature not found - assume u-boot.bin */
debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic);
- /* Let's assume U-Boot will not be more than 200 KB */
spl_image.size = CONFIG_SYS_MONITOR_LEN;
spl_image.entry_point = CONFIG_SYS_UBOOT_START;
spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
--
1.9.3 (Apple Git-50)
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] gitignore: ignore atmel pmecc parameter tool
From: Andreas Bießmann Signed-off-by: Andreas Bießmann --- tools/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/.gitignore b/tools/.gitignore index cefe923..e7f0f8f 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,3 +1,4 @@ +/atmel_pmecc_params /bmp_logo /envcrc /fit_check_sign -- 1.9.3 (Apple Git-50) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/3] arm: at91/configs: add libfdt to configuration
Dear Bo Shen, Bo Shen writes: >From: Nicolas Ferre > >support to boot device tree Linux kernel > >Signed-off-by: Nicolas Ferre >[Add libftd for at91rm9200, at91sam9263, at91sam9rl] >Signed-off-by: Bo Shen > >--- >include/configs/at91rm9200ek.h |2 ++ > include/configs/at91sam9260ek.h |2 ++ > include/configs/at91sam9263ek.h |2 ++ > include/configs/at91sam9rlek.h |2 ++ > 4 files changed, 8 insertions(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/3] arm: at91/configs: add bootz to configuration
Dear Bo Shen, Bo Shen writes: >From: Nicolas Ferre > >Support to boot zImage > >Signed-off-by: Nicolas Ferre >[Add bootz for at91rm9200, at91sam9263, at91sam9rl] >Signed-off-by: Bo Shen > >--- >include/configs/at91rm9200ek.h |1 + > include/configs/at91sam9260ek.h|1 + > include/configs/at91sam9263ek.h|1 + > include/configs/at91sam9m10g45ek.h |1 + > include/configs/at91sam9rlek.h |1 + > include/configs/at91sam9x5ek.h |1 + > 6 files changed, 6 insertions(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,3/3] ARM: at91: change nand flash table
Dear Bo Shen, Bo Shen writes: >Change nand flash partition tablke according to www.at91.com/linux4sam > >more information: >http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory > >Signed-off-by: Bo Shen >Signed-off-by: Bo Shen > >--- >include/configs/at91sam9260ek.h| 18 +- > include/configs/at91sam9261ek.h| 19 +-- > include/configs/at91sam9263ek.h| 17 + > include/configs/at91sam9m10g45ek.h | 16 > include/configs/at91sam9x5ek.h | 11 ++- > 5 files changed, 41 insertions(+), 40 deletions(-) applied with some minor changes in commit message to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: at91sam9x5: Using CPU string directly
Dear Bo Shen, Bo Shen writes: >As the CPU name is not configurable, using CPU string directly > >Signed-off-by: Bo Shen > >--- >arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 14 +++--- > arch/arm/include/asm/arch-at91/at91sam9x5.h |6 -- > 2 files changed, 7 insertions(+), 13 deletions(-) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: sam9x5: fix ethernet pins in MII mode
Dear Bo Shen, Bo Shen writes: >From: Jesse Gilles > >Fix pin setting in MII mode > >Signed-off-by: Jesse Gilles > >--- >arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Fix strict-aliasing warning in dlmalloc
From: Simon Glass
This fixes the following warnings in dlmalloc seen with my gcc 4.6.
dlmalloc.c: In function 'malloc_bin_reloc':
dlmalloc.c:1493: warning: dereferencing pointer 'p' does break strict-aliasing
rules
dlmalloc.c:1493: warning: dereferencing pointer 'p' does break strict-aliasing
rules
dlmalloc.c:1490: note: initialized from here
dlmalloc.c:1493: note: initialized from here
This version is tested on avr32 arch boards.
Signed-off-by: Simon Glass
Signed-off-by: Andreas Bießmann
---
since v1:
* use size_t for array counter instead of int
* increment the pinter for next iteration
common/dlmalloc.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index c645d73..1d7e527 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1487,11 +1487,11 @@ static mbinptr av_[NAV * 2 + 2] = {
#ifdef CONFIG_NEEDS_MANUAL_RELOC
void malloc_bin_reloc (void)
{
- unsigned long *p = (unsigned long *)(&av_[2]);
- int i;
- for (i=2; i<(sizeof(av_)/sizeof(mbinptr)); ++i) {
- *p++ += gd->reloc_off;
- }
+ mbinptr *p = &av_[2];
+ size_t i;
+
+ for (i = 2; i < ARRAY_SIZE(av_); ++i, ++p)
+ *p = (mbinptr)((ulong)*p + gd->reloc_off);
}
#endif
--
1.7.10.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] avr32: add atngw100mkii board
From: Andreas Bießmann
This patch is derived from an older patch provided by atmel in its
buildroot-avr32-v3.0.0.tar.bz2
Signed-off-by: Andreas Bießmann
cc: Hans-Christian Egtvedt
---
since v1:
* rebase on current u-boot-avr32/master (move of grasshopper in MAINTAINERS)
MAINTAINERS |1 +
board/atmel/atngw100mkii/Makefile | 40 ++
board/atmel/atngw100mkii/atngw100mkii.c | 156 +++
boards.cfg |1 +
include/configs/atngw100mkii.h | 209 +++
5 files changed, 407 insertions(+)
create mode 100644 board/atmel/atngw100mkii/Makefile
create mode 100644 board/atmel/atngw100mkii/atngw100mkii.c
create mode 100644 include/configs/atngw100mkii.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 4aabcff..cd18732 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1112,6 +1112,7 @@ Wolfgang Wegner
Andreas Bießmann
grasshopper AT32AP7000
+ atngw100mkiiAT32AP7000
Hans-Christian Egtvedt
diff --git a/board/atmel/atngw100mkii/Makefile
b/board/atmel/atngw100mkii/Makefile
new file mode 100644
index 000..7fbd20d
--- /dev/null
+++ b/board/atmel/atngw100mkii/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2005-2006 Atmel Corporation
+#
+# See file CREDITS for list of people who contributed to this project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+
+include $(TOPDIR)/config.mk
+
+LIB:= $(obj)lib$(BOARD).o
+
+COBJS := $(BOARD).o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+$(LIB): $(obj).depend $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/board/atmel/atngw100mkii/atngw100mkii.c
b/board/atmel/atngw100mkii/atngw100mkii.c
new file mode 100644
index 000..f4023b3
--- /dev/null
+++ b/board/atmel/atngw100mkii/atngw100mkii.c
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2010 Atmel Corporation
+ *
+ * Copyright (C) 2012 Andreas Bießmann
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS] = {
+ {
+ /* Atmel AT49BV640D 8 MiB x16 NOR flash on NCS0 */
+ .virt_pgno = CONFIG_SYS_FLASH_BASE >> PAGE_SHIFT,
+ .nr_pages = CONFIG_SYS_FLASH_SIZE >> PAGE_SHIFT,
+ .phys = (CONFIG_SYS_FLASH_BASE >> PAGE_SHIFT)
+ | MMU_VMR_CACHE_NONE,
+ }, {
+ /* Micron MT29F2G16AAD 256 MiB x16 NAND flash on NCS3 */
+ .virt_pgno = EBI_SRAM_CS3_BASE >> PAGE_SHIFT,
+ .nr_pages = EBI_SRAM_CS3_SIZE >> PAGE_SHIFT,
+ .phys = (EBI_SRAM_CS3_BASE >> PAGE_SHIFT)
+ | MMU_VMR_CACHE_NONE,
+ }, {
+ /* 2x16-bit ISSI IS42S16320B 64 MiB SDRAM (128 MiB total) */
+ .virt_pgno = CONFIG_SYS_SDRAM_BASE >> PAGE_SHIFT,
+ .nr_pages = EBI_SDRAM_SIZE >> PAGE_SHIFT,
+ .phys = (CONFIG_SYS_SDRAM_BASE >> PAGE_SHIFT)
+ | MMU_VMR_CACHE_WRB
Re: [U-Boot] ARM: atmel: add at91sam9g20ek_2mmc nand boot support
Dear Bo Shen, > Add at91sam9g20_2mmc nand boot support. on this board, there is no > dataflash, so disable it > > change one commet for at91sam9g20ek board > > Signed-off-by: Bo Shen > > --- > board/atmel/at91sam9260ek/at91sam9260ek.c |7 ++- > boards.cfg|1 + > include/configs/at91sam9260ek.h |2 ++ > 3 files changed, 9 insertions(+), 1 deletion(-) applied to u-boot-atmel/master, thanks! Best regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v7] unify version_string
From: Andreas Bießmann
This patch removes the architecture specific implementation of
version_string where possible. Some architectures use a special place
and therefore we provide U_BOOT_VERSION_STRING definition and a common
weak symbol version_string.
Signed-off-by: Andreas Bießmann
CC: Mike Frysinger
CC: Peter Pan
CC: Wolfgang Denk
Acked-by: Mike Frysinger
---
changes since v1:
- remove (some) places of 'extern ... version_string' definition in favour of
include version.h
- use format-patch && send-email since some complained about base64 formated
mail content
changes since v2:
- add linker script solution for mpc512x powerpc devices
(never compiled)
changes since v3:
- use a common variable to join the parameters and leave the arch dependent
parts as is
changes since v4:
- address comments from mike
* do not use const char * const
* use weak symbol version_string, remove from architecture files
* remove trailing semicolon
changes since v5:
- remove RFC annotation
- add ACK-by Mike Frysinger
changes since v6:
- add __ASSEMBLY__ guard around 'extern const char version_string[];' in
version.h
- proven to build with MAKEALL for at91rm9200ek and qong
- proven to run on at91rm9200ek device
arch/arm/lib/board.c |8
arch/avr32/lib/board.c|4
arch/blackfin/lib/board.c |3 ---
arch/m68k/cpu/mcf5227x/start.S|5 +
arch/m68k/cpu/mcf523x/start.S |5 +
arch/m68k/cpu/mcf52x2/start.S |5 +
arch/m68k/cpu/mcf532x/start.S |5 +
arch/m68k/cpu/mcf5445x/start.S|5 +
arch/m68k/cpu/mcf547x_8x/start.S |5 +
arch/microblaze/lib/board.c |3 ---
arch/mips/lib/board.c |4
arch/nios2/cpu/start.S|9 +
arch/powerpc/cpu/74xx_7xx/start.S |9 +
arch/powerpc/cpu/mpc512x/start.S | 12
arch/powerpc/cpu/mpc5xx/start.S |9 +
arch/powerpc/cpu/mpc5xxx/start.S |9 +
arch/powerpc/cpu/mpc8220/start.S |9 +
arch/powerpc/cpu/mpc824x/start.S |9 +
arch/powerpc/cpu/mpc8260/start.S |9 +
arch/powerpc/cpu/mpc83xx/start.S | 12
arch/powerpc/cpu/mpc85xx/start.S |9 +
arch/powerpc/cpu/mpc86xx/start.S |9 +
arch/powerpc/cpu/mpc8xx/start.S |9 +
arch/powerpc/cpu/mpc8xx/video.c |1 -
arch/powerpc/cpu/ppc4xx/start.S |9 +
arch/sh/lib/board.c |3 ---
arch/sparc/cpu/leon2/start.S |5 +
arch/sparc/cpu/leon3/start.S |5 +
arch/x86/lib/board.c |4
common/cmd_version.c |3 ++-
common/main.c |3 +--
drivers/video/cfb_console.c |2 +-
include/version.h | 12
lib/display_options.c |3 +--
34 files changed, 44 insertions(+), 172 deletions(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index bcbf697..90709d0 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -42,7 +42,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -70,13 +69,6 @@ extern int AT91F_DataflashInit(void);
extern void dataflash_print_info(void);
#endif
-#ifndef CONFIG_IDENT_STRING
-#define CONFIG_IDENT_STRING ""
-#endif
-
-const char version_string[] =
- U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"CONFIG_IDENT_STRING;
-
#ifdef CONFIG_DRIVER_RTL8019
extern void rtl8019_get_enetaddr (uchar * addr);
#endif
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 5edef8f..e69f8d1 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -23,7 +23,6 @@
#include
#include
#include
-#include
#include
#include
@@ -41,9 +40,6 @@
DECLARE_GLOBAL_DATA_PTR;
-const char version_string[] =
- U_BOOT_VERSION " ("U_BOOT_DATE" - "U_BOOT_TIME") " CONFIG_IDENT_STRING;
-
unsigned long monitor_flash_len;
/* Weak aliases for optional board functions */
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 362b8c4..7c33893 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
@@ -39,8 +38,6 @@ int post_flag;
DECLARE_GLOBAL_DATA_PTR;
-const char version_string[] = U_BOOT_VERSION " ("U_BOOT_DATE" -
"U_BOOT_TIME")";
-
__attribute__((always_inline))
static inline void serial_early_puts(const char *s)
{
diff --git a/arch/m68k/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S
index d09d492..c5096a8 100644
--- a/arch/m68k/cpu/mcf5227x/start.S
+++ b/arch/m68k/cpu/mcf5227x/start.S
@@ -23,7 +23,6 @@
#include
#include
-#include
#include "version.h"
#include
@@ -508,7 +507,5 @@ _int_handler:
.globl version_string
version_string:
- .ascii U_BOOT_VERSION
- .ascii " (", U_BOOT_DATE, " - ", U_BO
