mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 22:51:37 +00:00
Coding style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
a48ecc969f
commit
8e5e9b940c
14 changed files with 3405 additions and 57 deletions
|
@ -333,18 +333,18 @@ int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
U_BOOT_CMD(mtc, 5, 1, cmd_mtc,
|
U_BOOT_CMD(mtc, 5, 1, cmd_mtc,
|
||||||
"mtc - special commands for digsyMTC\n",
|
"mtc - special commands for digsyMTC\n",
|
||||||
"[subcommand] [args...]\n"
|
"[subcommand] [args...]\n"
|
||||||
"Subcommands list:\n"
|
"Subcommands list:\n"
|
||||||
"led [ledname] [state] [blink] - set state of leds\n"
|
"led [ledname] [state] [blink] - set state of leds\n"
|
||||||
" [ledname]: diag can1 can2 can3 can4 usbpwr usbbusy user1 user2\n"
|
" [ledname]: diag can1 can2 can3 can4 usbpwr usbbusy user1 user2\n"
|
||||||
" [state]: off red green orange\n"
|
" [state]: off red green orange\n"
|
||||||
" [blink]: blink interval in 100ms steps (1 - 10; 0 = static)\n"
|
" [blink]: blink interval in 100ms steps (1 - 10; 0 = static)\n"
|
||||||
"key - returns state of user key\n"
|
"key - returns state of user key\n"
|
||||||
"version - returns firmware version of supervisor uC\n"
|
"version - returns firmware version of supervisor uC\n"
|
||||||
"appreg - reads appreg value and stores in environment variable"
|
"appreg - reads appreg value and stores in environment variable"
|
||||||
" 'appreg'\n"
|
" 'appreg'\n"
|
||||||
"digin [channel] - returns state of digital input (1 or 2)\n"
|
"digin [channel] - returns state of digital input (1 or 2)\n"
|
||||||
"digout <on|off> <on|off> - sets state of two digital outputs\n"
|
"digout <on|off> <on|off> - sets state of two digital outputs\n"
|
||||||
"help [subcommand] - get help for subcommand\n");
|
"help [subcommand] - get help for subcommand\n"
|
||||||
|
);
|
||||||
|
|
|
@ -101,28 +101,28 @@ int checkboard (void)
|
||||||
id1 = trans[(~(in_be32((void *)GPIO0_IR) >> 5)) & 0x0000000f];
|
id1 = trans[(~(in_be32((void *)GPIO0_IR) >> 5)) & 0x0000000f];
|
||||||
id2 = trans[(~(in_be32((void *)GPIO0_IR) >> 9)) & 0x0000000f];
|
id2 = trans[(~(in_be32((void *)GPIO0_IR) >> 9)) & 0x0000000f];
|
||||||
|
|
||||||
rev = in_8((void *)0xf0001000);
|
rev = in_8((void *)0xf0001000);
|
||||||
if (rev & 0x10) /* old DP405 compatibility */
|
if (rev & 0x10) /* old DP405 compatibility */
|
||||||
rev = in_8((void *)0xf0000800);
|
rev = in_8((void *)0xf0000800);
|
||||||
|
|
||||||
switch (rev & 0xc0) {
|
switch (rev & 0xc0) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
puts(" (HW=DP405");
|
puts(" (HW=DP405");
|
||||||
break;
|
break;
|
||||||
case 0x80:
|
case 0x80:
|
||||||
puts(" (HW=DP405/CO");
|
puts(" (HW=DP405/CO");
|
||||||
break;
|
break;
|
||||||
case 0xc0:
|
case 0xc0:
|
||||||
puts(" (HW=DN405");
|
puts(" (HW=DN405");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
printf(", ID=0x%1X%1X, PLD=0x%02X", id2, id1, rev & 0x0f);
|
printf(", ID=0x%1X%1X, PLD=0x%02X", id2, id1, rev & 0x0f);
|
||||||
|
|
||||||
if ((rev & 0xc0) == 0xc0) {
|
if ((rev & 0xc0) == 0xc0) {
|
||||||
printf(", C5V=%s",
|
printf(", C5V=%s",
|
||||||
in_be32((void *)GPIO0_IR) & 0x40000000 ? "off" : "on");
|
in_be32((void *)GPIO0_IR) & 0x40000000 ? "off" : "on");
|
||||||
}
|
}
|
||||||
puts(")\n");
|
puts(")\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -238,4 +238,3 @@ void imx_gpio_mode(int gpio_mode)
|
||||||
®s->port[port].iconfb2);
|
®s->port[port].iconfb2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ void set_timer (ulong t)
|
||||||
timestamp = time_to_tick(t);
|
timestamp = time_to_tick(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* delay x useconds AND perserve advance timstamp value */
|
/* delay x useconds AND preserve advance timstamp value */
|
||||||
void udelay (unsigned long usec)
|
void udelay (unsigned long usec)
|
||||||
{
|
{
|
||||||
unsigned long long tmp;
|
unsigned long long tmp;
|
||||||
|
@ -188,4 +188,3 @@ void udelay (unsigned long usec)
|
||||||
while (get_ticks() < tmp) /* loop till event */
|
while (get_ticks() < tmp) /* loop till event */
|
||||||
/*NOP*/;
|
/*NOP*/;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,4 +78,3 @@ static void cache_flush(void)
|
||||||
{
|
{
|
||||||
asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
|
asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -93,4 +93,3 @@ void l2_cache_disable(void)
|
||||||
__asm__ __volatile__("mov r12, %0":"=r"(j));
|
__asm__ __volatile__("mov r12, %0":"=r"(j));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ The first step is to define CONFIG_STATUS_LED in the board config file.
|
||||||
If the LED support is only for a single board, define CONFIG_BOARD_SPECIFIC_LED
|
If the LED support is only for a single board, define CONFIG_BOARD_SPECIFIC_LED
|
||||||
in the board config file.
|
in the board config file.
|
||||||
|
|
||||||
At a minimum, these macros must be defined at
|
At a minimum, these macros must be defined at
|
||||||
STATUS_LED_BIT
|
STATUS_LED_BIT
|
||||||
STATUS_LED_STATE
|
STATUS_LED_STATE
|
||||||
STATUS_LED_PERIOD
|
STATUS_LED_PERIOD
|
||||||
|
@ -20,7 +20,7 @@ STATUS_LED_BIT<n>
|
||||||
STATUS_LED_STATE<n>
|
STATUS_LED_STATE<n>
|
||||||
STATUS_LED_PERIOD<n>
|
STATUS_LED_PERIOD<n>
|
||||||
|
|
||||||
Where <n> can a integer 1 through 3.
|
Where <n> can a integer 1 through 3.
|
||||||
|
|
||||||
STATUS_LED_BIT is passed into the __led_* functions to identify which LED is
|
STATUS_LED_BIT is passed into the __led_* functions to identify which LED is
|
||||||
being acted on. As such, the value choose must be unique with with respect to
|
being acted on. As such, the value choose must be unique with with respect to
|
||||||
|
@ -37,25 +37,25 @@ range from 2 to 10.
|
||||||
Some other LED macros
|
Some other LED macros
|
||||||
|
|
||||||
STATUS_LED_BOOT is the LED to light when the board is booting. This must be a
|
STATUS_LED_BOOT is the LED to light when the board is booting. This must be a
|
||||||
valid STATUS_LED_BIT value.
|
valid STATUS_LED_BIT value.
|
||||||
|
|
||||||
STATUS_LED_RED is the red LED. It is used signal errors. This must be a valid
|
STATUS_LED_RED is the red LED. It is used signal errors. This must be a valid
|
||||||
STATUS_LED_BIT value. Other similar color LED's are STATUS_LED_YELLOW and
|
STATUS_LED_BIT value. Other similar color LED's are STATUS_LED_YELLOW and
|
||||||
STATUS_LED_BLUE.
|
STATUS_LED_BLUE.
|
||||||
|
|
||||||
These board must define these functions
|
These board must define these functions
|
||||||
|
|
||||||
__led_init is called once to initialize the LED to STATUS_LED_STATE. One time
|
__led_init is called once to initialize the LED to STATUS_LED_STATE. One time
|
||||||
start up code should be placed here.
|
start up code should be placed here.
|
||||||
|
|
||||||
__led_set is called to change the state of the LED.
|
__led_set is called to change the state of the LED.
|
||||||
|
|
||||||
__led_toggle is called to toggle the current state of the LED.
|
__led_toggle is called to toggle the current state of the LED.
|
||||||
|
|
||||||
Colour LED
|
Colour LED
|
||||||
========================================
|
========================================
|
||||||
|
|
||||||
Colour LED's are at present only used by ARM.
|
Colour LED's are at present only used by ARM.
|
||||||
|
|
||||||
The functions names explain their purpose.
|
The functions names explain their purpose.
|
||||||
|
|
||||||
|
|
|
@ -156,4 +156,3 @@ http://www.logicpd.com/sites/default/files/1012659A_Zoom_OMAP34x-II_MDP_Brief.pd
|
||||||
[8] TI OMAP3 U-Boot:
|
[8] TI OMAP3 U-Boot:
|
||||||
|
|
||||||
http://beagleboard.googlecode.com/files/u-boot_beagle_revb.tar.gz
|
http://beagleboard.googlecode.com/files/u-boot_beagle_revb.tar.gz
|
||||||
|
|
||||||
|
|
|
@ -1393,5 +1393,3 @@ int uec_standard_init(bd_t *bis)
|
||||||
{
|
{
|
||||||
return uec_eth_init(bis, uec_info, ARRAY_SIZE(uec_info));
|
return uec_eth_init(bis, uec_info, ARRAY_SIZE(uec_info));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
/*
|
/*
|
||||||
*
|
|
||||||
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
|
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
|
||||||
* (c) 2009 Ilya Yanok, Emcraft Systems <yanok@emcraft.com>
|
* (c) 2009 Ilya Yanok, Emcraft Systems <yanok@emcraft.com>
|
||||||
*
|
*
|
||||||
|
@ -506,4 +505,3 @@ struct iim_regs {
|
||||||
#define IIM1_SUID 1
|
#define IIM1_SUID 1
|
||||||
|
|
||||||
#endif /* _IMX_REGS_H */
|
#endif /* _IMX_REGS_H */
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,9 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy);
|
||||||
#define CONFIG_FSL_DDR3 1
|
#define CONFIG_FSL_DDR3 1
|
||||||
#undef CONFIG_FSL_DDR_INTERACTIVE
|
#undef CONFIG_FSL_DDR_INTERACTIVE
|
||||||
|
|
||||||
// #define CONFIG_DDR_ECC /* ECC will be enabled based on perf_mode environment variable */
|
/* ECC will be enabled based on perf_mode environment variable */
|
||||||
|
/* #define CONFIG_DDR_ECC */
|
||||||
|
|
||||||
#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
|
#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
|
||||||
#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
|
#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
|
||||||
|
|
||||||
|
@ -126,7 +128,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy);
|
||||||
#define SPD_EEPROM_ADDRESS1 0x51 /* CTLR 0 DIMM 0 */
|
#define SPD_EEPROM_ADDRESS1 0x51 /* CTLR 0 DIMM 0 */
|
||||||
|
|
||||||
/* These are used when DDR doesn't use SPD. */
|
/* These are used when DDR doesn't use SPD. */
|
||||||
//#define CONFIG_SYS_SDRAM_SIZE 512 /* DDR is 512MB */
|
|
||||||
#define CONFIG_SYS_SDRAM_SIZE 1024 /* DDR is 1GB */
|
#define CONFIG_SYS_SDRAM_SIZE 1024 /* DDR is 1GB */
|
||||||
|
|
||||||
/* Default settings for "stable" mode */
|
/* Default settings for "stable" mode */
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#ifndef MTD_CONCAT_H
|
#ifndef MTD_CONCAT_H
|
||||||
#define MTD_CONCAT_H
|
#define MTD_CONCAT_H
|
||||||
|
|
||||||
|
|
||||||
struct mtd_info *mtd_concat_create(
|
struct mtd_info *mtd_concat_create(
|
||||||
struct mtd_info *subdev[], /* subdevices to concatenate */
|
struct mtd_info *subdev[], /* subdevices to concatenate */
|
||||||
int num_devs, /* number of subdevices */
|
int num_devs, /* number of subdevices */
|
||||||
|
@ -18,4 +17,3 @@ struct mtd_info *mtd_concat_create(
|
||||||
void mtd_concat_destroy(struct mtd_info *mtd);
|
void mtd_concat_destroy(struct mtd_info *mtd);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -113,9 +113,9 @@ struct mtd_oob_ops {
|
||||||
struct mtd_info {
|
struct mtd_info {
|
||||||
u_char type;
|
u_char type;
|
||||||
u_int32_t flags;
|
u_int32_t flags;
|
||||||
uint64_t size; // Total size of the MTD
|
uint64_t size; /* Total size of the MTD */
|
||||||
|
|
||||||
/* "Major" erase size for the device. Naïve users may take this
|
/* "Major" erase size for the device. Naïve users may take this
|
||||||
* to be the only erase size available, or may use the more detailed
|
* to be the only erase size available, or may use the more detailed
|
||||||
* information below if they desire
|
* information below if they desire
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue