diff options
Diffstat (limited to 'board/siemens')
-rw-r--r-- | board/siemens/CCM/ccm.c | 6 | ||||
-rw-r--r-- | board/siemens/CCM/u-boot.lds | 3 | ||||
-rw-r--r-- | board/siemens/CCM/u-boot.lds.debug | 2 | ||||
-rw-r--r-- | board/siemens/IAD210/IAD210.c | 2 | ||||
-rw-r--r-- | board/siemens/IAD210/u-boot.lds | 3 | ||||
-rw-r--r-- | board/siemens/SCM/scm.c | 2 | ||||
-rw-r--r-- | board/siemens/SCM/u-boot.lds | 3 | ||||
-rw-r--r-- | board/siemens/common/README | 2 | ||||
-rw-r--r-- | board/siemens/common/fpga.c | 4 | ||||
-rw-r--r-- | board/siemens/pcu_e/pcu_e.c | 4 | ||||
-rw-r--r-- | board/siemens/pcu_e/u-boot.lds | 3 | ||||
-rw-r--r-- | board/siemens/pcu_e/u-boot.lds.debug | 2 |
12 files changed, 26 insertions, 10 deletions
diff --git a/board/siemens/CCM/ccm.c b/board/siemens/CCM/ccm.c index 3ed1b754ca..5a32e45e28 100644 --- a/board/siemens/CCM/ccm.c +++ b/board/siemens/CCM/ccm.c @@ -102,7 +102,7 @@ int checkboard (void) unsigned char *s; unsigned char buf[64]; - s = (getenv_r ("serial#", buf, sizeof(buf)) > 0) ? buf : NULL; + s = (getenv_r ("serial#", (char *)&buf, sizeof(buf)) > 0) ? buf : NULL; puts ("Board: Siemens CCM"); @@ -203,14 +203,14 @@ long int initdram (int board_type) * * try 8 column mode */ - size8 = dram_size (CFG_MAMR_8COL, (ulong *)SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); + size8 = dram_size (CFG_MAMR_8COL, SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); udelay (1000); /* * try 9 column mode */ - size9 = dram_size (CFG_MAMR_9COL, (ulong *)SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); + size9 = dram_size (CFG_MAMR_9COL, SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); if (size8 < size9) { /* leave configuration at 9 columns */ size = size9; diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 86e587ff2f..cdf550f67b 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -77,6 +77,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -109,11 +110,13 @@ SECTIONS _edata = .; PROVIDE (edata = .); + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; + . = .; __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug index 4e677216db..3b50272ea6 100644 --- a/board/siemens/CCM/u-boot.lds.debug +++ b/board/siemens/CCM/u-boot.lds.debug @@ -74,6 +74,8 @@ SECTIONS { *(.rodata) *(.rodata1) + *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } diff --git a/board/siemens/IAD210/IAD210.c b/board/siemens/IAD210/IAD210.c index 52cd4e6fa7..e498937b65 100644 --- a/board/siemens/IAD210/IAD210.c +++ b/board/siemens/IAD210/IAD210.c @@ -155,7 +155,7 @@ long int initdram (int board_type) * Check Bank 0 Memory Size for re-configuration * */ - size = dram_size (CFG_MAMR, (ulong *) SDRAM_BASE_PRELIM, + size = dram_size (CFG_MAMR, (long *) SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE); udelay (1000); diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds index d2f2848788..42e1b83b95 100644 --- a/board/siemens/IAD210/u-boot.lds +++ b/board/siemens/IAD210/u-boot.lds @@ -75,6 +75,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -107,11 +108,13 @@ SECTIONS _edata = .; PROVIDE (edata = .); + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; + . = .; __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c index d832edf825..d20688d568 100644 --- a/board/siemens/SCM/scm.c +++ b/board/siemens/SCM/scm.c @@ -206,7 +206,7 @@ const iop_conf_t iop_conf_tab[4][32] = { */ int checkboard (void) { - unsigned char str[64]; + char str[64]; int i = getenv_r ("serial#", str, sizeof (str)); puts ("Board: "); diff --git a/board/siemens/SCM/u-boot.lds b/board/siemens/SCM/u-boot.lds index ce6c4540d0..05f29c6ed0 100644 --- a/board/siemens/SCM/u-boot.lds +++ b/board/siemens/SCM/u-boot.lds @@ -62,6 +62,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -94,11 +95,13 @@ SECTIONS _edata = .; PROVIDE (edata = .); + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; + . = .; __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/siemens/common/README b/board/siemens/common/README index d781903840..7f1c8cd62d 100644 --- a/board/siemens/common/README +++ b/board/siemens/common/README @@ -19,7 +19,7 @@ Die MTD-Partitionierung kann nun mittels "bootargs" ueber- geben werden: => printenv addmtd - addmtd=setenv bootargs $(bootargs) + addmtd=setenv bootargs ${bootargs} mtdparts=0:256k(U-Boot)ro,768k(Kernel),-(Rest)\;1:-(myJFFS2) Die Portierung auf SMC ist natuerlich noch nicht getestet. diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c index 169048e42f..e9941cda61 100644 --- a/board/siemens/common/fpga.c +++ b/board/siemens/common/fpga.c @@ -169,7 +169,7 @@ static int fpga_load (fpga_t* fpga, ulong addr, int checkall) } } - if (checkall && fpga_get_version(fpga, hdr.ih_name) < 0) + if (checkall && fpga_get_version(fpga, (char *)(hdr.ih_name)) < 0) return 1; /* align length */ @@ -341,7 +341,7 @@ int fpga_init (void) } hdr = (image_header_t *)addr; - if ((new_id = fpga_get_version(fpga, hdr->ih_name)) == -1) + if ((new_id = fpga_get_version(fpga, (char *)(hdr->ih_name))) == -1) return 1; do_load = 1; diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c index 6374513fec..3f05e4a6ab 100644 --- a/board/siemens/pcu_e/pcu_e.c +++ b/board/siemens/pcu_e/pcu_e.c @@ -241,9 +241,9 @@ long int initdram (int board_type) * Check Bank 0 Memory Size for re-configuration */ #if PCU_E_WITH_SWAPPED_CS /* XXX */ - size_b0 = dram_size (CFG_MAMR, (ulong *) SDRAM_BASE5_PRELIM, SDRAM_MAX_SIZE); + size_b0 = dram_size (CFG_MAMR, (long *) SDRAM_BASE5_PRELIM, SDRAM_MAX_SIZE); #else /* XXX */ - size_b0 = dram_size (CFG_MAMR, (ulong *) SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); + size_b0 = dram_size (CFG_MAMR, (long *) SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); #endif /* XXX */ memctl->memc_mamr = CFG_MAMR | MAMR_PTAE; diff --git a/board/siemens/pcu_e/u-boot.lds b/board/siemens/pcu_e/u-boot.lds index fffa79eab1..6505d45561 100644 --- a/board/siemens/pcu_e/u-boot.lds +++ b/board/siemens/pcu_e/u-boot.lds @@ -66,6 +66,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -98,11 +99,13 @@ SECTIONS _edata = .; PROVIDE (edata = .); + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; + . = .; __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index 153286be44..828afbbced 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -75,6 +75,8 @@ SECTIONS { *(.rodata) *(.rodata1) + *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } |