summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:48 +1100
committerGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:48 +1100
commitcfbe861506e2dc3250ac99dc45bb3d1ac60f4857 (patch)
treec14549393584a965f4f0f62530e73167befd1a69 /board
parentc083e4bab1679814969405dbde9b75b8b97cf850 (diff)
downloadblackbird-obmc-uboot-cfbe861506e2dc3250ac99dc45bb3d1ac60f4857.tar.gz
blackbird-obmc-uboot-cfbe861506e2dc3250ac99dc45bb3d1ac60f4857.zip
eNET: General code cleanup
Diffstat (limited to 'board')
-rw-r--r--board/eNET/eNET.c17
-rw-r--r--board/eNET/eNET_start.S7
2 files changed, 4 insertions, 20 deletions
diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c
index 8e11acf615..e64a395dda 100644
--- 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 137fe41b4b..1b3d289f5e 100644
--- 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
OpenPOWER on IntegriCloud