redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

Coding Style cleanup 

Signed-off-by: Wolfgang Denk <wd@denx.de>
utp
Wolfgang Denk 2010-10-27 22:48:30 +02:00
parent 57ff9f2421
commit 071bc92330
32 changed files with 117 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAKEALL
View File

@ -56,7 +56,7 @@ LONG_OPTS="arch:,cpu:,vendor:,soc:"
# Option processing based on util-linux-2.13/getopt-parse.bash # Option processing based on util-linux-2.13/getopt-parse.bash
# Note that we use `"$@"' to let each command-line parameter expand to a # Note that we use `"$@"' to let each command-line parameter expand to a
# separate word. The quotes around `$@' are essential! # separate word. The quotes around `$@' are essential!
# We need TEMP as the `eval set --' would nuke the return value of # We need TEMP as the `eval set --' would nuke the return value of
# getopt. # getopt.

10
README
View File

@ -2364,11 +2364,11 @@ Configuration Settings:
- CONFIG_ENV_MAX_ENTRIES - CONFIG_ENV_MAX_ENTRIES
Maximum number of entries in the hash table that is used Maximum number of entries in the hash table that is used
internally to store the environment settings. The default internally to store the environment settings. The default
setting is supposed to be generous and should work in most setting is supposed to be generous and should work in most
cases. This setting can be used to tune behaviour; see cases. This setting can be used to tune behaviour; see
lib/hashtable.c for details. lib/hashtable.c for details.
The following definitions that deal with the placement and management The following definitions that deal with the placement and management
of environment data (variable area); in general, we support the of environment data (variable area); in general, we support the

1
arch/arm/cpu/arm926ejs/kirkwood/dram.c
View File

@ -93,4 +93,3 @@ void dram_init_banksize(void)
dram_init(); dram_init();
} }
#endif /* CONFIG_SYS_BOARD_DRAM_INIT */ #endif /* CONFIG_SYS_BOARD_DRAM_INIT */

2
arch/arm/cpu/pxa/cpu.c
View File

@ -312,7 +312,7 @@ void pxa_wakeup(void)
int arch_cpu_init(void) int arch_cpu_init(void)
{ {
pxa_gpio_setup(); pxa_gpio_setup();
// pxa_wait_ticks(0x8000); /* pxa_wait_ticks(0x8000); */
pxa_wakeup(); pxa_wakeup();
pxa_interrupt_setup(); pxa_interrupt_setup();
pxa_clock_setup(); pxa_clock_setup();

2
arch/microblaze/cpu/start.S
View File

@ -98,7 +98,7 @@ _start:
* 0xC: 0xB808XXXX * 0xC: 0xB808XXXX
* *
* then it is necessary to count address for storing the most significant * then it is necessary to count address for storing the most significant
* 16bits from _exception_handler address and copy it to * 16bits from _exception_handler address and copy it to
* 0xa address. Big endian use offset in r10=0 that's why is it just * 0xa address. Big endian use offset in r10=0 that's why is it just
* 0xa address. The same is done for the least significant 16 bits * 0xa address. The same is done for the least significant 16 bits
* for 0xe address. * for 0xe address.

2
arch/sh/lib/bootm.c
View File

@ -109,7 +109,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
ramdisk_flags |= RD_PROMPT; ramdisk_flags |= RD_PROMPT;
else else
ramdisk_flags &= ~RD_PROMPT; ramdisk_flags &= ~RD_PROMPT;
val = sh_check_cmd_arg(bootargs, CMD_ARG_RD_DOLOAD, 10); val = sh_check_cmd_arg(bootargs, CMD_ARG_RD_DOLOAD, 10);
if (val == 1) if (val == 1)
ramdisk_flags |= RD_DOLOAD; ramdisk_flags |= RD_DOLOAD;

2
board/bct-brettl2/cled.c
View File

@ -13,7 +13,7 @@
int do_cled(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_cled(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr = 0x20000000 + 0x200000; // AMS2 ulong addr = 0x20000000 + 0x200000; /* AMS2 */
uchar data; uchar data;
if (argc < 2) if (argc < 2)

1
board/davedenx/qong/fpga.c
View File

@ -92,4 +92,3 @@ int qong_fpga_init(void)
} }
#endif #endif

1
board/isee/igep0030/config.mk
View File

@ -31,4 +31,3 @@
# For use with external or internal boots. # For use with external or internal boots.
TEXT_BASE = 0x80008000 TEXT_BASE = 0x80008000

10
board/xes/common/fsl_8xxx_misc.c
View File

@ -52,11 +52,9 @@ uint get_board_derivative(void)
#endif #endif
/* /*
* The top 4 lines of the local bus address are pulled low/high and * The top 4 lines of the local bus address are pulled low/high and
* can be read to determine the least significant digit of a board's * can be read to determine the least significant digit of a board's
* model number. * model number.
*/ */
return gur->gpporcr >> 28; return gur->gpporcr >> 28;
} }

21
board/xes/xpedite550x/ddr.c
View File

@ -55,16 +55,16 @@ unsigned int fsl_ddr_get_mem_data_rate(void)
* There are traditionally three board-specific SDRAM timing parameters * There are traditionally three board-specific SDRAM timing parameters
* which must be calculated based on the particular PCB artwork. These are: * which must be calculated based on the particular PCB artwork. These are:
* 1.) CPO (Read Capture Delay) * 1.) CPO (Read Capture Delay)
* - TIMING_CFG_2 register * - TIMING_CFG_2 register
* Source: Calculation based on board trace lengths and * Source: Calculation based on board trace lengths and
* chip-specific internal delays. * chip-specific internal delays.
* 2.) CLK_ADJUST (Clock and Addr/Cmd alignment control) * 2.) CLK_ADJUST (Clock and Addr/Cmd alignment control)
* - DDR_SDRAM_CLK_CNTL register * - DDR_SDRAM_CLK_CNTL register
* Source: Signal Integrity Simulations * Source: Signal Integrity Simulations
* 3.) 2T Timing on Addr/Ctl * 3.) 2T Timing on Addr/Ctl
* - TIMING_CFG_2 register * - TIMING_CFG_2 register
* Source: Signal Integrity Simulations * Source: Signal Integrity Simulations
* Usually only needed with heavy load/very high speed (>DDR2-800) * Usually only needed with heavy load/very high speed (>DDR2-800)
* *
* ====== XPedite550x DDR3-800 read delay calculations ====== * ====== XPedite550x DDR3-800 read delay calculations ======
* *
@ -82,14 +82,14 @@ typedef struct {
const board_specific_parameters_t board_specific_parameters[][20] = { const board_specific_parameters_t board_specific_parameters[][20] = {
{ {
/* Controller 0 */ /* Controller 0 */
{ {
/* DDR3-600/667 */ /* DDR3-600/667 */
.datarate_mhz_low = 500, .datarate_mhz_low = 500,
.datarate_mhz_high = 750, .datarate_mhz_high = 750,
.clk_adjust = 5, .clk_adjust = 5,
.cpo = 31, .cpo = 31,
}, },
{ {
/* DDR3-800 */ /* DDR3-800 */
.datarate_mhz_low = 750, .datarate_mhz_low = 750,
.datarate_mhz_high = 850, .datarate_mhz_high = 850,
@ -162,4 +162,3 @@ void fsl_ddr_board_options(memctl_options_t *popts,
popts->rtt_override = 1; popts->rtt_override = 1;
popts->rtt_override_value = 3; popts->rtt_override_value = 3;
} }

14
doc/README.arm-relocation
View File

@ -93,7 +93,7 @@ Relocation with NAND_SPL (example for the tx25):
and start with code execution on this address. and start with code execution on this address.
- The First page contains u-boot code from u-boot:nand_spl/nand_boot_fsl_nfc.c - The First page contains u-boot code from u-boot:nand_spl/nand_boot_fsl_nfc.c
which inits the dram, cpu registers, reloacte itself to CONFIG_SYS_TEXT_BASE and loads which inits the dram, cpu registers, reloacte itself to CONFIG_SYS_TEXT_BASE and loads
the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution
@CONFIG_SYS_NAND_U_BOOT_START @CONFIG_SYS_NAND_U_BOOT_START
@ -162,7 +162,7 @@ e) load new symbol table:
(gdb) add-symbol-file u-boot 0x8ff08000 (gdb) add-symbol-file u-boot 0x8ff08000
add symbol table from file "u-boot" at add symbol table from file "u-boot" at
.text_addr = 0x8ff08000 .text_addr = 0x8ff08000
(y or n) y (y or n) y
Reading symbols from /home/hs/celf/u-boot/u-boot...done. Reading symbols from /home/hs/celf/u-boot/u-boot...done.
(gdb) c (gdb) c
@ -170,12 +170,12 @@ Continuing.
^C ^C
Program received signal SIGSTOP, Stopped (signal). Program received signal SIGSTOP, Stopped (signal).
0x8ff17f18 in serial_getc () at serial_mxc.c:192 0x8ff17f18 in serial_getc () at serial_mxc.c:192
192 while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY); 192 while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY);
(gdb) (gdb)
add-symbol-file u-boot 0x8ff08000 add-symbol-file u-boot 0x8ff08000
^^^^^^^^^^ ^^^^^^^^^^
get this address from u-boot debug printfs get this address from u-boot debug printfs
U-Boot 2010.06-rc2-00009-gf77b8b8-dirty (Jun 22 2010 - 09:43:46) U-Boot 2010.06-rc2-00009-gf77b8b8-dirty (Jun 22 2010 - 09:43:46)
@ -187,7 +187,7 @@ Top of RAM usable for U-Boot at: 90000000
LCD panel info: 640 x 480, 16 bit/pix LCD panel info: 640 x 480, 16 bit/pix
Reserving 600k for LCD Framebuffer at: 8ff6a000 Reserving 600k for LCD Framebuffer at: 8ff6a000
Reserving 391k for U-Boot at: 8ff08000 Reserving 391k for U-Boot at: 8ff08000
^^^^^^^^ ^^^^^^^^
Reserving 1280k for malloc() at: 8fdc8000 Reserving 1280k for malloc() at: 8fdc8000
Reserving 24 Bytes for Board Info at: 8fdc7fe8 Reserving 24 Bytes for Board Info at: 8fdc7fe8
Reserving 52 Bytes for Global Data at: 8fdc7fb4 Reserving 52 Bytes for Global Data at: 8fdc7fb4
@ -197,6 +197,6 @@ Bank #0: 80000000 256 MiB
relocation Offset is: eff08000 relocation Offset is: eff08000
mon: 00058BAC gd->monLen: 00061F10 mon: 00058BAC gd->monLen: 00061F10
Now running in RAM - U-Boot at: 8ff08000 Now running in RAM - U-Boot at: 8ff08000
^^^^^^^^ ^^^^^^^^
Now you can use gdb as usual :-) Now you can use gdb as usual :-)

2
drivers/fpga/lattice.c
View File

@ -395,5 +395,3 @@ int lattice_info(Lattice_desc *desc)
return ret_val; return ret_val;
} }

1
drivers/mmc/omap_hsmmc.c
View File

@ -412,4 +412,3 @@ int omap_mmc_init(int dev_index)
return 0; return 0;
} }

2
drivers/serial/atmel_usart.h
View File

@ -42,7 +42,7 @@ typedef struct atmel_usart3 {
u32 reserved1; u32 reserved1;
u32 ifr; u32 ifr;
u32 man; u32 man;
u32 reserved2[54]; // version and PDC not needed u32 reserved2[54]; /* version and PDC not needed */
} atmel_usart3_t; } atmel_usart3_t;
/* Bitfields in CR */ /* Bitfields in CR */

1
drivers/usb/gadget/config.c
View File

@ -116,4 +116,3 @@ int usb_gadget_config_buf(
cp->bmAttributes |= USB_CONFIG_ATT_ONE; cp->bmAttributes |= USB_CONFIG_ATT_ONE;
return len; return len;
} }

1
drivers/usb/gadget/epautoconf.c
View File

@ -302,4 +302,3 @@ void usb_ep_autoconfig_reset(struct usb_gadget *gadget)
#endif #endif
epnum = 0; epnum = 0;
} }

1
drivers/usb/gadget/ether.c
View File

@ -1968,4 +1968,3 @@ fail:
error("%s failed. error = %d", __func__, status); error("%s failed. error = %d", __func__, status);
return status; return status;
} }

1
drivers/usb/gadget/usbstring.c
View File

@ -137,4 +137,3 @@ usb_gadget_get_string(struct usb_gadget_strings *table, int id, u8 *buf)
buf[1] = USB_DT_STRING; buf[1] = USB_DT_STRING;
return buf[0]; return buf[0];
} }

2
include/configs/a4m072.h
View File

@ -79,7 +79,7 @@
#define CONFIG_SYS_XLB_PIPELINING 1 #define CONFIG_SYS_XLB_PIPELINING 1
#undef CONFIG_NET_MULTI #undef CONFIG_NET_MULTI
#undef CONFIG_EEPRO100 #undef CONFIG_EEPRO100
/* Partitions */ /* Partitions */
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION

24
include/configs/bct-brettl2.h
View File

@ -11,7 +11,7 @@
/* /*
* Processor Settings * Processor Settings
*/ */
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
/* /*
@ -21,11 +21,11 @@
*/ */
/* CONFIG_CLKIN_HZ is any value in Hz */ /* CONFIG_CLKIN_HZ is any value in Hz */
#define CONFIG_CLKIN_HZ 16384000 #define CONFIG_CLKIN_HZ 16384000
/* CLKIN_HALF controls the DF bit in PLL_CTL 0 = CLKIN */ /* CLKIN_HALF controls the DF bit in PLL_CTL 0 = CLKIN */
/* 1 = CLKIN / 2 */ /* 1 = CLKIN / 2 */
#define CONFIG_CLKIN_HALF 0 #define CONFIG_CLKIN_HALF 0
/* PLL_BYPASS controls the BYPASS bit in PLL_CTL 0 = do not bypass */ /* PLL_BYPASS controls the BYPASS bit in PLL_CTL 0 = do not bypass */
/* 1 = bypass PLL */ /* 1 = bypass PLL */
#define CONFIG_PLL_BYPASS 0 #define CONFIG_PLL_BYPASS 0
/* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL */ /* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL */
/* Values can range from 0-63 (where 0 means 64) */ /* Values can range from 0-63 (where 0 means 64) */
@ -36,7 +36,7 @@
/* SCLK_DIV controls the system clock divider */ /* SCLK_DIV controls the system clock divider */
/* Values can range from 1-15 */ /* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 3 #define CONFIG_SCLK_DIV 3
#define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000) #define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000)
/* /*
@ -111,13 +111,13 @@
* it linked after the configuration sector. * it linked after the configuration sector.
*/ */
# define LDS_BOARD_TEXT \ # define LDS_BOARD_TEXT \
arch/blackfin/cpu/traps.o (.text .text.*); \ arch/blackfin/cpu/traps.o (.text .text.*); \
arch/blackfin/cpu/interrupt.o (.text .text.*); \ arch/blackfin/cpu/interrupt.o (.text .text.*); \
arch/blackfin/cpu/serial.o (.text .text.*); \ arch/blackfin/cpu/serial.o (.text .text.*); \
common/dlmalloc.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \
lib/crc32.o (.text .text.*); \ lib/crc32.o (.text .text.*); \
. = DEFINED(env_offset) ? env_offset : .; \ . = DEFINED(env_offset) ? env_offset : .; \
common/env_embedded.o (.text .text.*); common/env_embedded.o (.text .text.*);
#endif #endif

4
include/configs/blackvme.h
View File

@ -126,9 +126,9 @@
* AX88180 WEN = 5 clocks REN 6 clocks @ SCLK = 100 MHz * AX88180 WEN = 5 clocks REN 6 clocks @ SCLK = 100 MHz
* One extra clock needed because AX88180 is asynchronous to CPU. * One extra clock needed because AX88180 is asynchronous to CPU.
*/ */
/* bank 1 0 */ /* bank 1 0 */
#define CONFIG_EBIU_AMBCTL0_VAL 0xFFC2FFC2 #define CONFIG_EBIU_AMBCTL0_VAL 0xFFC2FFC2
/* bank 3 2 */ /* bank 3 2 */
#define CONFIG_EBIU_AMBCTL1_VAL 0xFFC2FFC2 #define CONFIG_EBIU_AMBCTL1_VAL 0xFFC2FFC2
/* memory layout */ /* memory layout */

5
include/configs/mx1ads.h
View File

@ -60,8 +60,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
/* /*
* CS8900 Ethernet drivers * CS8900 Ethernet drivers
*/ */
@ -79,7 +77,6 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/* /*
* BOOTP options * BOOTP options
*/ */
@ -88,7 +85,6 @@
#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
@ -98,7 +94,6 @@
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_ELF #define CONFIG_CMD_ELF
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "root=/dev/msdk mem=48M" #define CONFIG_BOOTARGS "root=/dev/msdk mem=48M"
#define CONFIG_BOOTFILE "mx1ads" #define CONFIG_BOOTFILE "mx1ads"

5
include/configs/mx1fs2.h
View File

@ -34,7 +34,6 @@
#undef _CONFIG_UART4 /* internal uart 4 */ #undef _CONFIG_UART4 /* internal uart 4 */
#undef CONFIG_SILENT_CONSOLE /* use this to disable output */ #undef CONFIG_SILENT_CONSOLE /* use this to disable output */
/* /*
* BOOTP options * BOOTP options
*/ */
@ -43,7 +42,6 @@
#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
@ -58,7 +56,6 @@
#undef CONFIG_CMD_PING #undef CONFIG_CMD_PING
#undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_SOURCE
/* /*
* Boot options. Setting delay to -1 stops autostart count down. * Boot options. Setting delay to -1 stops autostart count down.
*/ */
@ -98,8 +95,6 @@
*/ */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
#define CONFIG_STACKSIZE (120<<10) /* stack size */ #define CONFIG_STACKSIZE (120<<10) /* stack size */
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ

15
include/configs/scb9328.h
View File

@ -35,7 +35,6 @@
* Select serial console configuration * Select serial console configuration
*/ */
/* /*
* BOOTP options * BOOTP options
*/ */
@ -44,7 +43,6 @@
#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
@ -58,7 +56,6 @@
#undef CONFIG_CMD_LOADS #undef CONFIG_CMD_LOADS
#undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_SOURCE
/* /*
* Boot options. Setting delay to -1 stops autostart count down. * Boot options. Setting delay to -1 stops autostart count down.
* NOTE: Sending parameters to kernel depends on kernel version and * NOTE: Sending parameters to kernel depends on kernel version and
@ -100,14 +97,11 @@
#define CONFIG_INITRD_TAG 1 /* send initrd params */ #define CONFIG_INITRD_TAG 1 /* send initrd params */
#undef CONFIG_VFD /* do not send framebuffer setup */ #undef CONFIG_VFD /* do not send framebuffer setup */
/* /*
* Malloc pool need to host env + 128 Kb reserve for other allocations. * Malloc pool need to host env + 128 Kb reserve for other allocations.
*/ */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
#define CONFIG_STACKSIZE (120<<10) /* stack size */ #define CONFIG_STACKSIZE (120<<10) /* stack size */
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
@ -133,15 +127,6 @@
#define SCB9328_SDRAM_1 0x08000000 /* SDRAM bank #1 */ #define SCB9328_SDRAM_1 0x08000000 /* SDRAM bank #1 */
#define SCB9328_SDRAM_1_SIZE 0x01000000 /* 16 MB */ #define SCB9328_SDRAM_1_SIZE 0x01000000 /* 16 MB */
/*
* Flash Controller settings
*/
/*
* Hardware drivers
*/
/* /*
* Configuration for FLASH memory for the Synertronixx board * Configuration for FLASH memory for the Synertronixx board
*/ */

1
include/lattice.h
View File

@ -317,4 +317,3 @@ void writePort(unsigned char pins, unsigned char value);
unsigned char readPort(void); unsigned char readPort(void);
void sclock(void); void sclock(void);
#endif #endif

120
include/linux/fb.h
View File

@ -26,13 +26,13 @@ struct fb_fix_screeninfo {
__u32 type; /* see FB_TYPE_* */ __u32 type; /* see FB_TYPE_* */
__u32 type_aux; /* Interleave for interleaved Planes */ __u32 type_aux; /* Interleave for interleaved Planes */
__u32 visual; /* see FB_VISUAL_* */ __u32 visual; /* see FB_VISUAL_* */
__u16 xpanstep; /* zero if no hardware panning */ __u16 xpanstep; /* zero if no hardware panning */
__u16 ypanstep; /* zero if no hardware panning */ __u16 ypanstep; /* zero if no hardware panning */
__u16 ywrapstep; /* zero if no hardware ywrap */ __u16 ywrapstep; /* zero if no hardware ywrap */
__u32 line_length; /* length of a line in bytes */ __u32 line_length; /* length of a line in bytes */
unsigned long mmio_start; /* Start of Memory Mapped I/O */ unsigned long mmio_start; /* Start of Memory Mapped I/O */
/* (physical address) */ /* (physical address) */
__u32 mmio_len; /* Length of Memory Mapped I/O */ __u32 mmio_len; /* Length of Memory Mapped I/O */
__u32 accel; /* Indicate to driver which */ __u32 accel; /* Indicate to driver which */
/* specific chip/card we have */ /* specific chip/card we have */
__u16 reserved[3]; /* Reserved for future compatibility */ __u16 reserved[3]; /* Reserved for future compatibility */
@ -56,7 +56,7 @@ struct fb_bitfield {
}; };
#define FB_NONSTD_HAM 1 /* Hold-And-Modify (HAM) */ #define FB_NONSTD_HAM 1 /* Hold-And-Modify (HAM) */
#define FB_NONSTD_REV_PIX_IN_B 2 /* order of pixels in each byte is reversed */ #define FB_NONSTD_REV_PIX_IN_B 2 /* order of pixels in each byte is reversed */
#define FB_ACTIVATE_NOW 0 /* set values immediately (or vbl)*/ #define FB_ACTIVATE_NOW 0 /* set values immediately (or vbl)*/
@ -64,38 +64,38 @@ struct fb_bitfield {
#define FB_ACTIVATE_TEST 2 /* don't set, round up impossible */ #define FB_ACTIVATE_TEST 2 /* don't set, round up impossible */
#define FB_ACTIVATE_MASK 15 #define FB_ACTIVATE_MASK 15
/* values */ /* values */
#define FB_ACTIVATE_VBL 16 /* activate values on next vbl */ #define FB_ACTIVATE_VBL 16 /* activate values on next vbl */
#define FB_CHANGE_CMAP_VBL 32 /* change colormap on vbl */ #define FB_CHANGE_CMAP_VBL 32 /* change colormap on vbl */
#define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */ #define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */
#define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/ #define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/
#define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */ #define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */
#define FB_SYNC_HOR_HIGH_ACT 1 /* horizontal sync high active */ #define FB_SYNC_HOR_HIGH_ACT 1 /* horizontal sync high active */
#define FB_SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */ #define FB_SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */
#define FB_SYNC_EXT 4 /* external sync */ #define FB_SYNC_EXT 4 /* external sync */
#define FB_SYNC_COMP_HIGH_ACT 8 /* composite sync high active */ #define FB_SYNC_COMP_HIGH_ACT 8 /* composite sync high active */
#define FB_SYNC_BROADCAST 16 /* broadcast video timings */ #define FB_SYNC_BROADCAST 16 /* broadcast video timings */
/* vtotal = 144d/288n/576i => PAL */ /* vtotal = 144d/288n/576i => PAL */
/* vtotal = 121d/242n/484i => NTSC */ /* vtotal = 121d/242n/484i => NTSC */
#define FB_SYNC_ON_GREEN 32 /* sync on green */ #define FB_SYNC_ON_GREEN 32 /* sync on green */
#define FB_VMODE_NONINTERLACED 0 /* non interlaced */ #define FB_VMODE_NONINTERLACED 0 /* non interlaced */
#define FB_VMODE_INTERLACED 1 /* interlaced */ #define FB_VMODE_INTERLACED 1 /* interlaced */
#define FB_VMODE_DOUBLE 2 /* double scan */ #define FB_VMODE_DOUBLE 2 /* double scan */
#define FB_VMODE_ODD_FLD_FIRST 4 /* interlaced: top line first */ #define FB_VMODE_ODD_FLD_FIRST 4 /* interlaced: top line first */
#define FB_VMODE_MASK 255 #define FB_VMODE_MASK 255
#define FB_VMODE_YWRAP 256 /* ywrap instead of panning */ #define FB_VMODE_YWRAP 256 /* ywrap instead of panning */
#define FB_VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */ #define FB_VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */
#define FB_VMODE_CONUPDATE 512 /* don't update x/yoffset */ #define FB_VMODE_CONUPDATE 512 /* don't update x/yoffset */
/* /*
* Display rotation support * Display rotation support
*/ */
#define FB_ROTATE_UR 0 #define FB_ROTATE_UR 0
#define FB_ROTATE_CW 1 #define FB_ROTATE_CW 1
#define FB_ROTATE_UD 2 #define FB_ROTATE_UD 2
#define FB_ROTATE_CCW 3 #define FB_ROTATE_CCW 3
#define PICOS2KHZ(a) (1000000000UL/(a)) #define PICOS2KHZ(a) (1000000000UL/(a))
#define KHZ2PICOS(a) (1000000000UL/(a)) #define KHZ2PICOS(a) (1000000000UL/(a))
@ -154,10 +154,10 @@ struct fb_con2fbmap {
}; };
/* VESA Blanking Levels */ /* VESA Blanking Levels */
#define VESA_NO_BLANKING 0 #define VESA_NO_BLANKING 0
#define VESA_VSYNC_SUSPEND 1 #define VESA_VSYNC_SUSPEND 1
#define VESA_HSYNC_SUSPEND 2 #define VESA_HSYNC_SUSPEND 2
#define VESA_POWERDOWN 3 #define VESA_POWERDOWN 3
enum { enum {
@ -234,12 +234,12 @@ struct fb_image {
*/ */
#define FB_CUR_SETIMAGE 0x01 #define FB_CUR_SETIMAGE 0x01
#define FB_CUR_SETPOS 0x02 #define FB_CUR_SETPOS 0x02
#define FB_CUR_SETHOT 0x04 #define FB_CUR_SETHOT 0x04
#define FB_CUR_SETCMAP 0x08 #define FB_CUR_SETCMAP 0x08
#define FB_CUR_SETSHAPE 0x10 #define FB_CUR_SETSHAPE 0x10
#define FB_CUR_SETSIZE 0x20 #define FB_CUR_SETSIZE 0x20
#define FB_CUR_SETALL 0xFF #define FB_CUR_SETALL 0xFF
struct fbcurpos { struct fbcurpos {
__u16 x, y; __u16 x, y;
@ -377,29 +377,29 @@ struct fb_cursor_user {
* if you own it * if you own it
*/ */
#define FB_EVENT_RESUME 0x03 #define FB_EVENT_RESUME 0x03
/* An entry from the modelist was removed */ /* An entry from the modelist was removed */
#define FB_EVENT_MODE_DELETE 0x04 #define FB_EVENT_MODE_DELETE 0x04
/* A driver registered itself */ /* A driver registered itself */
#define FB_EVENT_FB_REGISTERED 0x05 #define FB_EVENT_FB_REGISTERED 0x05
/* A driver unregistered itself */ /* A driver unregistered itself */
#define FB_EVENT_FB_UNREGISTERED 0x06 #define FB_EVENT_FB_UNREGISTERED 0x06
/* CONSOLE-SPECIFIC: get console to framebuffer mapping */ /* CONSOLE-SPECIFIC: get console to framebuffer mapping */
#define FB_EVENT_GET_CONSOLE_MAP 0x07 #define FB_EVENT_GET_CONSOLE_MAP 0x07
/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ /* CONSOLE-SPECIFIC: set console to framebuffer mapping */
#define FB_EVENT_SET_CONSOLE_MAP 0x08 #define FB_EVENT_SET_CONSOLE_MAP 0x08
/* A hardware display blank change occured */ /* A hardware display blank change occured */
#define FB_EVENT_BLANK 0x09 #define FB_EVENT_BLANK 0x09
/* Private modelist is to be replaced */ /* Private modelist is to be replaced */
#define FB_EVENT_NEW_MODELIST 0x0A #define FB_EVENT_NEW_MODELIST 0x0A
/* The resolution of the passed in fb_info about to change and /* The resolution of the passed in fb_info about to change and
all vc's should be changed */ all vc's should be changed */
#define FB_EVENT_MODE_CHANGE_ALL 0x0B #define FB_EVENT_MODE_CHANGE_ALL 0x0B
/* A software display blank change occured */ /* A software display blank change occured */
#define FB_EVENT_CONBLANK 0x0C #define FB_EVENT_CONBLANK 0x0C
/* Get drawing requirements */ /* Get drawing requirements */
#define FB_EVENT_GET_REQ 0x0D #define FB_EVENT_GET_REQ 0x0D
/* Unbind from the console if possible */ /* Unbind from the console if possible */
#define FB_EVENT_FB_UNBIND 0x0E #define FB_EVENT_FB_UNBIND 0x0E
struct fb_event { struct fb_event {
struct fb_info *info; struct fb_info *info;
@ -421,10 +421,10 @@ struct fb_blit_caps {
* format the hardware needs. * format the hardware needs.
*/ */
#define FB_PIXMAP_DEFAULT 1 /* used internally by fbcon */ #define FB_PIXMAP_DEFAULT 1 /* used internally by fbcon */
#define FB_PIXMAP_SYSTEM 2 /* memory is in system RAM */ #define FB_PIXMAP_SYSTEM 2 /* memory is in system RAM */
#define FB_PIXMAP_IO 4 /* memory is iomapped */ #define FB_PIXMAP_IO 4 /* memory is iomapped */
#define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */ #define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */
struct fb_pixmap { struct fb_pixmap {
u8 *addr; /* pointer to memory */ u8 *addr; /* pointer to memory */
@ -434,10 +434,10 @@ struct fb_pixmap {
u32 scan_align; /* alignment per scanline */ u32 scan_align; /* alignment per scanline */
u32 access_align; /* alignment per read/write (bits) */ u32 access_align; /* alignment per read/write (bits) */
u32 flags; /* see FB_PIXMAP_* */ u32 flags; /* see FB_PIXMAP_* */
u32 blit_x; /* supported bit block dimensions (1-32)*/ u32 blit_x; /* supported bit block dimensions (1-32)*/
u32 blit_y; /* Format: blit_x = 1 << (width - 1) */ u32 blit_y; /* Format: blit_x = 1 << (width - 1) */
/* blit_y = 1 << (height - 1) */ /* blit_y = 1 << (height - 1) */
/* if 0, will be set to 0xffffffff (all)*/ /* if 0, will be set to 0xffffffff (all)*/
/* access methods */ /* access methods */
void (*writeio)(struct fb_info *info, void *dst, void *src, unsigned int size); void (*writeio)(struct fb_info *info, void *dst, void *src, unsigned int size);
void (*readio) (struct fb_info *info, void *dst, void *src, unsigned int size); void (*readio) (struct fb_info *info, void *dst, void *src, unsigned int size);
@ -488,7 +488,7 @@ struct fb_deferred_io {
* meaning, it is set by the fb subsystem depending FOREIGN_ENDIAN flag * meaning, it is set by the fb subsystem depending FOREIGN_ENDIAN flag
* and host endianness. Drivers should not use this flag. * and host endianness. Drivers should not use this flag.
*/ */
#define FBINFO_BE_MATH 0x100000 #define FBINFO_BE_MATH 0x100000
struct fb_info { struct fb_info {
int node; int node;
@ -499,7 +499,7 @@ struct fb_info {
struct fb_pixmap pixmap; /* Image hardware mapper */ struct fb_pixmap pixmap; /* Image hardware mapper */
struct fb_pixmap sprite; /* Cursor hardware mapper */ struct fb_pixmap sprite; /* Cursor hardware mapper */
struct fb_cmap cmap; /* Current cmap */ struct fb_cmap cmap; /* Current cmap */
struct list_head modelist; /* mode list */ struct list_head modelist; /* mode list */
struct fb_videomode *mode; /* current mode */ struct fb_videomode *mode; /* current mode */
char *screen_base; /* Virtual address */ char *screen_base; /* Virtual address */
@ -508,7 +508,7 @@ struct fb_info {
#define FBINFO_STATE_RUNNING 0 #define FBINFO_STATE_RUNNING 0
#define FBINFO_STATE_SUSPENDED 1 #define FBINFO_STATE_SUSPENDED 1
u32 state; /* Hardware state i.e suspend */ u32 state; /* Hardware state i.e suspend */
void *fbcon_par; /* fbcon use-only private area */ void *fbcon_par; /* fbcon use-only private area */
/* From here on everything is device dependent */ /* From here on everything is device dependent */
void *par; void *par;
}; };
@ -518,14 +518,14 @@ struct fb_info {
#define FBINFO_FLAG_MODULE FBINFO_MODULE #define FBINFO_FLAG_MODULE FBINFO_MODULE
#define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT #define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT
// This will go away /* This will go away */
#if defined(__sparc__) #if defined(__sparc__)
/* We map all of our framebuffers such that big-endian accesses /* We map all of our framebuffers such that big-endian accesses
* are what we want, so the following is sufficient. * are what we want, so the following is sufficient.
*/ */
// This will go away /* This will go away */
#define fb_readb sbus_readb #define fb_readb sbus_readb
#define fb_readw sbus_readw #define fb_readw sbus_readw
#define fb_readl sbus_readl #define fb_readl sbus_readl
@ -562,7 +562,7 @@ struct fb_info {
#endif #endif
#define FB_LEFT_POS(p, bpp) (fb_be_math(p) ? (32 - (bpp)) : 0) #define FB_LEFT_POS(p, bpp) (fb_be_math(p) ? (32 - (bpp)) : 0)
#define FB_SHIFT_HIGH(p, val, bits) (fb_be_math(p) ? (val) >> (bits) : \ #define FB_SHIFT_HIGH(p, val, bits) (fb_be_math(p) ? (val) >> (bits) : \
(val) << (bits)) (val) << (bits))
#define FB_SHIFT_LOW(p, val, bits) (fb_be_math(p) ? (val) << (bits) : \ #define FB_SHIFT_LOW(p, val, bits) (fb_be_math(p) ? (val) << (bits) : \
@ -580,7 +580,7 @@ struct fb_info {
#define FB_MODE_IS_VESA 4 #define FB_MODE_IS_VESA 4
#define FB_MODE_IS_CALCULATED 8 #define FB_MODE_IS_CALCULATED 8
#define FB_MODE_IS_FIRST 16 #define FB_MODE_IS_FIRST 16
#define FB_MODE_IS_FROM_VAR 32 #define FB_MODE_IS_FROM_VAR 32
/* drivers/video/fbcmap.c */ /* drivers/video/fbcmap.c */

2
include/linux/kbuild.h
View File

@ -7,7 +7,7 @@
#define __LINUX_KBUILD_H #define __LINUX_KBUILD_H
#define DEFINE(sym, val) \ #define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val)) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
#define BLANK() asm volatile("\n->" : : ) #define BLANK() asm volatile("\n->" : : )

4
include/linux/usb/cdc.h
View File

@ -9,8 +9,6 @@
* Remy Bohmer <linux@bohmer.net> * Remy Bohmer <linux@bohmer.net>
*/ */
#define USB_CDC_SUBCLASS_ACM 0x02 #define USB_CDC_SUBCLASS_ACM 0x02
#define USB_CDC_SUBCLASS_ETHERNET 0x06 #define USB_CDC_SUBCLASS_ETHERNET 0x06
#define USB_CDC_SUBCLASS_WHCM 0x08 #define USB_CDC_SUBCLASS_WHCM 0x08
@ -199,7 +197,6 @@ struct usb_cdc_line_coding {
#define USB_CDC_PACKET_TYPE_BROADCAST (1 << 3) #define USB_CDC_PACKET_TYPE_BROADCAST (1 << 3)
#define USB_CDC_PACKET_TYPE_MULTICAST (1 << 4) /* filtered */ #define USB_CDC_PACKET_TYPE_MULTICAST (1 << 4) /* filtered */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* /*
@ -221,4 +218,3 @@ struct usb_cdc_notification {
__le16 wIndex; __le16 wIndex;
__le16 wLength; __le16 wLength;
} __attribute__ ((packed)); } __attribute__ ((packed));

12
lib/hashtable.c
View File

@ -56,7 +56,7 @@
/* /*
* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986 * [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
* [Knuth] The Art of Computer Programming, part 3 (6.4) * [Knuth] The Art of Computer Programming, part 3 (6.4)
*/ */
/* /*
@ -252,7 +252,7 @@ int hsearch_r(ENTRY item, ACTION action, ENTRY ** retval,
if (htab->table[idx].used) { if (htab->table[idx].used) {
/* /*
* Further action might be required according to the * Further action might be required according to the
* action value. * action value.
*/ */
unsigned hval2; unsigned hval2;
@ -283,8 +283,8 @@ int hsearch_r(ENTRY item, ACTION action, ENTRY ** retval,
do { do {
/* /*
* Because SIZE is prime this guarantees to * Because SIZE is prime this guarantees to
* step through all available indices. * step through all available indices.
*/ */
if (idx <= hval2) if (idx <= hval2)
idx = htab->size + idx - hval2; idx = htab->size + idx - hval2;
@ -323,8 +323,8 @@ int hsearch_r(ENTRY item, ACTION action, ENTRY ** retval,
/* An empty bucket has been found. */ /* An empty bucket has been found. */
if (action == ENTER) { if (action == ENTER) {
/* /*
* If table is full and another entry should be * If table is full and another entry should be
* entered return with error. * entered return with error.
*/ */
if (htab->filled == htab->size) { if (htab->filled == htab->size) {
__set_errno(ENOMEM); __set_errno(ENOMEM);

6
lib/qsort.c
View File

@ -23,9 +23,9 @@
#endif #endif
void qsort(void *base, void qsort(void *base,
size_t nel, size_t nel,
size_t width, size_t width,
int (*comp)(const void *, const void *)) int (*comp)(const void *, const void *))
{ {
size_t wgap, i, j, k; size_t wgap, i, j, k;
char tmp; char tmp;

2
post/board/lwmon5/fpga.c
View File

@ -227,8 +227,6 @@ static int fpga_mem_test(void)
return ret; return ret;
} }
/* Verify FPGA addresslines */ /* Verify FPGA addresslines */
static int fpga_post_addrline(ulong *address, ulong *base, ulong size) static int fpga_post_addrline(ulong *address, ulong *base, ulong size)
{ {