Coding Style cleanup; update CHANGELOG, prepare -rc1
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
246c69225c
commit
4946775c6d
4
Makefile
4
Makefile
|
@ -22,9 +22,9 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION = 2009
|
VERSION = 2009
|
||||||
PATCHLEVEL = 08
|
PATCHLEVEL = 11
|
||||||
SUBLEVEL =
|
SUBLEVEL =
|
||||||
EXTRAVERSION =
|
EXTRAVERSION = -rc1
|
||||||
ifneq "$(SUBLEVEL)" ""
|
ifneq "$(SUBLEVEL)" ""
|
||||||
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||||
else
|
else
|
||||||
|
|
|
@ -28,4 +28,3 @@ int board_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -268,4 +268,3 @@ void ft_board_setup(void *blob, bd_t *bd)
|
||||||
ft_cpu_setup( blob, bd);
|
ft_cpu_setup( blob, bd);
|
||||||
}
|
}
|
||||||
#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
|
#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ include $(SRCTREE)/rules.mk
|
||||||
sinclude $(obj).depend
|
sinclude $(obj).depend
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
|
|
|
@ -328,4 +328,3 @@ void mx27_sd2_init_pins(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_MXC_MMC */
|
#endif /* CONFIG_MXC_MMC */
|
||||||
|
|
||||||
|
|
|
@ -414,4 +414,3 @@ fiq:
|
||||||
bl do_fiq
|
bl do_fiq
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -35,22 +35,22 @@
|
||||||
li r3,vector_offset@l; \
|
li r3,vector_offset@l; \
|
||||||
mtspr SPRN_GIVOR##vector_number,r3;
|
mtspr SPRN_GIVOR##vector_number,r3;
|
||||||
|
|
||||||
SET_IVOR(0, 0x020) /* Critical Input */
|
SET_IVOR(0, 0x020) /* Critical Input */
|
||||||
SET_IVOR(1, 0x000) /* Machine Check */
|
SET_IVOR(1, 0x000) /* Machine Check */
|
||||||
SET_IVOR(2, 0x060) /* Data Storage */
|
SET_IVOR(2, 0x060) /* Data Storage */
|
||||||
SET_IVOR(3, 0x080) /* Instruction Storage */
|
SET_IVOR(3, 0x080) /* Instruction Storage */
|
||||||
SET_IVOR(4, 0x0a0) /* External Input */
|
SET_IVOR(4, 0x0a0) /* External Input */
|
||||||
SET_IVOR(5, 0x0c0) /* Alignment */
|
SET_IVOR(5, 0x0c0) /* Alignment */
|
||||||
SET_IVOR(6, 0x0e0) /* Program */
|
SET_IVOR(6, 0x0e0) /* Program */
|
||||||
SET_IVOR(7, 0x100) /* FP Unavailable */
|
SET_IVOR(7, 0x100) /* FP Unavailable */
|
||||||
SET_IVOR(8, 0x120) /* System Call */
|
SET_IVOR(8, 0x120) /* System Call */
|
||||||
SET_IVOR(9, 0x140) /* Auxiliary Processor Unavailable */
|
SET_IVOR(9, 0x140) /* Auxiliary Processor Unavailable */
|
||||||
SET_IVOR(10, 0x160) /* Decrementer */
|
SET_IVOR(10, 0x160) /* Decrementer */
|
||||||
SET_IVOR(11, 0x180) /* Fixed Interval Timer */
|
SET_IVOR(11, 0x180) /* Fixed Interval Timer */
|
||||||
SET_IVOR(12, 0x1a0) /* Watchdog Timer */
|
SET_IVOR(12, 0x1a0) /* Watchdog Timer */
|
||||||
SET_IVOR(13, 0x1c0) /* Data TLB Error */
|
SET_IVOR(13, 0x1c0) /* Data TLB Error */
|
||||||
SET_IVOR(14, 0x1e0) /* Instruction TLB Error */
|
SET_IVOR(14, 0x1e0) /* Instruction TLB Error */
|
||||||
SET_IVOR(15, 0x040) /* Debug */
|
SET_IVOR(15, 0x040) /* Debug */
|
||||||
|
|
||||||
/* e500v1 & e500v2 only */
|
/* e500v1 & e500v2 only */
|
||||||
#ifndef CONFIG_E500MC
|
#ifndef CONFIG_E500MC
|
||||||
|
@ -59,21 +59,21 @@
|
||||||
SET_IVOR(34, 0x240) /* Embedded FP Round */
|
SET_IVOR(34, 0x240) /* Embedded FP Round */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SET_IVOR(35, 0x260) /* Performance monitor */
|
SET_IVOR(35, 0x260) /* Performance monitor */
|
||||||
|
|
||||||
/* e500mc only */
|
/* e500mc only */
|
||||||
#ifdef CONFIG_E500MC
|
#ifdef CONFIG_E500MC
|
||||||
SET_IVOR(36, 0x280) /* Processor doorbell */
|
SET_IVOR(36, 0x280) /* Processor doorbell */
|
||||||
SET_IVOR(37, 0x2a0) /* Processor doorbell critical */
|
SET_IVOR(37, 0x2a0) /* Processor doorbell critical */
|
||||||
SET_IVOR(38, 0x2c0) /* Guest Processor doorbell */
|
SET_IVOR(38, 0x2c0) /* Guest Processor doorbell */
|
||||||
SET_IVOR(39, 0x2e0) /* Guest Processor critical & machine check */
|
SET_IVOR(39, 0x2e0) /* Guest Processor critical & machine check */
|
||||||
SET_IVOR(40, 0x300) /* Hypervisor system call */
|
SET_IVOR(40, 0x300) /* Hypervisor system call */
|
||||||
SET_IVOR(41, 0x320) /* Hypervisor Priviledge */
|
SET_IVOR(41, 0x320) /* Hypervisor Priviledge */
|
||||||
|
|
||||||
SET_GIVOR(2, 0x060) /* Guest Data Storage */
|
SET_GIVOR(2, 0x060) /* Guest Data Storage */
|
||||||
SET_GIVOR(3, 0x080) /* Guest Instruction Storage */
|
SET_GIVOR(3, 0x080) /* Guest Instruction Storage */
|
||||||
SET_GIVOR(4, 0x0a0) /* Guest External Input */
|
SET_GIVOR(4, 0x0a0) /* Guest External Input */
|
||||||
SET_GIVOR(8, 0x120) /* Guest System Call */
|
SET_GIVOR(8, 0x120) /* Guest System Call */
|
||||||
SET_GIVOR(13, 0x1c0) /* Guest Data TLB Error */
|
SET_GIVOR(13, 0x1c0) /* Guest Data TLB Error */
|
||||||
SET_GIVOR(14, 0x1e0) /* Guest Instruction TLB Error */
|
SET_GIVOR(14, 0x1e0) /* Guest Instruction TLB Error */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -6,7 +6,7 @@ buses are implemented via bit-banging mode.
|
||||||
The driver requires that the following macros should be defined into the board
|
The driver requires that the following macros should be defined into the board
|
||||||
configuration file:
|
configuration file:
|
||||||
|
|
||||||
CONFIG_BITBANGMII - Enable the miiphybb driver
|
CONFIG_BITBANGMII - Enable the miiphybb driver
|
||||||
CONFIG_BITBANGMII_MULTI - Enable the multi bus support
|
CONFIG_BITBANGMII_MULTI - Enable the multi bus support
|
||||||
|
|
||||||
If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs
|
If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs
|
||||||
|
@ -19,7 +19,7 @@ MDIO_TRISTATE - Activate the MDIO pin as input/tristate pin
|
||||||
MDIO_READ - Read the MDIO pin
|
MDIO_READ - Read the MDIO pin
|
||||||
MDIO(v) - Write v on the MDIO pin
|
MDIO(v) - Write v on the MDIO pin
|
||||||
MDC_DECLARE - Declaration needed to access to the MDC pin (optional)
|
MDC_DECLARE - Declaration needed to access to the MDC pin (optional)
|
||||||
MDC(v) - Write v on the MDC pin
|
MDC(v) - Write v on the MDC pin
|
||||||
|
|
||||||
The previous macros make the driver compatible with the previous version
|
The previous macros make the driver compatible with the previous version
|
||||||
(that didn't support the multi-bus).
|
(that didn't support the multi-bus).
|
||||||
|
@ -30,17 +30,17 @@ the bb_miiphy_buses_num variable with the number of mii buses.
|
||||||
The record (struct bb_miiphy_bus) has the following fields/callbacks (see
|
The record (struct bb_miiphy_bus) has the following fields/callbacks (see
|
||||||
miiphy.h for details):
|
miiphy.h for details):
|
||||||
|
|
||||||
char name[] - The symbolic name that must be equal to the MII bus
|
char name[] - The symbolic name that must be equal to the MII bus
|
||||||
registered name
|
registered name
|
||||||
int (*init)() - Initialization function called at startup time (just
|
int (*init)() - Initialization function called at startup time (just
|
||||||
before the Ethernet initialization)
|
before the Ethernet initialization)
|
||||||
int (*mdio_active)() - Activate the MDIO pin as output
|
int (*mdio_active)() - Activate the MDIO pin as output
|
||||||
int (*mdio_tristate)() - Activate the MDIO pin as input/tristate pin
|
int (*mdio_tristate)() - Activate the MDIO pin as input/tristate pin
|
||||||
int (*set_mdio)() - Write the MDIO pin
|
int (*set_mdio)() - Write the MDIO pin
|
||||||
int (*get_mdio)() - Read the MDIO pin
|
int (*get_mdio)() - Read the MDIO pin
|
||||||
int (*set_mdc)() - Write the MDC pin
|
int (*set_mdc)() - Write the MDC pin
|
||||||
int (*delay)() - Delay function
|
int (*delay)() - Delay function
|
||||||
void *priv - Private data used by board specific code
|
void *priv - Private data used by board specific code
|
||||||
|
|
||||||
The board code will look like:
|
The board code will look like:
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
|
||||||
...
|
...
|
||||||
};
|
};
|
||||||
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
|
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
|
||||||
sizeof(bb_miiphy_buses[0]);
|
sizeof(bb_miiphy_buses[0]);
|
||||||
|
|
||||||
2009 Industrie Dial Face S.p.A.
|
2009 Industrie Dial Face S.p.A.
|
||||||
Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
|
Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
|
||||||
|
|
|
@ -88,7 +88,7 @@ The return value for this function should be as follows:
|
||||||
< 0 - failure (hardware failure, not probe failure)
|
< 0 - failure (hardware failure, not probe failure)
|
||||||
>=0 - number of interfaces detected
|
>=0 - number of interfaces detected
|
||||||
|
|
||||||
You might notice that many drivers seem to use xxx_initialize() rather than
|
You might notice that many drivers seem to use xxx_initialize() rather than
|
||||||
xxx_register(). This is the old naming convention and should be avoided as it
|
xxx_register(). This is the old naming convention and should be avoided as it
|
||||||
causes confusion with the driver-specific init function.
|
causes confusion with the driver-specific init function.
|
||||||
|
|
||||||
|
|
|
@ -17,12 +17,12 @@ Command syntax:
|
||||||
to list the kwb image file details
|
to list the kwb image file details
|
||||||
|
|
||||||
./tools/mkimage -n <board specific configuration file> \
|
./tools/mkimage -n <board specific configuration file> \
|
||||||
-T kwbimage -a <start address> -e <execution address> \
|
-T kwbimage -a <start address> -e <execution address> \
|
||||||
-d <input_raw_binary> <output_kwboot_file>
|
-d <input_raw_binary> <output_kwboot_file>
|
||||||
|
|
||||||
for ex.
|
for ex.
|
||||||
./tools/mkimage -n ./board/Marvell/openrd_base/kwbimage.cfg \
|
./tools/mkimage -n ./board/Marvell/openrd_base/kwbimage.cfg \
|
||||||
-T kwbimage -a 0x00600000 -e 0x00600000 \
|
-T kwbimage -a 0x00600000 -e 0x00600000 \
|
||||||
-d u-boot.bin u-boot.kwb
|
-d u-boot.bin u-boot.kwb
|
||||||
|
|
||||||
kwimage support available with mkimage utility will generate kirkwood boot
|
kwimage support available with mkimage utility will generate kirkwood boot
|
||||||
|
|
|
@ -119,7 +119,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
|
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
|
||||||
sizeof(bb_miiphy_buses[0]);
|
sizeof(bb_miiphy_buses[0]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void bb_miiphy_init(void)
|
void bb_miiphy_init(void)
|
||||||
|
@ -167,7 +167,7 @@ static inline struct bb_miiphy_bus *bb_miiphy_getbus(char *devname)
|
||||||
* and write).
|
* and write).
|
||||||
*/
|
*/
|
||||||
static void miiphy_pre(struct bb_miiphy_bus *bus, char read,
|
static void miiphy_pre(struct bb_miiphy_bus *bus, char read,
|
||||||
unsigned char addr, unsigned char reg)
|
unsigned char addr, unsigned char reg)
|
||||||
{
|
{
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
|
@ -247,7 +247,7 @@ static void miiphy_pre(struct bb_miiphy_bus *bus, char read,
|
||||||
* 0 on success
|
* 0 on success
|
||||||
*/
|
*/
|
||||||
int bb_miiphy_read(char *devname, unsigned char addr,
|
int bb_miiphy_read(char *devname, unsigned char addr,
|
||||||
unsigned char reg, unsigned short *value)
|
unsigned char reg, unsigned short *value)
|
||||||
{
|
{
|
||||||
short rdreg; /* register working value */
|
short rdreg; /* register working value */
|
||||||
int v;
|
int v;
|
||||||
|
@ -328,7 +328,7 @@ int bb_miiphy_read(char *devname, unsigned char addr,
|
||||||
* 0 on success
|
* 0 on success
|
||||||
*/
|
*/
|
||||||
int bb_miiphy_write (char *devname, unsigned char addr,
|
int bb_miiphy_write (char *devname, unsigned char addr,
|
||||||
unsigned char reg, unsigned short value)
|
unsigned char reg, unsigned short value)
|
||||||
{
|
{
|
||||||
struct bb_miiphy_bus *bus;
|
struct bb_miiphy_bus *bus;
|
||||||
int j; /* counter */
|
int j; /* counter */
|
||||||
|
|
|
@ -148,7 +148,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)
|
||||||
{
|
{
|
||||||
struct chip_id *id = dev->priv;
|
struct chip_id *id = dev->priv;
|
||||||
|
|
||||||
printf(DRIVERNAME ": detected %s controller\n", id->name);
|
printf(DRIVERNAME ": detected %s controller\n", id->name);
|
||||||
|
|
||||||
smc911x_reset(dev);
|
smc911x_reset(dev);
|
||||||
|
|
||||||
|
|
|
@ -50,4 +50,3 @@ struct davinci_gpio_bank {
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
* shorted - index 1
|
* shorted - index 1
|
||||||
*/
|
*/
|
||||||
#define CONFIG_CONS_INDEX 1
|
#define CONFIG_CONS_INDEX 1
|
||||||
//#define CONFIG_CONS_INDEX 2
|
|
||||||
#undef CONFIG_SERIAL_SOFTWARE_FIFO
|
#undef CONFIG_SERIAL_SOFTWARE_FIFO
|
||||||
#define CONFIG_SYS_NS16550
|
#define CONFIG_SYS_NS16550
|
||||||
#define CONFIG_SYS_NS16550_SERIAL
|
#define CONFIG_SYS_NS16550_SERIAL
|
||||||
|
|
|
@ -129,4 +129,3 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue