mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
Coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
46919751ea
commit
5728be389e
11 changed files with 931 additions and 116 deletions
|
@ -1017,7 +1017,7 @@ static int short_mem_test(void)
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < NUMMEMTESTS; i++) {
|
for (i = 0; i < NUMMEMTESTS; i++) {
|
||||||
for (j = 0; j < NUMMEMWORDS; j++) {
|
for (j = 0; j < NUMMEMWORDS; j++) {
|
||||||
//printf("bank enabled base:%x\n", &membase[j]);
|
/*printf("bank enabled base:%x\n", &membase[j]);*/
|
||||||
membase[j] = test[i][j];
|
membase[j] = test[i][j];
|
||||||
ppcDcbf((unsigned long)&(membase[j]));
|
ppcDcbf((unsigned long)&(membase[j]));
|
||||||
}
|
}
|
||||||
|
|
|
@ -899,36 +899,36 @@ static void tsec_halt(struct eth_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct phy_info phy_info_M88E1149S = {
|
struct phy_info phy_info_M88E1149S = {
|
||||||
0x1410ca,
|
0x1410ca,
|
||||||
"Marvell 88E1149S",
|
"Marvell 88E1149S",
|
||||||
4,
|
4,
|
||||||
(struct phy_cmd[]){ /* config */
|
(struct phy_cmd[]){ /* config */
|
||||||
/* Reset and configure the PHY */
|
/* Reset and configure the PHY */
|
||||||
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
|
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
|
||||||
{0x1d, 0x1f, NULL},
|
{0x1d, 0x1f, NULL},
|
||||||
{0x1e, 0x200c, NULL},
|
{0x1e, 0x200c, NULL},
|
||||||
{0x1d, 0x5, NULL},
|
{0x1d, 0x5, NULL},
|
||||||
{0x1e, 0x0, NULL},
|
{0x1e, 0x0, NULL},
|
||||||
{0x1e, 0x100, NULL},
|
{0x1e, 0x100, NULL},
|
||||||
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
|
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
|
||||||
{MIIM_ANAR, MIIM_ANAR_INIT, NULL},
|
{MIIM_ANAR, MIIM_ANAR_INIT, NULL},
|
||||||
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
|
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
|
||||||
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
|
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
|
||||||
{miim_end,}
|
{miim_end,}
|
||||||
},
|
},
|
||||||
(struct phy_cmd[]){ /* startup */
|
(struct phy_cmd[]){ /* startup */
|
||||||
/* Status is read once to clear old link state */
|
/* Status is read once to clear old link state */
|
||||||
{MIIM_STATUS, miim_read, NULL},
|
{MIIM_STATUS, miim_read, NULL},
|
||||||
/* Auto-negotiate */
|
/* Auto-negotiate */
|
||||||
{MIIM_STATUS, miim_read, &mii_parse_sr},
|
{MIIM_STATUS, miim_read, &mii_parse_sr},
|
||||||
/* Read the status */
|
/* Read the status */
|
||||||
{MIIM_88E1011_PHY_STATUS, miim_read,
|
{MIIM_88E1011_PHY_STATUS, miim_read,
|
||||||
&mii_parse_88E1011_psr},
|
&mii_parse_88E1011_psr},
|
||||||
{miim_end,}
|
{miim_end,}
|
||||||
},
|
},
|
||||||
(struct phy_cmd[]){ /* shutdown */
|
(struct phy_cmd[]){ /* shutdown */
|
||||||
{miim_end,}
|
{miim_end,}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */
|
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */
|
||||||
|
@ -1351,7 +1351,7 @@ struct phy_info *phy_info[] = {
|
||||||
&phy_info_M88E1011S,
|
&phy_info_M88E1011S,
|
||||||
&phy_info_M88E1111S,
|
&phy_info_M88E1111S,
|
||||||
&phy_info_M88E1145,
|
&phy_info_M88E1145,
|
||||||
&phy_info_M88E1149S,
|
&phy_info_M88E1149S,
|
||||||
&phy_info_dm9161,
|
&phy_info_dm9161,
|
||||||
&phy_info_lxt971,
|
&phy_info_lxt971,
|
||||||
&phy_info_VSC8244,
|
&phy_info_VSC8244,
|
||||||
|
|
|
@ -563,8 +563,6 @@
|
||||||
#define CONFIG_POST CFG_POST_RTC
|
#define CONFIG_POST CFG_POST_RTC
|
||||||
#define CFG_NIOS_POST_WORD_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
|
#define CFG_NIOS_POST_WORD_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BOOTP options
|
* BOOTP options
|
||||||
*/
|
*/
|
||||||
|
@ -585,7 +583,7 @@
|
||||||
#undef CONFIG_CMD_DOC
|
#undef CONFIG_CMD_DOC
|
||||||
#undef CONFIG_CMD_DTT
|
#undef CONFIG_CMD_DTT
|
||||||
#undef CONFIG_CMD_EEPROM
|
#undef CONFIG_CMD_EEPROM
|
||||||
#undef CONFIG_CMD_ELF
|
#undef CONFIG_CMD_ELF
|
||||||
#undef CONFIG_CMD_FAT
|
#undef CONFIG_CMD_FAT
|
||||||
#undef CONFIG_CMD_FDC
|
#undef CONFIG_CMD_FDC
|
||||||
#undef CONFIG_CMD_FDOS
|
#undef CONFIG_CMD_FDOS
|
||||||
|
@ -610,7 +608,6 @@
|
||||||
#undef CONFIG_CMD_DATE
|
#undef CONFIG_CMD_DATE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/*------------------------------------------------------------------------
|
/*------------------------------------------------------------------------
|
||||||
* KGDB
|
* KGDB
|
||||||
*----------------------------------------------------------------------*/
|
*----------------------------------------------------------------------*/
|
||||||
|
@ -657,7 +654,6 @@
|
||||||
#undef CFG_LOAD_ADDR /* force error break */
|
#undef CFG_LOAD_ADDR /* force error break */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* MEM test area */
|
/* MEM test area */
|
||||||
#if (CFG_SDRAM_SIZE != 0)
|
#if (CFG_SDRAM_SIZE != 0)
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
#define CONFIG_CMD_I2C
|
#define CONFIG_CMD_I2C
|
||||||
#define CONFIG_CMD_MII
|
#define CONFIG_CMD_MII
|
||||||
#define CONFIG_CMD_PING
|
#define CONFIG_CMD_PING
|
||||||
#define CONFIG_CMD_EEPROM
|
#define CONFIG_CMD_EEPROM
|
||||||
|
|
||||||
#define CONFIG_MAC_PARTITION
|
#define CONFIG_MAC_PARTITION
|
||||||
#define CONFIG_DOS_PARTITION
|
#define CONFIG_DOS_PARTITION
|
||||||
|
|
|
@ -67,10 +67,10 @@
|
||||||
*/
|
*/
|
||||||
#include <config_cmd_default.h>
|
#include <config_cmd_default.h>
|
||||||
|
|
||||||
#define CONFIG_CMD_DHCP
|
#define CONFIG_CMD_DHCP
|
||||||
#define CONFIG_CMD_IMMAP
|
#define CONFIG_CMD_IMMAP
|
||||||
#define CONFIG_CMD_MII
|
#define CONFIG_CMD_MII
|
||||||
#define CONFIG_CMD_PING
|
#define CONFIG_CMD_PING
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_BOOTDELAY 5 /* Autoboot after 5 seconds */
|
#define CONFIG_BOOTDELAY 5 /* Autoboot after 5 seconds */
|
||||||
|
|
|
@ -84,10 +84,10 @@
|
||||||
|
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_JFFS2
|
#define CONFIG_CMD_JFFS2
|
||||||
#define CONFIG_CMD_SCSI
|
#define CONFIG_CMD_SCSI
|
||||||
#define CONFIG_CMD_IDE
|
#define CONFIG_CMD_IDE
|
||||||
#define CONFIG_CMD_DATE
|
#define CONFIG_CMD_DATE
|
||||||
#define CONFIG_CMD_FDC
|
#define CONFIG_CMD_FDC
|
||||||
#define CONFIG_CMD_ELF
|
#define CONFIG_CMD_ELF
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -192,7 +192,7 @@
|
||||||
#ifdef CONFIG_BC3450_USB
|
#ifdef CONFIG_BC3450_USB
|
||||||
#define CONFIG_CMD_USB
|
#define CONFIG_CMD_USB
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
#include <config_cmd_default.h>
|
#include <config_cmd_default.h>
|
||||||
|
|
||||||
#define CONFIG_CMD_IRQ
|
#define CONFIG_CMD_IRQ
|
||||||
#define CONFIG_CMD_EEPROM
|
#define CONFIG_CMD_EEPROM
|
||||||
|
|
||||||
#undef CONFIG_CMD_NET
|
#undef CONFIG_CMD_NET
|
||||||
|
|
||||||
|
|
|
@ -148,18 +148,18 @@
|
||||||
*/
|
*/
|
||||||
#include <config_cmd_default.h>
|
#include <config_cmd_default.h>
|
||||||
|
|
||||||
#define CONFIG_CMD_ASKENV
|
#define CONFIG_CMD_ASKENV
|
||||||
#define CONFIG_CMD_I2C
|
#define CONFIG_CMD_I2C
|
||||||
#define CONFIG_CMD_CACHE
|
#define CONFIG_CMD_CACHE
|
||||||
#define CONFIG_CMD_EEPROM
|
#define CONFIG_CMD_EEPROM
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_ELF
|
#define CONFIG_CMD_ELF
|
||||||
#define CONFIG_CMD_DATE
|
#define CONFIG_CMD_DATE
|
||||||
#define CONFIG_CMD_NET
|
#define CONFIG_CMD_NET
|
||||||
#define CONFIG_CMD_PING
|
#define CONFIG_CMD_PING
|
||||||
#define CONFIG_CMD_IDE
|
#define CONFIG_CMD_IDE
|
||||||
#define CONFIG_CMD_FAT
|
#define CONFIG_CMD_FAT
|
||||||
#define CONFIG_CMD_EXT2
|
#define CONFIG_CMD_EXT2
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_DOS_PARTITION
|
#define CONFIG_DOS_PARTITION
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
*/
|
*/
|
||||||
#include <config_cmd_default.h>
|
#include <config_cmd_default.h>
|
||||||
|
|
||||||
#define CONFIG_CMD_BEDBUG
|
#define CONFIG_CMD_BEDBUG
|
||||||
#define CONFIG_CMD_DHCP
|
#define CONFIG_CMD_DHCP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_NFS
|
#define CONFIG_CMD_NFS
|
||||||
|
|
Loading…
Add table
Reference in a new issue