diff options
Diffstat (limited to 'board/sandburst/karef')
| -rw-r--r-- | board/sandburst/karef/karef.c | 9 | ||||
| -rw-r--r-- | board/sandburst/karef/karef.h | 4 | ||||
| -rw-r--r-- | board/sandburst/karef/u-boot.lds | 5 | ||||
| -rw-r--r-- | board/sandburst/karef/u-boot.lds.debug | 3 |
4 files changed, 9 insertions, 12 deletions
diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 3856a39..2d71d3b 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -242,7 +242,7 @@ int checkboard (void) sys_info_t sysinfo; unsigned char brd_rev, brd_id; unsigned short sernum; - unsigned char scan_rev, scan_id, ofem_rev, ofem_id; + unsigned char scan_rev, scan_id, ofem_rev=0, ofem_id=0; unsigned char ofem_brd_rev, ofem_brd_id; KAREF_FPGA_REGS_ST *karef_ps; OFEM_FPGA_REGS_ST *ofem_ps; @@ -305,12 +305,6 @@ int checkboard (void) printf("OFEM Board Rev:\t0x%02X\tID: 0x%02X\n", ofem_brd_id, ofem_brd_rev); } - printf ("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000); - printf ("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000); - printf ("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000); - printf ("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000); - printf ("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000); - /* Fix the ack in the bme 32 */ udelay(5000); out32(CFG_BME32_BASE + 0x0000000C, 0x00000001); @@ -349,7 +343,6 @@ int misc_init_r (void) char envstr[255]; KAREF_FPGA_REGS_ST *karef_ps; OFEM_FPGA_REGS_ST *ofem_ps; - unsigned char ofem_id; if(NULL != getenv("secondserial")) { puts("secondserial is set, switching to second serial port\n"); diff --git a/board/sandburst/karef/karef.h b/board/sandburst/karef/karef.h index 7790819..5de7cb5 100644 --- a/board/sandburst/karef/karef.h +++ b/board/sandburst/karef/karef.h @@ -57,7 +57,7 @@ typedef struct karef_fpga_regs_s volatile unsigned long brdout_enable_ul; /* Read/Write */ volatile unsigned long brdin_data_ul; /* Read Only */ volatile unsigned long misc_ul; /* Read/Write */ -} KAREF_FPGA_REGS_ST __attribute__((packed)), * KAREF_FPGA_REGS_PST; +} __attribute__((packed)) KAREF_FPGA_REGS_ST , * KAREF_FPGA_REGS_PST; /* OFEM FPGA */ typedef struct ofem_fpga_regs_s @@ -70,7 +70,7 @@ typedef struct ofem_fpga_regs_s volatile unsigned long scrmask_ul; /* Read/Write */ volatile unsigned long control_ul; /* Read/Write */ volatile unsigned long mac_flow_ctrl_ul; /* Read/Write */ -} OFEM_FPGA_REGS_ST __attribute__((packed)), * OFEM_FPGA_REGS_PST; +} __attribute__((packed)) OFEM_FPGA_REGS_ST , * OFEM_FPGA_REGS_PST; #endif /* __KAREF_H__ */ diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds index ff8658f..9e9e990 100644 --- a/board/sandburst/karef/u-boot.lds +++ b/board/sandburst/karef/u-boot.lds @@ -75,7 +75,7 @@ SECTIONS cpu/ppc4xx/serial.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - cpu/ppc4xx/440gx_enet.o (.text) + cpu/ppc4xx/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text) @@ -95,6 +95,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -127,11 +128,13 @@ SECTIONS _edata = .; PROVIDE (edata = .); + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; + . = .; __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index c6522b9..47d80fa 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/serial.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - cpu/ppc4xx/440gx_enet.o (.text) + cpu/ppc4xx/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text) @@ -84,6 +84,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } |