km/arm: coding style clean up
PATCH 1/1 km/arm: coding style clean up
Address most of the checkpatch issues we found in km_arm and common km code.
CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
Signed-off-by Holger Brunck <[email protected]>
--- board/keymile/common/common.c | 44 ++++++++------- board/keymile/common/ivm.c | 84 ++++++++++++++--------------- board/keymile/km_arm/fpga_config.c | 16 +++--- board/keymile/km_arm/km_arm.c | 41 +++++++------- include/configs/km/keymile-common.h | 4 +- include/configs/km/km_arm.h | 2 +- 6 files changed, 96 insertions(+), 95 deletions(-)
board/keymile/common/common.c +21 -23
@@ -56,7 +56,7 @@ int set_km_env(void)/* try to read rootfssize (ram image) from environment */ p =env_get ("rootfssize" ); -if (p !=NULL ) +if (p)strict_strtoul (p,16 , &rootfssize); pram = (rootfssize +CONFIG_KM_RESERVED_PRAM +CONFIG_KM_PHRAM +CONFIG_KM_PNVRAM ) /0x400 ;
@@ -165,7 +165,7 @@ static int do_setboardid(struct cmd_tbl *cmdtp, int flag, int argc,char *p; p =get_local_var ("IVM_BoardId" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_Boardid\n" );return 1 ; }
@@ -174,7 +174,7 @@ static int do_setboardid(struct cmd_tbl *cmdtp, int flag, int argc,printf ("set boardid=%s\n" , buf); p =get_local_var ("IVM_HWKey" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_HWKey\n" );return 1 ; }
@@ -186,8 +186,8 @@ static int do_setboardid(struct cmd_tbl *cmdtp, int flag, int argc,return 0 ; } -U_BOOT_CMD (km_setboardid,1 ,0 , do_setboardid,"setboardid" ,"read out bid and " -"hwkey from IVM and set in environment" ); +U_BOOT_CMD (km_setboardid,1 ,0 , do_setboardid,"setboardid" , +"read out bid and hwkey from IVM and set in environment" );/* * command km_checkbidhwk
@@ -218,14 +218,14 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,* already stored in the local hush variables */ p =get_local_var ("IVM_BoardId" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_Boardid\n" );return 1 ; } rc =strict_strtoul (p,16 , &ivmbid); p =get_local_var ("IVM_HWKey" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_HWKey\n" );return 1 ; }
@@ -238,10 +238,10 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,/* now try to read values from environment if available */ p =env_get ("boardid" ); -if (p !=NULL ) +if (p) rc =strict_strtoul (p,16 , &envbid); p =env_get ("hwkey" ); -if (p !=NULL ) +if (p) rc =strict_strtoul (p,16 , &envhwkey);if (rc !=0 ) {
@@ -263,9 +263,8 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,if (verbose) {printf ("IVM_BoardId: %ld, IVM_HWKey=%ld\n" , - ivmbid, ivmhwkey); -printf ("boardIdHwKeyList: %s\n" , - bidhwklist); + ivmbid, ivmhwkey); +printf ("boardIdHwKeyList: %s\n" , bidhwklist); }while (!found) {/* loop over each bid/hwkey pair in the list */
@@ -291,13 +290,13 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,while (*rest && !isxdigit (*rest)) rest++; } -if ((!bid) || (!hwkey)) { +if (!bid || !hwkey) {/* end of list */ break ; }if (verbose) {printf ("trying bid=0x%lX, hwkey=%ld\n" , - bid, hwkey); + bid, hwkey); }/* * Compare the values of the found entry in the
@@ -305,7 +304,7 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,* in the inventory eeprom. If they are equal * set the values in environment variables. */ -if ((bid == ivmbid) && (hwkey == ivmhwkey)) { +if (bid == ivmbid && hwkey == ivmhwkey) {char buf[10 ]; found =1 ;
@@ -321,12 +320,12 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc, }/* compare now the values */ -if ((ivmbid == envbid) && (ivmhwkey == envhwkey)) { +if (ivmbid == envbid && ivmhwkey == envhwkey) {printf ("boardid=0x%3lX, hwkey=%ld\n" , envbid, envhwkey); rc =0 ;/* match */ }else {printf ("Error: env boardid=0x%3lX, hwkey=%ld\n" , envbid, - envhwkey); + envhwkey);printf (" IVM bId=0x%3lX, hwKey=%ld\n" , ivmbid, ivmhwkey); rc =1 ;/* don't match */ }
@@ -334,10 +333,8 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc, }U_BOOT_CMD (km_checkbidhwk,2 ,0 , do_checkboardidhwk, -"check boardid and hwkey" , -"[v]\n - check environment parameter " \ -"\"boardIdListHex\" against stored boardid and hwkey " \ -"from the IVM\n v: verbose output" +"check boardid and hwkey" , +"[v]\n - check environment parameter \"boardIdListHex\" against stored boardid and hwkey from the IVM\n v: verbose output" );/*
@@ -356,6 +353,7 @@ static int do_checktestboot(struct cmd_tbl *cmdtp, int flag, int argc,#if defined(CONFIG_POST ) testpin =post_hotkeys_pressed ();#endif + s =env_get ("test_bank" );/* when test_bank is not set, act as if testpin is not asserted */ testboot = (testpin !=0 ) && (s);
@@ -370,6 +368,6 @@ static int do_checktestboot(struct cmd_tbl *cmdtp, int flag, int argc, }U_BOOT_CMD (km_checktestboot,2 ,0 , do_checktestboot, -"check if testpin is asserted" , -"[v]\n v - verbose output" +"check if testpin is asserted" , +"[v]\n v - verbose output" );
board/keymile/common/ivm.c +42 -42
178 lines not on this page · raw message
board/keymile/km_arm/fpga_config.c +9 -7
@@ -40,14 +40,14 @@ static int boco_clear_bits(u8 reg, u8 flags) ret =i2c_read (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error reading the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; } regval &= ~flags; ret =i2c_write (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error writing the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; }
@@ -63,14 +63,14 @@ static int boco_set_bits(u8 reg, u8 flags) ret =i2c_read (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error reading the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; } regval |= flags; ret =i2c_write (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error writing the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; }
@@ -113,7 +113,8 @@ int trigger_fpga_config(void) skip =0 ;#ifndef CONFIG_KM_FPGA_FORCE_CONFIG /* if the FPGA is already configured, we do not want to -* reconfigure it */ +* reconfigure it +*/ skip =0 ;if (fpga_done ()) {printf ("PCIe FPGA config: skipped\n" );
@@ -179,7 +180,7 @@ int wait_for_fpga_config(void) ret =i2c_read (BOCO_ADDR ,SPI_REG ,1 , &spictrl,1 );if (ret) {printf ("%s: error reading the BOCO spictrl !!\n" , - __func__); + __func__);return ret; }if (timeout-- ==0 ) {
@@ -235,7 +236,8 @@ int fpga_reset(void)#endif /* the FPGA was configured, we configure the BOCO2 so that the EEPROM -* is available from the Bobcat SPI bus */ +* is available from the Bobcat SPI bus +*/ int toggle_eeprom_spi_bus (void ) {int ret =0 ;
board/keymile/km_arm/km_arm.c +21 -20
105 lines not on this page · raw message
include/configs/km/keymile-common.h +2 -2
@@ -184,9 +184,9 @@"cramfsloadfdt=" \"cramfsload ${fdt_addr_r} " \"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "fdt_addr_r="__stringify(CONFIG_KM_FDT_ADDR) "\0" \ + "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \"init=/sbin/init-overlay.sh\0" \ - "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ + "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \"load=tftpboot ${load_addr_r} ${u-boot}\0" \"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
include/configs/km/km_arm.h +1 -1
@@ -48,7 +48,7 @@" boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}" #define CONFIG_KM_DEF_ENV_CPU \ -"u-boot=" CONFIG_HOSTNAME "/u-boot.kwb\0" \ +"u-boot=" CONFIG_HOSTNAME "/u-boot.kwb\0" \CONFIG_KM_UPDATE_UBOOT \"set_fdthigh=setenv fdt_high ${kernelmem}\0" \"checkfdt=" \
Signature · 1 line
2.26.0
PATCH 1/1 km/arm: coding style clean up
Quoted 6 lines · Holger Brunck
Address most of the checkpatch issues we found in
km_armand common km code.CC Stefan Roese <[email protected]>CC Valentin Longchamp <[email protected]>Signed-off-by Holger Brunck <[email protected]>
Reviewed-by Stefan Roese <[email protected]>
Thanks,
Stefan
Quoted 563 lines
--- board/keymile/common/common.c | 44 ++++++++------- board/keymile/common/ivm.c | 84 ++++++++++++++--------------- board/keymile/km_arm/fpga_config.c | 16 +++--- board/keymile/km_arm/km_arm.c | 41 +++++++------- include/configs/km/keymile-common.h | 4 +- include/configs/km/km_arm.h | 2 +- 6 files changed, 96 insertions(+), 95 deletions(-)board/keymile/common/common.c +21
-23@@ -56,7 +56,7 @@ int set_km_env(void)/* try to read rootfssize (ram image) from environment */ p =env_get ("rootfssize" ); -if (p !=NULL ) +if (p)strict_strtoul (p,16 , &rootfssize); pram = (rootfssize +CONFIG_KM_RESERVED_PRAM +CONFIG_KM_PHRAM +CONFIG_KM_PNVRAM ) /0x400 ;@@ -165,7 +165,7 @@ static int do_setboardid(struct cmd_tbl *cmdtp, int flag, int argc,char *p; p =get_local_var ("IVM_BoardId" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_Boardid\n" );return 1 ; }@@ -174,7 +174,7 @@ static int do_setboardid(struct cmd_tbl *cmdtp, int flag, int argc,printf ("set boardid=%s\n" , buf); p =get_local_var ("IVM_HWKey" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_HWKey\n" );return 1 ; }@@ -186,8 +186,8 @@ static int do_setboardid(struct cmd_tbl *cmdtp, int flag, int argc,return 0 ; } -U_BOOT_CMD (km_setboardid,1 ,0 , do_setboardid,"setboardid" ,"read out bid and " -"hwkey from IVM and set in environment" ); +U_BOOT_CMD (km_setboardid,1 ,0 , do_setboardid,"setboardid" , +"read out bid and hwkey from IVM and set in environment" );/* * command km_checkbidhwk @@ -218,14 +218,14 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,* already stored in the local hush variables */ p =get_local_var ("IVM_BoardId" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_Boardid\n" );return 1 ; } rc =strict_strtoul (p,16 , &ivmbid); p =get_local_var ("IVM_HWKey" ); -if (p ==NULL ) { +if (!p) {printf ("can't get the IVM_HWKey\n" );return 1 ; }@@ -238,10 +238,10 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,/* now try to read values from environment if available */ p =env_get ("boardid" ); -if (p !=NULL ) +if (p) rc =strict_strtoul (p,16 , &envbid); p =env_get ("hwkey" ); -if (p !=NULL ) +if (p) rc =strict_strtoul (p,16 , &envhwkey);if (rc !=0 ) {@@ -263,9 +263,8 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,if (verbose) {printf ("IVM_BoardId: %ld, IVM_HWKey=%ld\n" , - ivmbid, ivmhwkey); -printf ("boardIdHwKeyList: %s\n" , - bidhwklist); + ivmbid, ivmhwkey); +printf ("boardIdHwKeyList: %s\n" , bidhwklist); }while (!found) {/* loop over each bid/hwkey pair in the list */ @@ -291,13 +290,13 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,while (*rest && !isxdigit (*rest)) rest++; } -if ((!bid) || (!hwkey)) { +if (!bid || !hwkey) {/* end of list */ break ; }if (verbose) {printf ("trying bid=0x%lX, hwkey=%ld\n" , - bid, hwkey); + bid, hwkey); }/* * Compare the values of the found entry in the @@ -305,7 +304,7 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc,* in the inventory eeprom. If they are equal * set the values in environment variables. */ -if ((bid == ivmbid) && (hwkey == ivmhwkey)) { +if (bid == ivmbid && hwkey == ivmhwkey) {char buf[10 ]; found =1 ;@@ -321,12 +320,12 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc, }/* compare now the values */ -if ((ivmbid == envbid) && (ivmhwkey == envhwkey)) { +if (ivmbid == envbid && ivmhwkey == envhwkey) {printf ("boardid=0x%3lX, hwkey=%ld\n" , envbid, envhwkey); rc =0 ;/* match */ }else {printf ("Error: env boardid=0x%3lX, hwkey=%ld\n" , envbid, - envhwkey); + envhwkey);printf (" IVM bId=0x%3lX, hwKey=%ld\n" , ivmbid, ivmhwkey); rc =1 ;/* don't match */ }@@ -334,10 +333,8 @@ static int do_checkboardidhwk(struct cmd_tbl *cmdtp, int flag, int argc, }U_BOOT_CMD (km_checkbidhwk,2 ,0 , do_checkboardidhwk, -"check boardid and hwkey" , -"[v]\n - check environment parameter " \ -"\"boardIdListHex\" against stored boardid and hwkey " \ -"from the IVM\n v: verbose output" +"check boardid and hwkey" , +"[v]\n - check environment parameter \"boardIdListHex\" against stored boardid and hwkey from the IVM\n v: verbose output" );/* @@ -356,6 +353,7 @@ static int do_checktestboot(struct cmd_tbl *cmdtp, int flag, int argc,#if defined(CONFIG_POST ) testpin =post_hotkeys_pressed ();#endif + s =env_get ("test_bank" );/* when test_bank is not set, act as if testpin is not asserted */ testboot = (testpin !=0 ) && (s);@@ -370,6 +368,6 @@ static int do_checktestboot(struct cmd_tbl *cmdtp, int flag, int argc, }U_BOOT_CMD (km_checktestboot,2 ,0 , do_checktestboot, -"check if testpin is asserted" , -"[v]\n v - verbose output" +"check if testpin is asserted" , +"[v]\n v - verbose output" );board/keymile/common/ivm.c +42
-42@@ -46,28 +46,27 @@ static int ivm_set_value(char *name, char *value) {char tempbuf[256 ]; -if (value !=NULL ) { +if (value) {sprintf (tempbuf,"%s=%s" , name, value);return set_local_var (tempbuf,0 ); - }else { -unset_local_var (name); } +unset_local_var (name);return 0 ; }static int ivm_get_value (unsigned char *buf,int len,char *name,int off, -int check) +int check) {unsigned short val;unsigned char valbuf[30 ]; -if ((buf[off +0 ] != buf[off +2 ]) && - (buf[off +2 ] != buf[off +4 ])) { +if (buf[off +0 ] != buf[off +2 ] && + buf[off +2 ] != buf[off +4 ]) {printf ("%s Error corrupted %s\n" , __func__, name); val =-1 ; }else { val = buf[off +0 ] + (buf[off +1 ] <<8 ); -if ((val ==0 ) && (check ==1 )) +if (val ==0 && check ==1 ) val =-1 ; }sprintf ((char *)valbuf,"%x" , val);@@ -98,9 +97,9 @@ static char convert_char(char c) }static int ivm_findinventorystring (int type, -unsigned char *const string, -unsigned long maxlen, -unsigned char *buf) +unsigned char *const string, +unsigned long maxlen, +unsigned char *buf) {int xcode =0 ;unsigned long cr =0 ;@@ -133,12 +132,12 @@ static int ivm_findinventorystring(int type,*/ if (addr <INVENTORYDATASIZE ) {/* Copy the IVM string in the corresponding string */ -for (; (buf[addr] !='\r' ) && - ((buf[addr] !=';' ) || (!stop)) && - (size < (maxlen -1 ) && - (addr <INVENTORYDATASIZE )); addr++) { +for (; (buf[addr] !='\r' ) && + ((buf[addr] !=';' ) || (!stop)) && + (size < (maxlen -1 ) && + (addr <INVENTORYDATASIZE )); addr++) { size +=sprintf ((char *)string + size,"%c" , -convert_char (buf[addr])); +convert_char (buf[addr])); }/* @@ -176,12 +175,12 @@ static int ivm_check_crc(unsigned char *buf, int block)unsigned long crceeprom; crc =ivm_calc_crc (buf,CONFIG_SYS_IVM_EEPROM_PAGE_LEN -2 ); - crceeprom = (buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN -1 ] + \ + crceeprom = (buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN -1 ] + buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN -2 ] *256 );if (crc != crceeprom) {if (block ==0 ) -printf ("Error CRC Block: %d EEprom: calculated: \ -%lx EEprom: %lx\n" , block, crc, crceeprom); +printf ("Error CRC Block: %d EEprom: calculated: %lx EEprom: %lx\n" , + block, crc, crceeprom);return -1 ; }return 0 ;@@ -189,7 +188,7 @@ static int ivm_check_crc(unsigned char *buf, int block)/* take care of the possible MAC address offset and the IVM content offset */ static int process_mac (unsigned char *valbuf,unsigned char *buf, -int offset,bool unique) +int offset,bool unique) {unsigned char mac[6 ];unsigned long val = (buf[4 ] <<16 ) + (buf[5 ] <<8 ) + buf[6 ];@@ -197,9 +196,9 @@ static int process_mac(unsigned char *valbuf, unsigned char *buf,/* use an intermediate buffer, to not change IVM content * MAC address is at offset 1 */ -memcpy (mac, buf+1 ,6 ); +memcpy (mac, buf +1 ,6 ); -/* MAC adress can be set to locally administred, this is only allowed +/* MAC address can be set to locally administred, this is only allowed * for interfaces which have now connection to the outside. For these * addresses we need to set the second bit in the first byte. */ @@ -222,7 +221,7 @@ static int ivm_analyze_block2(unsigned char *buf, int len)unsigned char valbuf[MAC_STR_SZ ];unsigned long count; -/* IVM_MAC Adress begins at offset 1 */ +/* IVM_MAC Address begins at offset 1 */ sprintf ((char *)valbuf,"%pM" , buf +1 );ivm_set_value ("IVM_MacAddress" , (char *)valbuf);/* IVM_MacCount */ @@ -247,9 +246,9 @@ int ivm_analyze_eeprom(unsigned char *buf, int len)return -1 ;ivm_get_value (buf,CONFIG_SYS_IVM_EEPROM_PAGE_LEN , -"IVM_BoardId" ,0 ,1 ); +"IVM_BoardId" ,0 ,1 ); val =ivm_get_value (buf,CONFIG_SYS_IVM_EEPROM_PAGE_LEN , -"IVM_HWKey" ,6 ,1 ); +"IVM_HWKey" ,6 ,1 );if (val !=0xffff ) {sprintf ((char *)valbuf,"%x" , ((val /100 ) %10 ));ivm_set_value ("IVM_HWVariant" , (char *)valbuf);@@ -257,7 +256,7 @@ int ivm_analyze_eeprom(unsigned char *buf, int len)ivm_set_value ("IVM_HWVersion" , (char *)valbuf); }ivm_get_value (buf,CONFIG_SYS_IVM_EEPROM_PAGE_LEN , -"IVM_Functions" ,12 ,0 ); +"IVM_Functions" ,12 ,0 ); GET_STRING("IVM_Symbol", IVM_POS_SYMBOL_ONLY, 8)GET_STRING ("IVM_DeviceName" ,IVM_POS_SHORT_TEXT ,64 )@@ -269,7 +268,7 @@ int ivm_analyze_eeprom(unsigned char *buf, int len)while (i < len) {if (tmp[i] ==';' ) {ivm_set_value ("IVM_ShortText" , - (char *)&tmp[i +1 ]); + (char *)&tmp[i +1 ]);break ; } i++;@@ -292,7 +291,7 @@ int ivm_analyze_eeprom(unsigned char *buf, int len)if (ivm_check_crc (&buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN *2 ],2 ) !=0 )return 0 ;ivm_analyze_block2 (&buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN *2 ], -CONFIG_SYS_IVM_EEPROM_PAGE_LEN ); +CONFIG_SYS_IVM_EEPROM_PAGE_LEN );return 0 ; }@@ -305,22 +304,23 @@ static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset)/* do we have the page 2 filled ? if not return */ if (ivm_check_crc (buf,2 ))return 0 ; - page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN *2 ]; + page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN *2 ]; -#ifndef CONFIG_KMTEGR1 -/* if an offset is defined, add it */ -process_mac (valbuf, page2, mac_address_offset, true); -env_set ((char *)"ethaddr" , (char *)valbuf); -#else -/* KMTEGR1 has a special setup. eth0 has no connection to the outside and -* gets an locally administred MAC address, eth1 is the debug interface and -* gets the official MAC address from the IVM -*/ -process_mac (valbuf, page2, mac_address_offset, false); -env_set ((char *)"ethaddr" , (char *)valbuf); -process_mac (valbuf, page2, mac_address_offset, true); -env_set ((char *)"eth1addr" , (char *)valbuf); -#endif +if (!IS_ENABLED (CONFIG_KMTEGR1 )) { +/* if an offset is defined, add it */ +process_mac (valbuf, page2, mac_address_offset, true); +env_set ((char *)"ethaddr" , (char *)valbuf); + }else { +/* KMTEGR1 has a special setup. eth0 has no connection to the +* outside and gets an locally administred MAC address, eth1 is +* the debug interface and gets the official MAC address from +* the IVM +*/ +process_mac (valbuf, page2, mac_address_offset, false); +env_set ((char *)"ethaddr" , (char *)valbuf); +process_mac (valbuf, page2, mac_address_offset, true); +env_set ((char *)"eth1addr" , (char *)valbuf); + }return 0 ; }board/keymile/km_arm/fpga_config.c +9
-7@@ -40,14 +40,14 @@ static int boco_clear_bits(u8 reg, u8 flags) ret =i2c_read (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error reading the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; } regval &= ~flags; ret =i2c_write (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error writing the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; }@@ -63,14 +63,14 @@ static int boco_set_bits(u8 reg, u8 flags) ret =i2c_read (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error reading the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; } regval |= flags; ret =i2c_write (BOCO_ADDR , reg,1 , ®val,1 );if (ret) {printf ("%s: error writing the BOCO @%#x !!\n" , - __func__, reg); + __func__, reg);return ret; }@@ -113,7 +113,8 @@ int trigger_fpga_config(void) skip =0 ;#ifndef CONFIG_KM_FPGA_FORCE_CONFIG /* if the FPGA is already configured, we do not want to -* reconfigure it */ +* reconfigure it +*/ skip =0 ;if (fpga_done ()) {printf ("PCIe FPGA config: skipped\n" );@@ -179,7 +180,7 @@ int wait_for_fpga_config(void) ret =i2c_read (BOCO_ADDR ,SPI_REG ,1 , &spictrl,1 );if (ret) {printf ("%s: error reading the BOCO spictrl !!\n" , - __func__); + __func__);return ret; }if (timeout-- ==0 ) {@@ -235,7 +236,8 @@ int fpga_reset(void)#endif /* the FPGA was configured, we configure the BOCO2 so that the EEPROM -* is available from the Bobcat SPI bus */ +* is available from the Bobcat SPI bus +*/ int toggle_eeprom_spi_bus (void ) {int ret =0 ;board/keymile/km_arm/km_arm.c +21
-20@@ -53,9 +53,9 @@ DECLARE_GLOBAL_DATA_PTR;#define PHY_MARVELL_88E1118R_LED_CTRL_REG 0x0010#define PHY_MARVELL_88E1118R_LED_CTRL_RESERVED 0x1000 -#define PHY_MARVELL_88E1118R_LED_CTRL_LED0_1000MB (0x7<<0) -#define PHY_MARVELL_88E1118R_LED_CTRL_LED1_ACT (0x3<<4) -#define PHY_MARVELL_88E1118R_LED_CTRL_LED2_LINK (0x0<<8) +#define PHY_MARVELL_88E1118R_LED_CTRL_LED0_1000MB (0x7 << 0) +#define PHY_MARVELL_88E1118R_LED_CTRL_LED1_ACT (0x3 << 4) +#define PHY_MARVELL_88E1118R_LED_CTRL_LED2_LINK (0x0 << 8)/* I/O pin to erase flash RGPP09 = MPP43 */ #define KM_FLASH_ERASE_ENABLE 43@@ -169,6 +169,7 @@ static void set_bootcount_addr(void) {uchar buf[32 ];unsigned int bootcountaddr; + bootcountaddr = gd->ram_size -BOOTCOUNT_ADDR ;sprintf ((char *)buf,"0x%x" , bootcountaddr);env_set ("bootcountaddr" , (char *)buf);@@ -192,7 +193,7 @@ int board_early_init_f(void)/* set the 2 bitbang i2c pins as output gpios */ tmp =readl (MVEBU_GPIO0_BASE +4 ); -writel (tmp & (~KM_KIRKWOOD_SOFT_I2C_GPIOS ) ,MVEBU_GPIO0_BASE +4 ); +writel (tmp & (~KM_KIRKWOOD_SOFT_I2C_GPIOS ),MVEBU_GPIO0_BASE +4 );#endif /* adjust SDRAM size for bank 0 */ mvebu_sdram_size_adjust (0 );@@ -292,11 +293,11 @@ int mvebu_board_spi_release_bus(struct udevice *dev)#define PHY_LED_SEL_REG 0x18#define PHY_LED0_LINK (0x5) -#define PHY_LED1_ACT (0x8<<4) -#define PHY_LED2_INT (0xe<<8) +#define PHY_LED1_ACT (0x8 << 4) +#define PHY_LED2_INT (0xe << 8)#define PHY_SPEC_CTRL_REG 0x1c -#define PHY_RGMII_CLK_STABLE (0x1<<10) -#define PHY_CLSA (0x1<<1) +#define PHY_RGMII_CLK_STABLE (0x1 << 10) +#define PHY_CLSA (0x1 << 1)/* Configure and enable MV88E3018 PHY */ void reset_phy (void )@@ -407,8 +408,8 @@ void reset_phy(void)return ;/* check for Marvell 88E1118R Gigabit PHY (PIGGY3) */ -if ((oui ==PHY_MARVELL_OUI ) && - (model ==PHY_MARVELL_88E1118R_MODEL )) { +if (oui ==PHY_MARVELL_OUI && + model ==PHY_MARVELL_88E1118R_MODEL ) {/* set page register to 3 */ if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_MARVELL_PAGE_REG,@@ -438,7 +439,6 @@ void reset_phy(void) }#endif -#if defined(CONFIG_HUSH_INIT_VAR )int hush_init_var (void ) {@@ -478,22 +478,23 @@ int get_scl(void)int post_hotkeys_pressed (void ) { -#if defined(CONFIG_KM_COGE5UN ) -return kw_gpio_get_value (KM_POST_EN_L ); -#else -return !kw_gpio_get_value (KM_POST_EN_L ); -#endif +if (IS_ENABLED (CONFIG_KM_COGE5UN )) +return kw_gpio_get_value (KM_POST_EN_L ); +else +return !kw_gpio_get_value (KM_POST_EN_L ); }ulong post_word_load (void ) { -void * addr = (void *) (gd->ram_size -BOOTCOUNT_ADDR +POST_WORD_OFF ); +void *addr = (void *)(gd->ram_size -BOOTCOUNT_ADDR +POST_WORD_OFF ); +return in_le32 (addr); }void post_word_store (ulong value) { -void * addr = (void *) (gd->ram_size -BOOTCOUNT_ADDR +POST_WORD_OFF ); +void *addr = (void *)(gd->ram_size -BOOTCOUNT_ADDR +POST_WORD_OFF ); +out_le32 (addr, value); }@@ -502,14 +503,14 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset) *vstart =CONFIG_SYS_SDRAM_BASE ;/* we go up to relocation plus a 1 MB margin */ - *size =CONFIG_SYS_TEXT_BASE - (1 <<20 ); + *size =CONFIG_SYS_TEXT_BASE - (1 <<20 );return 0 ; }#endif #if defined(CONFIG_SYS_EEPROM_WREN ) -int eeprom_write_enable (unsigned dev_addr,int state) +int eeprom_write_enable (unsigned int dev_addr,int state) {kw_gpio_set_value (KM_KIRKWOOD_ENV_WP , !state);include/configs/km/keymile-common.h +2
-2@@ -184,9 +184,9 @@"cramfsloadfdt=" \"cramfsload ${fdt_addr_r} " \"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "fdt_addr_r="__stringify(CONFIG_KM_FDT_ADDR) "\0" \ + "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \"init=/sbin/init-overlay.sh\0" \ - "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ + "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \"load=tftpboot ${load_addr_r} ${u-boot}\0" \"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \include/configs/km/km_arm.h +0
-0
include/configs/km/km_arm.h line 54
Quoted 8 lines
include/configs/km/km_arm.h +1
-1@@ -48,7 +48,7 @@" boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}" #define CONFIG_KM_DEF_ENV_CPU \ -"u-boot=" CONFIG_HOSTNAME "/u-boot.kwb\0" \ +"u-boot=" CONFIG_HOSTNAME "/u-boot.kwb\0" \CONFIG_KM_UPDATE_UBOOT \"set_fdthigh=setenv fdt_high ${kernelmem}\0" \"checkfdt=" \
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 1/1 km/arm: coding style clean up
In reply to Holger BrunckQuoted 7 lines · Holger Brunck
Address most of the checkpatch issues we found in
km_armand common km code.CC Stefan Roese <[email protected]>CC Valentin Longchamp <[email protected]>Signed-off-by Holger Brunck <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201202/17dbbac6/attachment.sig>