Coding style cleanup

Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/CREDITS b/CREDITS
index 6e44db470853a4d28f3371b156f24f2ba09b6aa3..0953e7b952ada10f4e438d71e37a708159023624 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -147,6 +147,11 @@ N: Daniel Engstr
 E: daniel@omicron.se
 D: x86 port, Support for sc520_cdp board
 
+N: Hayden Fraser
+E: Hayden.Fraser@freescale.com
+D: Support for ColdFire MCF5253
+W: www.freescale.com
+
 N: Dr. Wolfgang Grandegger
 E: wg@denx.de
 D: Support for Interphase 4539 T1/E1/J1 PMC, PN62, CCM, SCM boards
@@ -283,6 +288,11 @@ E: team@leox.org
 D: Support for LEOX boards, DS164x RTC
 W: http://www.leox.org
 
+N: TsiChung Liew
+E: Tsi-Chung.Liew@freescale.com
+D: Support for ColdFire MCF523x, MCF532x, MCF5445x
+W: www.freescale.com
+
 N: Leif Lindholm
 E: leif.lindholm@i3micro.com
 D: Support for AMD dbau1550 board.
@@ -297,6 +307,11 @@ N: Raymond Lo
 E: lo@routefree.com
 D: Support for DOS partitions
 
+N: James MacAulay
+E: james.macaulay@amirix.com
+D: Suppport for Amirix AP1000
+W: www.amirix.com
+
 N: Dan Malek
 E: dan@embeddedalley.com
 D: FADSROM, the grandfather of all of this
@@ -372,8 +387,9 @@ D: Support for the Wind River sbc405, sbc8240 board
 W: http://www.windriver.com
 
 N: Stefan Roese
-E: stefan.roese@esd-electronics.com
-D: AMCC PPC401/403/405GP Support; Windows environment support
+E: sr@denx.de
+D: AMCC PPC4xx Support
+W: http://www.denx.de
 
 N: Erwin Rol
 E: erwin@muffin.org
@@ -407,6 +423,11 @@ N: Art Shipkowski
 E: art@videon-central.com
 D: Support for NetSilicon NS7520
 
+N: Michal Simek
+E: monstr@monstr.eu
+D: Support for Microblaze, ML401, XUPV2P board
+W: www.monstr.eu
+
 N: Yasushi Shoji
 E: yashi@atmark-techno.com
 D: Support for Xilinx MicroBlaze, for Atmark Techno SUZAKU FPGA board
@@ -420,6 +441,11 @@ E: andrea.scian@dave-tech.it
 D: Port to B2 board
 W: www.dave-tech.it
 
+N: Timur Tabi
+E: timur@freescale.com
+D: Support for MPC8349E-mITX
+W: www.freescale.com
+
 N: Rob Taylor
 E: robt@flyingpig.com
 D: Port to MBX860T and Sandpoint8240
@@ -473,29 +499,3 @@ N: Alex Zuepke
 E: azu@sysgo.de
 D: Overall improvements on StrongARM, ARM720TDMI; Support for Tuxscreen; initial PCMCIA support for ARM
 W: www.elinos.com
-
-N: James MacAulay
-E: james.macaulay@amirix.com
-D: Suppport for Amirix AP1000
-W: www.amirix.com
-
-N: Timur Tabi
-E: timur@freescale.com
-D: Support for MPC8349E-mITX
-W: www.freescale.com
-
-N: Michal Simek
-E: monstr@monstr.eu
-D: Support for Microblaze, ML401, XUPV2P board
-W: www.monstr.eu
-
-N: TsiChung Liew
-E: Tsi-Chung.Liew@freescale.com
-D: Support for ColdFire MCF523x, MCF532x, MCF5445x
-W: www.freescale.com
-
-N: Hayden Fraser
-E: Hayden.Fraser@freescale.com
-D: Support for ColdFire MCF5253
-W: www.freescale.com
-

diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index b0bf4139429d45adeb2164b5d778f334451b5363..e8f621ba3f3afa6d34a0f6e200e6d0c46f31221b 100644 (file)
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -111,4 +111,3 @@ int testdram (void) {
 
        return (0);
 }
-

diff --git a/board/freescale/m5253evbe/m5253evbe.c b/board/freescale/m5253evbe/m5253evbe.c
index 67fab5b02096ca9ac828857a3570b7b2cedb9eb0..43aa84de227e081c08f8c56ea132fc3bb1a5b91d 100644 (file)
--- a/board/freescale/m5253evbe/m5253evbe.c
+++ b/board/freescale/m5253evbe/m5253evbe.c
@@ -130,4 +130,3 @@ void ide_set_reset(int idereset)
        }
 }
 #endif                         /* CONFIG_CMD_IDE */
-

diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index 1411a1a4c2d26aef7bfef242616fa5336f56b3d7..6a0278252faade611e038a223eda6009fe3041b8 100644 (file)
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -162,4 +162,3 @@ void pci_init_board(void)
        pci_mcf5445x_init(&hose);
 }
 #endif                         /* CONFIG_PCI */
-

diff --git a/cpu/mcf523x/cpu_init.c b/cpu/mcf523x/cpu_init.c
index a31054d9ad349bd8cb1fdf552c53f22bd2a33135..55c9cd356d1525e3dd4077e6538376d568371993 100644 (file)
--- a/cpu/mcf523x/cpu_init.c
+++ b/cpu/mcf523x/cpu_init.c
@@ -127,19 +127,19 @@ int cpu_init_r(void)
 
 void uart_port_conf(void)
 {
-        volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-
-        /* Setup Ports: */
-        switch (CFG_UART_PORT) {
-        case 0:
-                gpio->par_uart = (GPIO_PAR_UART_U0RXD | GPIO_PAR_UART_U0TXD);
-                break;
-        case 1:
-                gpio->par_uart =
-                    (GPIO_PAR_UART_U1RXD_U1RXD | GPIO_PAR_UART_U1TXD_U1TXD);
-                break;
-        case 2:
-                gpio->par_timer = (GPIO_PAR_UART_U2RXD | GPIO_PAR_UART_U2TXD);
-                break;
-        }
+       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
+
+       /* Setup Ports: */
+       switch (CFG_UART_PORT) {
+       case 0:
+               gpio->par_uart = (GPIO_PAR_UART_U0RXD | GPIO_PAR_UART_U0TXD);
+               break;
+       case 1:
+               gpio->par_uart =
+                       (GPIO_PAR_UART_U1RXD_U1RXD | GPIO_PAR_UART_U1TXD_U1TXD);
+               break;
+       case 2:
+               gpio->par_timer = (GPIO_PAR_UART_U2RXD | GPIO_PAR_UART_U2TXD);
+               break;
+       }
 }

diff --git a/cpu/mcf523x/speed.c b/cpu/mcf523x/speed.c
index 509109d0ed0049b22c7cf500046a30173f771f55..247d3188bb200b143d0bd4dccc2043b2d0317f71 100644 (file)
--- a/cpu/mcf523x/speed.c
+++ b/cpu/mcf523x/speed.c
@@ -41,8 +41,9 @@ int get_clocks(void)
        pll->syncr = PLL_SYNCR_MFD(1);
 
        while (!(pll->synsr & PLL_SYNSR_LOCK));
-       
+
        gd->bus_clk = CFG_CLK;
        gd->cpu_clk = (gd->bus_clk * 2);
+
        return (0);
 }

diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c
index f41d77bc599bb11dd7a985eb3edeab923d72ec2d..458b85ef144f4bb220aa78c5bfcad4f0364fbfdd 100644 (file)
--- a/cpu/mcf52x2/cpu_init.c
+++ b/cpu/mcf52x2/cpu_init.c
@@ -63,7 +63,7 @@ void cpu_init_f(void)
        mbar2_writeByte(MCFSIM_INTBASE, 0x40);  /* Base interrupts at 64 */
        mbar2_writeByte(MCFSIM_SPURVEC, 0x00);
 
-       /*mbar2_writeLong(MCFSIM_IDECONFIG1, 0x00000020); *//* Enable a 1 cycle pre-drive cycle on CS1 */
+       /*mbar2_writeLong(MCFSIM_IDECONFIG1, 0x00000020); */ /* Enable a 1 cycle pre-drive cycle on CS1 */
 
        /*
         *  Setup chip selects...

diff --git a/doc/README.m5253evbe b/doc/README.m5253evbe
index 7f2afcf156b1a7216ae856b250ddfb356b719c3f..0426cb1d4ed39868f66800e8409c4e51c602fcc3 100644 (file)
--- a/doc/README.m5253evbe
+++ b/doc/README.m5253evbe
@@ -18,14 +18,14 @@ Created 06/05/2007
        SDR:    0x00000000-0x00ffffff
        SRAM0:  0x20010000-0x20017fff
        SRAM1:  0x20000000-0x2000ffff
-       MBAR1:  0x10000000-0x4fffffff 
+       MBAR1:  0x10000000-0x4fffffff
        MBAR2:  0x80000000-0xCfffffff
-       Flash:  0xffe00000-0xffffffff 
+       Flash:  0xffe00000-0xffffffff
 
 3. DEFINITIONS AND COMPILATION
 ==============================
 3.1 Explanation on NEW definitions in include/configs/M5253EVBE.h
-       CONFIG_MCF52x2          Processor family 
+       CONFIG_MCF52x2          Processor family
        CONFIG_MCF5253          MCF5253 specific
        CONFIG_M5253EVBE        Amadeus Plus board specific
        CFG_CLK                 Define Amadeus Plus CPU Clock

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index b300b68bcfa10462a50b68406ff395d099e6459e..de7ea42930f748aaebdca24bec88cd906af39d66 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -192,4 +192,3 @@
 #define CFG_GPIO1_LED          0x00400000      /* user led                     */
 
 #endif /* M5249 */
-

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 9ad74e2bc67fb22fd5e2c4144057c85ff95e6de1..48170e7a35a7965c2f8e1c4fa92085e249fe1b81 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -210,4 +210,3 @@
 #define CFG_GPIO1_LED          0x00400000      /* user led */
 
 #endif                         /* _M5253EVB_H */
-

diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/m68k_linux.c
index fde1744e45cfc1e59fcec569fb0346969221f957..bea97441b14570293dcdafbbe6fa0acbc65fa816 100644 (file)
--- a/lib_m68k/m68k_linux.c
+++ b/lib_m68k/m68k_linux.c
@@ -92,7 +92,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
         */
        asm("movel %%a7, %%d0\n"
            "movel %%d0, %0\n": "=d"(sp): :"%d0");
-       \rdebug("## Current stack ends at 0x%08lX ", sp);
+
+       debug("## Current stack ends at 0x%08lX ", sp);
 
        sp -= 2048;             /* just to be sure */
        if (sp > CFG_BOOTMAPSZ)
@@ -269,7 +270,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
                                 */
                                asm("movel %%a7, %%d0\n"
                                    "movel %%d0, %0\n": "=d"(nsp): :"%d0");
-                               \r                               nsp -= 2048;    /* just to be sure */
+
+                               nsp -= 2048;    /* just to be sure */
                                nsp &= ~0xF;
 
                                if (nsp > initrd_high)  /* limit as specified */