Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8412d814ce8bf5570a2b747f1e7fd321097fe987

Authored by Wolfgang Denk
1 parent 409ecdc0bb
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Fix compiler warnings for ARM systems. 

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 8 changed files with 11 additions and 8 deletions Side-by-side Diff

board/mpl/vcma9/flash.c
Diff comments   View file @ 8412d81
... ... @@ -290,7 +290,7 @@
290 290 * Copy memory to flash
291 291 */
292 292  
293   -volatile static int write_hword (flash_info_t * info, ulong dest, ushort data)
  293 +static int write_hword (flash_info_t * info, ulong dest, ushort data)
294 294 {
295 295 vu_short *addr = (vu_short *) dest;
296 296 ushort result;
board/mpl/vcma9/vcma9.h
Diff comments   View file @ 8412d81
... ... @@ -128,7 +128,7 @@
128 128 } /*__attribute__((__packed__))*/ VCMA9_PLD;
129 129  
130 130 #define VCMA9_PLD_BASE 0x2C000100
131   -static inline VCMA9_PLD * const VCMA9_GetBase_PLD(void)
  131 +static inline VCMA9_PLD * VCMA9_GetBase_PLD(void)
132 132 {
133 133 return (VCMA9_PLD * const)VCMA9_PLD_BASE;
134 134 }
... ... @@ -196,7 +196,7 @@
196 196 int i;
197 197 uchar *boottype;
198 198 uchar *bootletter;
199   - uchar *fmt;
  199 + char *fmt;
200 200 uchar botbootletter[] = "B";
201 201 uchar topbootletter[] = "T";
202 202 uchar botboottype[] = "bottom boot sector";
board/sbc2410x/flash.c
Diff comments   View file @ 8412d81
... ... @@ -288,7 +288,7 @@
288 288 * Copy memory to flash
289 289 */
290 290  
291   -volatile static int write_hword (flash_info_t * info, ulong dest, ushort data)
  291 +static int write_hword (flash_info_t * info, ulong dest, ushort data)
292 292 {
293 293 vu_short *addr = (vu_short *) dest;
294 294 ushort result;
board/smdk2410/flash.c
Diff comments   View file @ 8412d81
... ... @@ -290,7 +290,7 @@
290 290 * Copy memory to flash
291 291 */
292 292  
293   -volatile static int write_hword (flash_info_t * info, ulong dest, ushort data)
  293 +static int write_hword (flash_info_t * info, ulong dest, ushort data)
294 294 {
295 295 vu_short *addr = (vu_short *) dest;
296 296 ushort result;
board/wepep250/flash.c
Diff comments   View file @ 8412d81
... ... @@ -44,6 +44,7 @@
44 44  
45 45 #if ( WEP_FLASH_BUS_WIDTH == 1 )
46 46 # define FLASH_BUS vu_char
  47 +# define FLASH_BUS_RET u_char
47 48 # if ( WEP_FLASH_INTERLEAVE == 1 )
48 49 # define FLASH_CMD( x ) x
49 50 # else
... ... @@ -53,6 +54,7 @@
53 54  
54 55 #elif ( WEP_FLASH_BUS_WIDTH == 2 )
55 56 # define FLASH_BUS vu_short
  57 +# define FLASH_BUS_RET u_short
56 58 # if ( WEP_FLASH_INTERLEAVE == 1 )
57 59 # define FLASH_CMD( x ) x
58 60 # elif ( WEP_FLASH_INTERLEAVE == 2 )
... ... @@ -64,6 +66,7 @@
64 66  
65 67 #elif ( WEP_FLASH_BUS_WIDTH == 4 )
66 68 # define FLASH_BUS vu_long
  69 +# define FLASH_BUS_RET u_long
67 70 # if ( WEP_FLASH_INTERLEAVE == 1 )
68 71 # define FLASH_CMD( x ) x
69 72 # elif ( WEP_FLASH_INTERLEAVE == 2 )
... ... @@ -81,7 +84,7 @@
81 84  
82 85 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
83 86  
84   -static FLASH_BUS flash_status_reg (void)
  87 +static FLASH_BUS_RET flash_status_reg (void)
85 88 {
86 89  
87 90 FLASH_BUS *addr = (FLASH_BUS *) 0;
... ... @@ -457,7 +457,7 @@
457 457  
458 458 uchar i2c_reg_read (uchar chip, uchar reg)
459 459 {
460   - char buf;
  460 + uchar buf;
461 461  
462 462 PRINTD(("i2c_reg_read(chip=0x%02x, reg=0x%02x)\n",chip,reg));
463 463 i2c_read(chip, reg, 1, &buf, 1);
drivers/s3c4510b_eth.c
Diff comments   View file @ 8412d81
... ... @@ -175,7 +175,7 @@
175 175 }
176 176  
177 177 /* copy user data into frame data pointer */
178   - memcpy((void *)(eth->m_curTX_FD->m_frameDataPtr.bf.dataPtr),
  178 + memcpy((void *)((u32)(eth->m_curTX_FD->m_frameDataPtr.bf.dataPtr)),
179 179 (void *)packet,
180 180 length);
181 181