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

Coding style cleanup

Browse Source
master
Wolfgang Denk 18 years ago
parent 8d4ac79436
commit 511d0c72b8
28 changed files with 79 additions and 81 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. 2
      CHANGELOG
  2. 2
      board/Marvell/db64360/Makefile
  3. 2
      board/Marvell/db64460/Makefile
  4. 72
      board/amcc/sequoia/sequoia.c
  5. 3
      board/amcc/yucca/yucca.c
  6. 2
      board/dave/B2/Makefile
  7. 2
      board/esd/cpci750/Makefile
  8. 2
      board/evb64260/Makefile
  9. 2
      board/ispan/Makefile
  10. 2
      board/jse/Makefile
  11. 2
      board/netstar/Makefile
  12. 2
      board/sc520_spunk/Makefile
  13. 2
      board/tqm5200/cam5200_flash.c
  14. 2
      board/tqm834x/Makefile
  15. 4
      common/lcd.c
  16. 2
      config.mk
  17. 2
      cpu/i386/Makefile
  18. 2
      cpu/mpc5xxx/interrupts.c
  19. 2
      cpu/mpc83xx/Makefile
  20. 24
      cpu/ppc4xx/ndfc.c
  21. 6
      cpu/ppc4xx/start.S
  22. 6
      drivers/serial.c
  23. 1
      drivers/sk98lin/Makefile
  24. 2
      include/common.h
  25. 2
      lib_generic/Makefile
  26. 4
      nand_spl/nand_boot.c
  27. 2
      tools/Makefile
  28. 2
      tools/gdb/Makefile

2
CHANGELOG
Unescape View File

@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Coding style cleanup
* Add support for EP82xxM boards * Add support for EP82xxM boards
Patch by Aaron Sells, 20 Jun 2006 Patch by Aaron Sells, 20 Jun 2006

2
board/Marvell/db64360/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2001 # (C) Copyright 2001
# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. # Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
# #

2
board/Marvell/db64460/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2001 # (C) Copyright 2001
# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. # Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
# #

72
board/amcc/sequoia/sequoia.c
Unescape View File

@ -4,7 +4,7 @@
* *
* (C) Copyright 2006 * (C) Copyright 2006
* Jacqueline Pira-Ferriol, AMCC/IBM, jpira-ferriol@fr.ibm.com * Jacqueline Pira-Ferriol, AMCC/IBM, jpira-ferriol@fr.ibm.com
* Alain Saurel, AMCC/IBM, alain.saurel@fr.ibm.com * Alain Saurel, AMCC/IBM, alain.saurel@fr.ibm.com
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@ -123,12 +123,12 @@ int board_early_init_f(void)
/* setup NAND FLASH */ /* setup NAND FLASH */
mfsdr(SDR0_CUST0, sdr0_cust0); mfsdr(SDR0_CUST0, sdr0_cust0);
sdr0_cust0 = SDR0_CUST0_MUX_NDFC_SEL | sdr0_cust0 = SDR0_CUST0_MUX_NDFC_SEL |
SDR0_CUST0_NDFC_ENABLE | SDR0_CUST0_NDFC_ENABLE |
SDR0_CUST0_NDFC_BW_8_BIT | SDR0_CUST0_NDFC_BW_8_BIT |
SDR0_CUST0_NDFC_ARE_MASK | SDR0_CUST0_NDFC_ARE_MASK |
(0x80000000 >> (28 + CFG_NAND_CS)); (0x80000000 >> (28 + CFG_NAND_CS));
mtsdr(SDR0_CUST0, sdr0_cust0); mtsdr(SDR0_CUST0, sdr0_cust0);
return 0; return 0;
} }
@ -216,38 +216,38 @@ int misc_init_r(void)
#ifdef CONFIG_440EPX #ifdef CONFIG_440EPX
if (act == NULL || strcmp(act, "hostdev") == 0) { if (act == NULL || strcmp(act, "hostdev") == 0) {
/* SDR Setting */ /* SDR Setting */
mfsdr(SDR0_PFC1, sdr0_pfc1); mfsdr(SDR0_PFC1, sdr0_pfc1);
mfsdr(SDR0_USB0, usb2d0cr); mfsdr(SDR0_USB0, usb2d0cr);
mfsdr(SDR0_USB2PHY0CR, usb2phy0cr); mfsdr(SDR0_USB2PHY0CR, usb2phy0cr);
mfsdr(SDR0_USB2H0CR, usb2h0cr); mfsdr(SDR0_USB2H0CR, usb2h0cr);
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_XOCLK_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_XOCLK_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_XOCLK_EXTERNAL; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_XOCLK_EXTERNAL; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_WDINT_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_WDINT_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_WDINT_16BIT_30MHZ; /*1*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_WDINT_16BIT_30MHZ; /*1*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DVBUS_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DVBUS_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DVBUS_PURDIS; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DVBUS_PURDIS; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DWNSTR_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DWNSTR_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DWNSTR_HOST; /*1*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DWNSTR_HOST; /*1*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_UTMICN_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_UTMICN_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_UTMICN_HOST; /*1*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_UTMICN_HOST; /*1*/
/* An 8-bit/60MHz interface is the only possible alternative /* An 8-bit/60MHz interface is the only possible alternative
when connecting the Device to the PHY */ when connecting the Device to the PHY */
usb2h0cr = usb2h0cr &~SDR0_USB2H0CR_WDINT_MASK; usb2h0cr = usb2h0cr &~SDR0_USB2H0CR_WDINT_MASK;
usb2h0cr = usb2h0cr | SDR0_USB2H0CR_WDINT_16BIT_30MHZ; /*1*/ usb2h0cr = usb2h0cr | SDR0_USB2H0CR_WDINT_16BIT_30MHZ; /*1*/
/* To enable the USB 2.0 Device function through the UTMI interface */ /* To enable the USB 2.0 Device function through the UTMI interface */
usb2d0cr = usb2d0cr &~SDR0_USB2D0CR_USB2DEV_EBC_SEL_MASK; usb2d0cr = usb2d0cr &~SDR0_USB2D0CR_USB2DEV_EBC_SEL_MASK;
usb2d0cr = usb2d0cr | SDR0_USB2D0CR_USB2DEV_SELECTION; /*1*/ usb2d0cr = usb2d0cr | SDR0_USB2D0CR_USB2DEV_SELECTION; /*1*/
sdr0_pfc1 = sdr0_pfc1 &~SDR0_PFC1_UES_MASK; sdr0_pfc1 = sdr0_pfc1 &~SDR0_PFC1_UES_MASK;
sdr0_pfc1 = sdr0_pfc1 | SDR0_PFC1_UES_USB2D_SEL; /*0*/ sdr0_pfc1 = sdr0_pfc1 | SDR0_PFC1_UES_USB2D_SEL; /*0*/
mtsdr(SDR0_PFC1, sdr0_pfc1); mtsdr(SDR0_PFC1, sdr0_pfc1);
mtsdr(SDR0_USB0, usb2d0cr); mtsdr(SDR0_USB0, usb2d0cr);
mtsdr(SDR0_USB2PHY0CR, usb2phy0cr); mtsdr(SDR0_USB2PHY0CR, usb2phy0cr);
mtsdr(SDR0_USB2H0CR, usb2h0cr); mtsdr(SDR0_USB2H0CR, usb2h0cr);
/*clear resets*/ /*clear resets*/
udelay (1000); udelay (1000);
@ -264,11 +264,11 @@ int misc_init_r(void)
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_XOCLK_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_XOCLK_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_XOCLK_EXTERNAL; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_XOCLK_EXTERNAL; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DVBUS_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DVBUS_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DVBUS_PURDIS; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DVBUS_PURDIS; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DWNSTR_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DWNSTR_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DWNSTR_HOST; /*1*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DWNSTR_HOST; /*1*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_UTMICN_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_UTMICN_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_UTMICN_HOST; /*1*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_UTMICN_HOST; /*1*/
mtsdr(SDR0_USB2PHY0CR, usb2phy0cr); mtsdr(SDR0_USB2PHY0CR, usb2phy0cr);
udelay (1000); udelay (1000);
@ -287,33 +287,33 @@ int misc_init_r(void)
/*-------------------PATCH-------------------------------*/ /*-------------------PATCH-------------------------------*/
/* SDR Setting */ /* SDR Setting */
mfsdr(SDR0_USB2PHY0CR, usb2phy0cr); mfsdr(SDR0_USB2PHY0CR, usb2phy0cr);
mfsdr(SDR0_USB2H0CR, usb2h0cr); mfsdr(SDR0_USB2H0CR, usb2h0cr);
mfsdr(SDR0_USB0, usb2d0cr); mfsdr(SDR0_USB0, usb2d0cr);
mfsdr(SDR0_PFC1, sdr0_pfc1); mfsdr(SDR0_PFC1, sdr0_pfc1);
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_XOCLK_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_XOCLK_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_XOCLK_EXTERNAL; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_XOCLK_EXTERNAL; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_WDINT_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_WDINT_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_WDINT_8BIT_60MHZ; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_WDINT_8BIT_60MHZ; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DVBUS_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DVBUS_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DVBUS_PUREN; /*1*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DVBUS_PUREN; /*1*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DWNSTR_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_DWNSTR_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DWNSTR_DEV; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_DWNSTR_DEV; /*0*/
usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_UTMICN_MASK; usb2phy0cr = usb2phy0cr &~SDR0_USB2PHY0CR_UTMICN_MASK;
usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_UTMICN_DEV; /*0*/ usb2phy0cr = usb2phy0cr | SDR0_USB2PHY0CR_UTMICN_DEV; /*0*/
usb2h0cr = usb2h0cr &~SDR0_USB2H0CR_WDINT_MASK; usb2h0cr = usb2h0cr &~SDR0_USB2H0CR_WDINT_MASK;
usb2h0cr = usb2h0cr | SDR0_USB2H0CR_WDINT_8BIT_60MHZ; /*0*/ usb2h0cr = usb2h0cr | SDR0_USB2H0CR_WDINT_8BIT_60MHZ; /*0*/
usb2d0cr = usb2d0cr &~SDR0_USB2D0CR_USB2DEV_EBC_SEL_MASK; usb2d0cr = usb2d0cr &~SDR0_USB2D0CR_USB2DEV_EBC_SEL_MASK;
usb2d0cr = usb2d0cr | SDR0_USB2D0CR_EBC_SELECTION; /*0*/ usb2d0cr = usb2d0cr | SDR0_USB2D0CR_EBC_SELECTION; /*0*/
sdr0_pfc1 = sdr0_pfc1 &~SDR0_PFC1_UES_MASK; sdr0_pfc1 = sdr0_pfc1 &~SDR0_PFC1_UES_MASK;
sdr0_pfc1 = sdr0_pfc1 | SDR0_PFC1_UES_EBCHR_SEL; /*1*/ sdr0_pfc1 = sdr0_pfc1 | SDR0_PFC1_UES_EBCHR_SEL; /*1*/
mtsdr(SDR0_USB2H0CR, usb2h0cr); mtsdr(SDR0_USB2H0CR, usb2h0cr);
mtsdr(SDR0_USB2PHY0CR, usb2phy0cr); mtsdr(SDR0_USB2PHY0CR, usb2phy0cr);
mtsdr(SDR0_USB0, usb2d0cr); mtsdr(SDR0_USB0, usb2d0cr);
mtsdr(SDR0_PFC1, sdr0_pfc1); mtsdr(SDR0_PFC1, sdr0_pfc1);

3
board/amcc/yucca/yucca.c
Unescape View File

@ -958,7 +958,6 @@ int is_pci_host(struct pci_controller *hose)
return 1; return 1;
} }
int yucca_pcie_card_present(int port) int yucca_pcie_card_present(int port)
{ {
u16 reg; u16 reg;
@ -1084,8 +1083,6 @@ void yucca_setup_pcie_fpga_endpoint(int port)
(endpoint | in_be16((u16 *)FPGA_REG1C))); (endpoint | in_be16((u16 *)FPGA_REG1C)));
} }
static struct pci_controller pcie_hose[3] = {{0},{0},{0}}; static struct pci_controller pcie_hose[3] = {{0},{0},{0}};
void pcie_setup_hoses(void) void pcie_setup_hoses(void)

2
board/dave/B2/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2002 # (C) Copyright 2002
# Sysgo Real-Time Solutions, GmbH <www.elinos.com> # Sysgo Real-Time Solutions, GmbH <www.elinos.com>
# Marius Groeger <mgroeger@sysgo.de> # Marius Groeger <mgroeger@sysgo.de>

2
board/esd/cpci750/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2001 # (C) Copyright 2001
# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. # Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
# #

2
board/evb64260/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2001 # (C) Copyright 2001
# Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. # Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
# #

2
board/ispan/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# Copyright (C) 2004 Arabella Software Ltd. # Copyright (C) 2004 Arabella Software Ltd.
# Yuli Barcohen <yuli@arabellasw.com> # Yuli Barcohen <yuli@arabellasw.com>
# #

2
board/jse/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# Copyright 2004 Picture Elements, Inc. # Copyright 2004 Picture Elements, Inc.
# Stephen Williams <steve@icarus.com> # Stephen Williams <steve@icarus.com>
# #

2
board/netstar/Makefile
Unescape View File

@ -1,4 +1,4 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #

2
board/sc520_spunk/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2002 # (C) Copyright 2002
# Daniel Engström, Omicron Ceti AB, daniel@omicron.se. # Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
# #

2
board/tqm5200/cam5200_flash.c
Unescape View File

@ -46,7 +46,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
* swapping is necessary within each 16 bit wide flash 'word'. * swapping is necessary within each 16 bit wide flash 'word'.
* *
* This driver's task is to handle both flash devices: 32 bit TQM5200B * This driver's task is to handle both flash devices: 32 bit TQM5200B
* flash chip and 16 bit NIOS cpu flash chip. In the below * flash chip and 16 bit NIOS cpu flash chip. In the below
* flash_addr_table table we use least significant address bit to mark * flash_addr_table table we use least significant address bit to mark
* 16 bit flash bank and two sets of routines *_32 and *_16 to handle * 16 bit flash bank and two sets of routines *_32 and *_16 to handle
* specifics of both flashes. * specifics of both flashes.

2
board/tqm834x/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# Copyright 2004 Freescale Semiconductor, Inc. # Copyright 2004 Freescale Semiconductor, Inc.
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this

4
common/lcd.c
Unescape View File

@ -661,8 +661,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
* So, in case of Monochrome BMP we should align widths * So, in case of Monochrome BMP we should align widths
* on a byte boundary and convert them from Bit to Byte * on a byte boundary and convert them from Bit to Byte
* units. * units.
* Probably, PXA250 and MPC823 process 1bpp BMP images in * Probably, PXA250 and MPC823 process 1bpp BMP images in
* their own ways, so make the converting to be MCC200 * their own ways, so make the converting to be MCC200
* specific. * specific.
*/ */
#if defined(CONFIG_MCC200) #if defined(CONFIG_MCC200)

2
config.mk
Unescape View File

@ -25,7 +25,7 @@
ifneq ($(OBJTREE),$(SRCTREE)) ifneq ($(OBJTREE),$(SRCTREE))
ifeq ($(CURDIR),$(SRCTREE)) ifeq ($(CURDIR),$(SRCTREE))
dir := dir :=
else else
dir := $(subst $(SRCTREE)/,,$(CURDIR)) dir := $(subst $(SRCTREE)/,,$(CURDIR))
endif endif

2
cpu/i386/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# (C) Copyright 2002 # (C) Copyright 2002
# Daniel Engström, Omicron Ceti AB, daniel@omicron.se. # Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
# #

2
cpu/mpc5xxx/interrupts.c
Unescape View File

@ -32,7 +32,7 @@
* *
* Based on (well, mostly copied from) the code from the 2.4 kernel by * Based on (well, mostly copied from) the code from the 2.4 kernel by
* Dale Farnsworth <dfarnsworth@mvista.com> and Kent Borg. * Dale Farnsworth <dfarnsworth@mvista.com> and Kent Borg.
* *
* Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com> * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
* Copyright (C) 2003 Montavista Software, Inc * Copyright (C) 2003 Montavista Software, Inc
*/ */

2
cpu/mpc83xx/Makefile
Unescape View File

@ -1,7 +1,7 @@
# #
# (C) Copyright 2006 # (C) Copyright 2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# Copyright 2004 Freescale Semiconductor, Inc. # Copyright 2004 Freescale Semiconductor, Inc.
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this

24
cpu/ppc4xx/ndfc.c
Unescape View File

@ -65,8 +65,8 @@ static void ndfc_hwcontrol(struct mtd_info *mtdinfo, int cmd)
static void ndfc_write_byte(struct mtd_info *mtdinfo, u_char byte) static void ndfc_write_byte(struct mtd_info *mtdinfo, u_char byte)
{ {
struct nand_chip *this = mtdinfo->priv; struct nand_chip *this = mtdinfo->priv;
ulong base = (ulong) this->IO_ADDR_W; ulong base = (ulong) this->IO_ADDR_W;
if (hwctl & 0x1) if (hwctl & 0x1)
out8(base + NDFC_CMD, byte); out8(base + NDFC_CMD, byte);
@ -78,16 +78,16 @@ static void ndfc_write_byte(struct mtd_info *mtdinfo, u_char byte)
static u_char ndfc_read_byte(struct mtd_info *mtdinfo) static u_char ndfc_read_byte(struct mtd_info *mtdinfo)
{ {
struct nand_chip *this = mtdinfo->priv; struct nand_chip *this = mtdinfo->priv;
ulong base = (ulong) this->IO_ADDR_W; ulong base = (ulong) this->IO_ADDR_W;
return (in8(base + NDFC_DATA)); return (in8(base + NDFC_DATA));
} }
static int ndfc_dev_ready(struct mtd_info *mtdinfo) static int ndfc_dev_ready(struct mtd_info *mtdinfo)
{ {
struct nand_chip *this = mtdinfo->priv; struct nand_chip *this = mtdinfo->priv;
ulong base = (ulong) this->IO_ADDR_W; ulong base = (ulong) this->IO_ADDR_W;
while (!(in32(base + NDFC_STAT) & NDFC_STAT_IS_READY)) while (!(in32(base + NDFC_STAT) & NDFC_STAT_IS_READY))
; ;
@ -110,8 +110,8 @@ static int ndfc_dev_ready(struct mtd_info *mtdinfo)
*/ */
static void ndfc_read_buf(struct mtd_info *mtdinfo, uint8_t *buf, int len) static void ndfc_read_buf(struct mtd_info *mtdinfo, uint8_t *buf, int len)
{ {
struct nand_chip *this = mtdinfo->priv; struct nand_chip *this = mtdinfo->priv;
ulong base = (ulong) this->IO_ADDR_W; ulong base = (ulong) this->IO_ADDR_W;
uint32_t *p = (uint32_t *) buf; uint32_t *p = (uint32_t *) buf;
for(;len > 0; len -= 4) for(;len > 0; len -= 4)
@ -120,8 +120,8 @@ static void ndfc_read_buf(struct mtd_info *mtdinfo, uint8_t *buf, int len)
static void ndfc_write_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len) static void ndfc_write_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len)
{ {
struct nand_chip *this = mtdinfo->priv; struct nand_chip *this = mtdinfo->priv;
ulong base = (ulong) this->IO_ADDR_W; ulong base = (ulong) this->IO_ADDR_W;
uint32_t *p = (uint32_t *) buf; uint32_t *p = (uint32_t *) buf;
for(; len > 0; len -= 4) for(; len > 0; len -= 4)
@ -130,8 +130,8 @@ static void ndfc_write_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len
static int ndfc_verify_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len) static int ndfc_verify_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len)
{ {
struct nand_chip *this = mtdinfo->priv; struct nand_chip *this = mtdinfo->priv;
ulong base = (ulong) this->IO_ADDR_W; ulong base = (ulong) this->IO_ADDR_W;
uint32_t *p = (uint32_t *) buf; uint32_t *p = (uint32_t *) buf;
for(; len > 0; len -= 4) for(; len > 0; len -= 4)

6
cpu/ppc4xx/start.S
Unescape View File

@ -173,9 +173,9 @@
/**************************************************************************/ /**************************************************************************/
_start_440: _start_440:
/*--------------------------------------------------------------------+ /*--------------------------------------------------------------------+
| 440EPX BUP Change - Hardware team request | 440EPX BUP Change - Hardware team request
+--------------------------------------------------------------------*/ +--------------------------------------------------------------------*/
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
sync sync
nop nop

6
drivers/serial.c
Unescape View File

@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_CONS_INDEX) #if !defined(CONFIG_CONS_INDEX)
#if defined (CONFIG_SERIAL_MULTI) #if defined (CONFIG_SERIAL_MULTI)
/* with CONFIG_SERIAL_MULTI we might have no console /* with CONFIG_SERIAL_MULTI we might have no console
* on these devices * on these devices
*/ */
#else #else
#error "No console index specified." #error "No console index specified."
@ -238,7 +238,7 @@ serial_putc(const char c)
#endif #endif
#if defined(CONFIG_SERIAL_MULTI) #if defined(CONFIG_SERIAL_MULTI)
static inline void static inline void
serial_putc_raw_dev(unsigned int dev_index,const char c) serial_putc_raw_dev(unsigned int dev_index,const char c)
{ {
_serial_putc_raw(c,dev_index); _serial_putc_raw(c,dev_index);
@ -310,7 +310,7 @@ serial_setbrg(void)
#if defined(CONFIG_SERIAL_MULTI) #if defined(CONFIG_SERIAL_MULTI)
DECLARE_ESERIAL_FUNCTIONS(1); DECLARE_ESERIAL_FUNCTIONS(1);
struct serial_device eserial1_device = struct serial_device eserial1_device =
INIT_ESERIAL_STRUCTURE(1,"eserial0","EUART1"); INIT_ESERIAL_STRUCTURE(1,"eserial0","EUART1");
DECLARE_ESERIAL_FUNCTIONS(2); DECLARE_ESERIAL_FUNCTIONS(2);
struct serial_device eserial2_device = struct serial_device eserial2_device =

1
drivers/sk98lin/Makefile
Unescape View File

@ -104,4 +104,3 @@ include $(SRCTREE)/rules.mk
sinclude $(obj).depend sinclude $(obj).depend
######################################################################### #########################################################################

2
include/common.h
Unescape View File

@ -110,7 +110,7 @@ typedef volatile unsigned char vu_char;
#endif /* DEBUG */ #endif /* DEBUG */
#define BUG() do { \ #define BUG() do { \
printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
panic("BUG!"); \ panic("BUG!"); \
} while (0) } while (0)
#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0) #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)

2
lib_generic/Makefile
Unescape View File

@ -29,7 +29,7 @@ COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \
bzlib_randtable.o bzlib_huffman.o \ bzlib_randtable.o bzlib_huffman.o \
crc32.o ctype.o display_options.o ldiv.o \ crc32.o ctype.o display_options.o ldiv.o \
string.o vsprintf.o zlib.o string.o vsprintf.o zlib.o
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))

4
nand_spl/nand_boot.c
Unescape View File

@ -34,7 +34,7 @@ extern int jump_to_uboot(ulong addr);
static int nand_is_bad_block(struct mtd_info *mtd, int block) static int nand_is_bad_block(struct mtd_info *mtd, int block)
{ {
struct nand_chip *this = mtd->priv; struct nand_chip *this = mtd->priv;
int page_addr = block * CFG_NAND_PAGE_COUNT; int page_addr = block * CFG_NAND_PAGE_COUNT;
/* Begin command latch cycle */ /* Begin command latch cycle */
@ -73,7 +73,7 @@ static int nand_is_bad_block(struct mtd_info *mtd, int block)
static int nand_read_page(struct mtd_info *mtd, int block, int page, uchar *dst) static int nand_read_page(struct mtd_info *mtd, int block, int page, uchar *dst)
{ {
struct nand_chip *this = mtd->priv; struct nand_chip *this = mtd->priv;
int page_addr = page + block * CFG_NAND_PAGE_COUNT; int page_addr = page + block * CFG_NAND_PAGE_COUNT;
int i; int i;

2
tools/Makefile
Unescape View File

@ -108,7 +108,7 @@ endif
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
# now $(obj) is defined # now $(obj) is defined
SRCS := $(addprefix $(obj),$(OBJ_LINKS:.o=.c)) $(OBJ_FILES:.o=.c) SRCS := $(addprefix $(obj),$(OBJ_LINKS:.o=.c)) $(OBJ_FILES:.o=.c)
BINS := $(addprefix $(obj),$(BIN_FILES)) BINS := $(addprefix $(obj),$(BIN_FILES))
# #

2
tools/gdb/Makefile
Unescape View File

@ -31,7 +31,7 @@ BINS = gdbsend gdbcont
COBJS = gdbsend.o gdbcont.o error.o remote.o serial.o COBJS = gdbsend.o gdbcont.o error.o remote.o serial.o
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)
BINS := $(addprefix $(obj),$(BINS)) BINS := $(addprefix $(obj),$(BINS))
# #

Write Preview
Loading…
Cancel
Save