Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix remaining CONFIG_COMMANDS

Browse Source 
update comments
Fix coding style

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
master
Jean-Christophe PLAGNIOL-VILLARD 17 years ago committed by Wolfgang Denk
parent 0c9d42e6b0
commit 1b76988175
14 changed files with 26 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      api/api_storage.c
  2. 2
      board/BuS/EB+MCF-EV123/mii.c
  3. 2
      board/cobra5272/mii.c
  4. 2
      board/idmr/mii.c
  5. 2
      board/m5271evb/mii.c
  6. 2
      board/m5272c3/mii.c
  7. 2
      board/m5282evb/mii.c
  8. 2
      drivers/net/cs8900.c
  9. 2
      drivers/net/lan91c96.c
  10. 4
      drivers/net/netarm_eth.c
  11. 7
      drivers/net/rtl8019.c
  12. 5
      drivers/rtc/rx8025.c
  13. 2
      include/configs/munices.h
  14. 2
      include/configs/trizepsiv.h

6
api/api_storage.c
Unescape View File

@ -61,21 +61,21 @@ static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
void dev_stor_init(void)
{
#if (CONFIG_COMMANDS & CFG_CMD_IDE)
#if defined(CONFIG_CMD_IDE)
specs[ENUM_IDE].max_dev = CFG_IDE_MAXDEVICE;
specs[ENUM_IDE].enum_started = 0;
specs[ENUM_IDE].enum_ended = 0;
specs[ENUM_IDE].type = DEV_TYP_STOR | DT_STOR_IDE;
specs[ENUM_IDE].name = "ide";
#endif
#if (CONFIG_COMMANDS & CFG_CMD_USB)
#if defined(CONFIG_CMD_USB)
specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
specs[ENUM_USB].enum_started = 0;
specs[ENUM_USB].enum_ended = 0;
specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB;
specs[ENUM_USB].name = "usb";
#endif
#if (CONFIG_COMMANDS & CFG_CMD_SCSI)
#if defined(CONFIG_CMD_SCSI)
specs[ENUM_SCSI].max_dev = CFG_SCSI_MAX_DEVICE;
specs[ENUM_SCSI].enum_started = 0;
specs[ENUM_SCSI].enum_ended = 0;

2
board/BuS/EB+MCF-EV123/mii.c
Unescape View File

@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)

2
board/cobra5272/mii.c
Unescape View File

@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)

2
board/idmr/mii.c
Unescape View File

@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)

2
board/m5271evb/mii.c
Unescape View File

@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)

2
board/m5272c3/mii.c
Unescape View File

@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)

2
board/m5282evb/mii.c
Unescape View File

@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd)
return (mii_reply & 0xffff); /* data read from phy */
}
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
#if defined(CFG_DISCOVER_PHY)
int mii_discover_phy(struct eth_device *dev)

2
drivers/net/cs8900.c
Unescape View File

@ -317,6 +317,6 @@ int cs8900_e2prom_write(unsigned char addr, unsigned short value)
return 0;
}
#endif /* COMMANDS & CFG_NET */
#endif /* CONFIG_CMD_NET */
#endif /* CONFIG_DRIVER_CS8900 */

2
drivers/net/lan91c96.c
Unescape View File

@ -865,7 +865,7 @@ static int smc_hw_init ()
}
#endif /* 0 */
#endif /* COMMANDS & CFG_NET */
#endif /* CONFIG_CMD_NET */
/* smc_get_ethaddr (bd_t * bd)

4
drivers/net/netarm_eth.c
Unescape View File

@ -29,7 +29,6 @@
#include "netarm_eth.h"
#include <asm/arch/netarm_registers.h>
#if defined(CONFIG_CMD_NET)
static int na_mii_poll_busy (void);
@ -56,7 +55,6 @@ static void na_get_mac_addr (void)
setenv ("ethaddr", ethaddr);
}
static void na_mii_write (int reg, int value)
{
int mii_addr;
@ -355,6 +353,6 @@ extern int eth_send (volatile void *packet, int length)
return 1;
}
#endif /* COMMANDS & CFG_NET */
#endif /* CONFIG_CMD_NET */
#endif /* CONFIG_DRIVER_NETARMETH */

7
drivers/net/rtl8019.c
Unescape View File

@ -36,16 +36,13 @@
#if defined(CONFIG_CMD_NET)
/* packet page register access functions */
static unsigned char get_reg (unsigned int regno)
{
return (*(unsigned char *) regno);
}
static void put_reg (unsigned int regno, unsigned char val)
{
*(volatile unsigned char *) regno = val;
@ -91,7 +88,6 @@ void rtl8019_get_enetaddr (uchar * addr)
put_reg (RTL8019_COMMAND, RTL8019_PAGE0);
}
void eth_halt (void)
{
put_reg (RTL8019_COMMAND, 0x01);
@ -134,7 +130,6 @@ int eth_init (bd_t * bd)
return 0;
}
static unsigned char nic_to_pc (void)
{
unsigned char rec_head_status;
@ -277,6 +272,6 @@ extern int eth_send (volatile void *packet, int length)
return 0;
}
#endif /* COMMANDS & CFG_NET */
#endif /* CONFIG_CMD_NET */
#endif /* CONFIG_DRIVER_RTL8019 */

5
drivers/rtc/rx8025.c
Unescape View File

@ -142,7 +142,6 @@ void rtc_get (struct rtc_time *tmp)
tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
}
/*
* Set the RTC
*/
@ -166,7 +165,6 @@ void rtc_set (struct rtc_time *tmp)
rtc_write (RTC_CTL1_REG_ADDR, RTC_CTL1_BIT_2412);
}
/*
* Reset the RTC. We setting the date back to 1970-01-01.
*/
@ -200,7 +198,6 @@ void rtc_reset (void)
return;
}
/*
* Helper functions
*/
@ -224,4 +221,4 @@ static unsigned char bin2bcd (unsigned int n)
return (((n / 10) << 4) | (n % 10));
}
#endif /* CONFIG_RTC_RX8025 && (CFG_COMMANDS & CFG_CMD_DATE) */
#endif /* CONFIG_RTC_RX8025 && CONFIG_CMD_DATE */

2
include/configs/munices.h
Unescape View File

@ -48,7 +48,7 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif

2
include/configs/trizepsiv.h
Unescape View File

@ -140,7 +140,7 @@
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
/* #define CONFIG_INITRD_TAG 1 */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif

Write Preview
Loading…
Cancel
Save