eNET: General code cleanup

diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c
index 8e11acf615af8c5f89e4fd208400770ac1b4c651..e64a395dda6c32996001b087584c829d08462e75 100644 (file)
--- a/board/eNET/eNET.c
+++ b/board/eNET/eNET.c
@@ -35,16 +35,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#undef SC520_CDP_DEBUG
-
-#ifdef SC520_CDP_DEBUG
-#define        PRINTF(fmt,args...)     printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
-unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
-
 static void enet_timer_isr(void);
 static void enet_toggle_run_led(void);
 static void enet_setup_pars(void);
@@ -199,22 +189,23 @@ int last_stage_init(void)
 
        outb(0x00, LED_LATCH_ADDRESS);
 
-       register_timer_isr (enet_timer_isr);
+       register_timer_isr(enet_timer_isr);
 
        printf("Serck Controls eNET\n");
 
        return 0;
 }
 
-ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t * info)
+ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
 {
        if (banknum == 0) {     /* non-CFI boot flash */
                info->portwidth = FLASH_CFI_8BIT;
                info->chipwidth = FLASH_CFI_BY8;
                info->interface = FLASH_CFI_X8;
                return 1;
-       } else
+       } else {
                return 0;
+       }
 }
 
 int board_eth_init(bd_t *bis)

diff --git a/board/eNET/eNET_start.S b/board/eNET/eNET_start.S
index 137fe41b4be0fd50daea279775f3282a008ac4d4..1b3d289f5e6f7d6e0cdce4356c4b5dc8e9a5ffc6 100644 (file)
--- a/board/eNET/eNET_start.S
+++ b/board/eNET/eNET_start.S
@@ -29,10 +29,3 @@ early_board_init:
        /* No 32-bit board specific initialisation */
        jmp     early_board_init_ret
 
-.globl cpu_halt_asm
-cpu_halt_asm:
-       movb    $0x0f, %al
-       movw    $LED_LATCH_ADDRESS, %dx
-       outb    %al, %dx
-       hlt
-       jmp cpu_halt_asm

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index faeb52f56f42fd2f3d9085d5891a4374d06747d4..506f4c1c6933667b750bac12d20dca1841ad4070 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -29,124 +29,114 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * Stuff still to be dealt with -
- */
-#define CONFIG_RTC_MC146818
-#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
-
 /*
  * High Level Configuration Options
  * (easy to change)
  */
-#define DEBUG_PARSER
-
-#define CONFIG_X86                     1       /* Intel X86 CPU */
-#define CONFIG_SYS_SC520               1       /* AMD SC520 */
+#define CONFIG_X86
+#define CONFIG_SYS_SC520
 #define CONFIG_SYS_SC520_SSI
-#define CONFIG_SHOW_BOOT_PROGRESS      1
-#define CONFIG_LAST_STAGE_INIT         1
+#define CONFIG_SHOW_BOOT_PROGRESS
+#define CONFIG_LAST_STAGE_INIT
 
-/*
- * If CONFIG_HW_WATCHDOG is not defined, the watchdog jumper on the
+/*-----------------------------------------------------------------------
+ * Watchdog Configuration
+ * NOTE: If CONFIG_HW_WATCHDOG is NOT defined, the watchdog jumper on the
  * bottom (processor) board MUST be removed!
  */
 #undef CONFIG_WATCHDOG
 #define CONFIG_HW_WATCHDOG
 
- /*-----------------------------------------------------------------------
-  * Serial Configuration
-  */
+/*-----------------------------------------------------------------------
+ * Real Time Clock Configuration
+ */
+#define CONFIG_RTC_MC146818
+#define CONFIG_SYS_ISA_IO_BASE_ADDRESS         0
+
+/*-----------------------------------------------------------------------
+ * Serial Configuration
+ */
 #define CONFIG_SERIAL_MULTI
-#define CONFIG_CONS_INDEX              1
+#define CONFIG_CONS_INDEX                      1
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    1
-#define CONFIG_SYS_NS16550_CLK         1843200
-#define CONFIG_BAUDRATE                        9600
-#define CONFIG_SYS_BAUDRATE_TABLE      \
-       {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
-
-#define CONFIG_SYS_NS16550_COM1                UART0_BASE
-#define CONFIG_SYS_NS16550_COM2                UART1_BASE
-#define CONFIG_SYS_NS16550_COM3                (0x1000 + UART0_BASE)
-#define CONFIG_SYS_NS16550_COM4                (0x1000 + UART1_BASE)
+#define CONFIG_SYS_NS16550_REG_SIZE            1
+#define CONFIG_SYS_NS16550_CLK                 1843200
+#define CONFIG_BAUDRATE                                9600
+#define CONFIG_SYS_BAUDRATE_TABLE              {300, 600, 1200, 2400, 4800, \
+                                                9600, 19200, 38400, 115200}
+#define CONFIG_SYS_NS16550_COM1                        UART0_BASE
+#define CONFIG_SYS_NS16550_COM2                        UART1_BASE
+#define CONFIG_SYS_NS16550_COM3                        (0x1000 + UART0_BASE)
+#define CONFIG_SYS_NS16550_COM4                        (0x1000 + UART1_BASE)
 #define CONFIG_SYS_NS16550_PORT_MAPPED
 
- /*-----------------------------------------------------------------------
-  * Video Configuration
-  */
-#undef CONFIG_VIDEO                    /* No Video Hardware */
-#undef CONFIG_CFB_CONSOLE
-
-/*
- * Size of malloc() pool
+/*-----------------------------------------------------------------------
+ * Video Configuration
  */
-#define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + 128*1024)
+#undef CONFIG_VIDEO
+#undef CONFIG_CFB_CONSOLE
 
 /*-----------------------------------------------------------------------
  * Command line configuration.
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_BDI         /* bdinfo                       */
-#define CONFIG_CMD_BOOTD       /* bootd                        */
-#define CONFIG_CMD_CONSOLE     /* coninfo                      */
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_BOOTD
+#define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ECHO                /* echo arguments               */
-#define CONFIG_CMD_FLASH       /* flinfo, erase, protect       */
-#define CONFIG_CMD_FPGA                /* FPGA configuration Support   */
-#define CONFIG_CMD_IMI         /* iminfo                       */
-#define CONFIG_CMD_IMLS                /* List all found images        */
-#define CONFIG_CMD_IRQ         /* IRQ Information              */
-#define CONFIG_CMD_ITEST       /* Integer (and string) test    */
-#define CONFIG_CMD_LOADB       /* loadb                        */
-#define CONFIG_CMD_LOADS       /* loads                        */
-#define CONFIG_CMD_MEMORY      /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC                /* Misc functions like sleep etc*/
-#define CONFIG_CMD_NET         /* bootp, tftpboot, rarpboot    */
-#undef CONFIG_CMD_NFS          /* NFS support                  */
-#define CONFIG_CMD_PCI         /* PCI support                  */
-#define CONFIG_CMD_PING                /* ICMP echo support            */
-#define CONFIG_CMD_RUN         /* run command in env variable  */
-#define CONFIG_CMD_SAVEENV     /* saveenv                      */
-#define CONFIG_CMD_SETGETDCR   /* DCR support on 4xx           */
-#define CONFIG_CMD_SOURCE      /* "source" command Support     */
-#define CONFIG_CMD_XIMG                /* Load part of Multi Image     */
-
-#define CONFIG_BOOTDELAY               15
-#define CONFIG_BOOTARGS                        "root=/dev/mtdblock0 console=ttyS0,9600"
-/* #define CONFIG_BOOTCOMMAND          "bootm 38000000" */
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_FPGA
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_IMLS
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_ITEST
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_LOADS
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_MISC
+#define CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_RUN
+#define CONFIG_CMD_SAVEENV
+#define CONFIG_CMD_SETGETDCR
+#define CONFIG_CMD_SOURCE
+#define CONFIG_CMD_XIMG
+
+#define CONFIG_BOOTDELAY                       15
+#define CONFIG_BOOTARGS                                "root=/dev/mtdblock0 console=ttyS0,9600"
 
 #if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE           115200          /* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX          2               /* which serial port to use */
+#define CONFIG_KGDB_BAUDRATE                   115200
+#define CONFIG_KGDB_SER_INDEX                  2
 #endif
 
 /*
  * Miscellaneous configurable options
  */
-#define        CONFIG_SYS_LONGHELP                             /* undef to save memory         */
-#define        CONFIG_SYS_PROMPT               "boot > "       /* Monitor Command Prompt       */
-#define        CONFIG_SYS_CBSIZE               256             /* Console I/O Buffer Size      */
-#define        CONFIG_SYS_PBSIZE               (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT) + \
-                                        16)            /* Print Buffer Size */
-#define        CONFIG_SYS_MAXARGS              16              /* max number of command args   */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size    */
+#define        CONFIG_SYS_LONGHELP
+#define        CONFIG_SYS_PROMPT                       "boot > "
+#define        CONFIG_SYS_CBSIZE                       256
+#define        CONFIG_SYS_PBSIZE                       (CONFIG_SYS_CBSIZE + \
+                                                sizeof(CONFIG_SYS_PROMPT) + \
+                                                16)
+#define        CONFIG_SYS_MAXARGS                      16
+#define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_MEMTEST_START       0x00100000      /* memtest works on     */
-#define CONFIG_SYS_MEMTEST_END         0x01000000      /* 1 ... 16 MB in DRAM  */
-
-#define        CONFIG_SYS_LOAD_ADDR            0x100000        /* default load address */
-
-#define        CONFIG_SYS_HZ                   1000            /* incrementer freq: 1kHz */
+#define CONFIG_SYS_MEMTEST_START               0x00100000
+#define CONFIG_SYS_MEMTEST_END                 0x01000000
+#define        CONFIG_SYS_LOAD_ADDR                    0x100000
+#define        CONFIG_SYS_HZ                           1000
 
 /*-----------------------------------------------------------------------
  * SDRAM Configuration
  */
-#define CONFIG_SYS_SDRAM_DRCTMCTL      0x18
-#define CONFIG_NR_DRAM_BANKS           4
+#define CONFIG_SYS_SDRAM_DRCTMCTL              0x18
+#define CONFIG_NR_DRAM_BANKS                   4
 
 /* CONFIG_SYS_SDRAM_DRCTMCTL Overrides the following*/
 #undef CONFIG_SYS_SDRAM_PRECHARGE_DELAY
@@ -158,95 +148,77 @@
 /*-----------------------------------------------------------------------
  * CPU Features
  */
-#define CONFIG_SYS_SC520_HIGH_SPEED    0       /* 100 or 133MHz */
-#define CONFIG_SYS_SC520_RESET                 /* use SC520 MMCR's to reset cpu */
-#define CONFIG_SYS_SC520_TIMER                 /* use SC520 swtimers */
-#undef  CONFIG_SYS_GENERIC_TIMER               /* use the i8254 PIT timers */
-#undef  CONFIG_SYS_TSC_TIMER                   /* use the Pentium TSC timers */
-#define CONFIG_SYS_USE_SIO_UART                0       /* prefer the uarts on the SIO to those
-                                        * in the SC520 on the CDP */
+#define CONFIG_SYS_SC520_HIGH_SPEED            0
+#define CONFIG_SYS_SC520_RESET
+#define CONFIG_SYS_SC520_TIMER
+#undef  CONFIG_SYS_GENERIC_TIMER
 #define CONFIG_SYS_PCAT_INTERRUPTS
-#define CONFIG_SYS_NUM_IRQS            16
+#define CONFIG_SYS_NUM_IRQS                    16
 
 /*-----------------------------------------------------------------------
- * Memory organization
+ * Memory organization:
+ * 32kB Stack
+ * 256kB Monitor
  */
-#define CONFIG_SYS_STACK_SIZE          0x8000          /* Size of bootloader stack */
-#define CONFIG_SYS_BL_START_FLASH      0x38040000      /* Address of relocated code */
-#define CONFIG_SYS_BL_START_RAM                0x03fd0000      /* Address of relocated code */
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Mon       */
-#define CONFIG_SYS_FLASH_BASE          0x38000000      /* Boot Flash */
-#define CONFIG_SYS_FLASH_BASE_1                0x10000000      /* StrataFlash 1 */
-#define CONFIG_SYS_FLASH_BASE_2                0x11000000      /* StrataFlash 2 */
-
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */
+#define CONFIG_SYS_STACK_SIZE                  0x8000
+#define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN                 (256 * 1024)
+#define CONFIG_SYS_MALLOC_LEN                  (CONFIG_ENV_SIZE + 128*1024)
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
- /*-----------------------------------------------------------------------
-  * FLASH configuration
-  */
-#define CONFIG_FLASH_CFI_DRIVER                                /* Use the common driver */
+/*-----------------------------------------------------------------------
+ * FLASH configuration
+ * 512kB Boot Flash @ 0x38000000 (Monitor @ 38040000)
+ * 16MB StrataFlash #1 @ 0x10000000
+ * 16MB StrataFlash #2 @ 0x11000000
+ */
+#define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_FLASH_CFI_LEGACY
-#define CONFIG_SYS_FLASH_CFI                           /* Flash is CFI conformant */
-#define CONFIG_SYS_MAX_FLASH_BANKS     3       /* max number of memory banks */
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE,   \
-                                        CONFIG_SYS_FLASH_BASE_1, \
-                                        CONFIG_SYS_FLASH_BASE_2}
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_MAX_FLASH_BANKS             3
+#define CONFIG_SYS_FLASH_BASE                  0x38000000
+#define CONFIG_SYS_FLASH_BASE_1                        0x10000000
+#define CONFIG_SYS_FLASH_BASE_2                        0x11000000
+#define CONFIG_SYS_FLASH_BANKS_LIST            {CONFIG_SYS_FLASH_BASE,   \
+                                                CONFIG_SYS_FLASH_BASE_1, \
+                                                CONFIG_SYS_FLASH_BASE_2}
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 #undef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-#define CONFIG_SYS_MAX_FLASH_SECT      128     /* max number of sectors on one chip */
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_8BIT
+#define CONFIG_SYS_MAX_FLASH_SECT              128
+#define CONFIG_SYS_FLASH_CFI_WIDTH             FLASH_CFI_8BIT
 #define CONFIG_SYS_FLASH_LEGACY_512Kx8
-
- /*-----------------------------------------------------------------------
-  * Environment configuration
-  */
-#define CONFIG_ENV_IS_IN_FLASH         1
-#define CONFIG_ENV_SECT_SIZE           0x20000 /* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_ADDR                        CONFIG_SYS_FLASH_BASE_1
+#define CONFIG_SYS_FLASH_ERASE_TOUT            2000    /* ms */
+#define CONFIG_SYS_FLASH_WRITE_TOUT            2000    /* ms */
+/*-----------------------------------------------------------------------
+ * Environment configuration
+ */
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE                   0x20000
+#define CONFIG_ENV_SIZE                                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                                CONFIG_SYS_FLASH_BASE_1
 /* Redundant Copy */
-#define CONFIG_ENV_ADDR_REDUND         (CONFIG_SYS_FLASH_BASE_1 + \
-                                        CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SECT_SIZE
-
-
- /*-----------------------------------------------------------------------
-  * PCI configuration
-  */
-#define CONFIG_PCI                                /* include pci support */
-#define CONFIG_PCI_PNP                            /* pci plug-and-play */
-#define CONFIG_SYS_FIRST_PCI_IRQ   10
-#define CONFIG_SYS_SECOND_PCI_IRQ  9
-#define CONFIG_SYS_THIRD_PCI_IRQ   11
-#define CONFIG_SYS_FORTH_PCI_IRQ   15
-
- /*
+#define CONFIG_ENV_ADDR_REDUND                 (CONFIG_SYS_FLASH_BASE_1 + \
+                                                CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND                 CONFIG_ENV_SECT_SIZE
+
+/*-----------------------------------------------------------------------
+ * PCI configuration
+ */
+#define CONFIG_PCI
+#define CONFIG_PCI_PNP
+#define CONFIG_SYS_FIRST_PCI_IRQ               10
+#define CONFIG_SYS_SECOND_PCI_IRQ              9
+#define CONFIG_SYS_THIRD_PCI_IRQ               11
+#define CONFIG_SYS_FORTH_PCI_IRQ               15
+
+/*-----------------------------------------------------------------------
  * Network device (TRL8100B) support
  */
 #define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
 
-/*-----------------------------------------------------------------------
- * FPGA configuration
- */
-#define CONFIG_SYS_FPGA_PROGRAM_PIO_BIT                0x2000
-#define CONFIG_SYS_FPGA_INIT_PIO_BIT           0x4000
-#define CONFIG_SYS_FPGA_DONE_PIO_BIT           0x8000
-#define CONFIG_SYS_FPGA_PIO_DATA               SC520_PIODATA31_16
-#define CONFIG_SYS_FPGA_PIO_DIRECTION          SC520_PIODIR31_16
-#define CONFIG_SYS_FPGA_PIO_CLR                SC520_PIOCLR31_16
-#define CONFIG_SYS_FPGA_PIO_SET                SC520_PIOSET31_16
-#define CONFIG_SYS_FPGA_PROGRAM_BIT_DROP_TIME  1       /* milliseconds */
-#define CONFIG_SYS_FPGA_MAX_INIT_TIME          10      /* milliseconds */
-#define CONFIG_SYS_FPGA_MAX_FINALISE_TIME      10      /* milliseconds */
-#define CONFIG_SYS_FPGA_SSI_DATA_RATE          8333    /* kHz (33.3333MHz xtal) */
-
 /*-----------------------------------------------------------------------
  * BOOTCS Control (for AM29LV040B-120JC)
  *
@@ -614,17 +586,4 @@
  */
 #define CONFIG_SYS_SC520_DPRAM_PAR             0x50018100
 
-#ifndef __ASSEMBLER__
-extern unsigned long ip;
-
-#define PRINTIP                                asm ("call 0\n" \
-                                           "0:\n" \
-                                           "pop %%eax\n" \
-                                           "movl %%eax, %0\n" \
-                                           :"=r"(ip) \
-                                           : /* No Input Registers */ \
-                                           :"%eax"); \
-                                           printf("IP: 0x%08lx (File: %s, Line: %d)\n", ip, __FILE__, __LINE__);
-
-#endif
 #endif /* __CONFIG_H */