September 2008 - U-Boot

[U-Boot] [PATCH 1/5] mpc83xx: fix serdes setup for the MPC8378E boards
by Anton Vorontsov 30 Sep '08

30 Sep '08

MPC837xE specs says that SerDes1 has: — Two lanes running x1 SGMII at 1.25 Gbps; — Two lanes running x1 SATA at 1.5 or 3.0 Gbps. And for SerDes2: — Two lanes running x1 PCI Express at 2.5 Gbps; — One lane running x2 PCI Express at 2.5 Gbps; — Two lanes running x1 SATA at 1.5 or 3.0 Gbps. The spec also explicitly states that PEX options are not valid for the SD1. Nevertheless MPC8378 RDB and MDS boards configure the SD1 for PEX, which is wrong to do. Signed-off-by: Anton Vorontsov <avorontsov(a)ru.mvista.com> --- board/freescale/mpc837xemds/mpc837xemds.c | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 40f1e63..581397d 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -44,7 +44,7 @@ int board_early_init_f(void) FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8378: - fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_PEX, + fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8379: diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index aaefc18..3eb53d8 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -148,7 +148,7 @@ int board_early_init_f(void) FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8378: - fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_PEX, + fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8379: -- 1.5.6.3

1 0

[U-Boot] Standalone Application Images support (bootm)
by Rodrigo Vilar 30 Sep '08

30 Sep '08

Hi All, Are "Standalone Applications" supported in the current u-boot (GIT repo)? I have tried to bootm a Standalone Application image stored in flash and I get the messages (u-boot then crashes): Wrong Image Type for bootm command ERROR: can't get kernel image! In u-boot 1.2.0 file common/cmd_bootm.c there is code to support it: case IH_TYPE_STANDALONE: name = "Standalone Application";..... In the current one (GIT repo) there is no reference to IH_TYPE_STANDALONE in file common/cmd_bootm.c. Should I look somewhere else? Thanks, Rodrigo

2 2

[U-Boot] NAND flash support
by Roman Mashak 30 Sep '08

30 Sep '08

Hello I didn't find mentions of this in the archives, so asking here. I have Samsung NAND flash K9F1G08 and its ID is present in $(UBOOT)/include/linux/mtd/nand_ids.h Does this mean there's no need to write any additional supporting code? If not, then what board utilizing the same NAND flash can be taken as a reference? Thanks. -- Roman Mashak

1 0

[U-Boot] ARM Versatile port - possibly inefficient code?
by Roman Mashak 30 Sep '08

30 Sep '08

Hello Investigating the code for ARM Versatile port, I've found this weird piece of code. If you look in $(UBOOT)/board/versatile/flash.c, line 100, flash_init() : unsigned long flash_init (void) { int i; ulong size = 0; for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) { switch (i) { case 0: flash_vpp(1); flash_get_size ((FPW *) PHYS_FLASH_1, &flash_info[i]); flash_get_offsets (PHYS_FLASH_1, &flash_info[i]); flash_vpp(0); break; default: panic ("configured too many flash banks!\n"); break; } size += flash_info[i].size; } ..... } Regardless of CFG_MAX_FLASH_BANKS value, the only first bank is configured. Was it done deliberately or it's logical flaw? I think this code could cloned on a multiple of other platforms. -- Roman Mashak

2 2

[U-Boot] U-Boot configuration and latter Linux MMU init failures
by Remi Lefevre 30 Sep '08

30 Sep '08

Hi, >From your experience, can some incomplete/incorrect U-Boot configuration lead to MMU init failures inside Linux ? Particularly, my Linux kernel fails during the first Data Cache Block Store instruction (dcbst) of the MMU init and I ask myself if this cannot be linked to my cache initialization inside U-Boot (HID0 for my MPC8270 board). See http://ozlabs.org/pipermail/linuxppc-embedded/2008-September/031398.html for more details. Regards, Rémi

4 4

[U-Boot] [PATCH] move README.imx31 to doc/ and merge with README.mx31
by Jean-Christophe PLAGNIOL-VILLARD 29 Sep '08

29 Sep '08

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> diff --git a/README.imx31 b/README.imx31 deleted file mode 100644 index f545f01..0000000 --- a/README.imx31 +++ /dev/null @@ -1,13 +0,0 @@ -i.MX31 specific Configuration Options: --------------------------------------- - -- Timer precision: - CONFIG_MX31_TIMER_HIGH_PRECISION - - Enable higher precision timer. The low-precision timer - (default) provides approximately 4% error, whereas the - high-precision timer is about 0.4% accurate. The extra - accuracy is achieved at the cost of higher computational - overhead, which, in places where time is measured, should - not be critical, so, it should be safe to enable this - option. diff --git a/doc/README.imx31 b/doc/README.imx31 new file mode 100644 index 0000000..91ef766 --- /dev/null +++ b/doc/README.imx31 @@ -0,0 +1,29 @@ +U-Boot for Freescale i.MX31 + +This file contains information for the port of U-Boot to the Freescale +i.MX31 SoC. + +1. CONFIGURATION OPTIONS/SETTINGS +--------------------------------- + +1.1 Configuration of MC13783 SPI bus +------------------------------------ + The power management companion chip MC13783 is connected to the + i.MX31 via an SPI bus. Use the following configuration options + to setup the bus and chip select used for a particular board. + + CONFIG_MC13783_SPI_BUS -- defines the SPI bus the MC13783 is connected to. + Note that 0 is CSPI1, 1 is CSPI2 and 2 is CSPI3. + CONFIG_MC13783_SPI_CS -- define the chip select the MC13783 s connected to. + +1.2 Timer precision +------------------- + CONFIG_MX31_TIMER_HIGH_PRECISION + + Enable higher precision timer. The low-precision timer + (default) provides approximately 4% error, whereas the + high-precision timer is about 0.4% accurate. The extra + accuracy is achieved at the cost of higher computational + overhead, which, in places where time is measured, should + not be critical, so, it should be safe to enable this + option. diff --git a/doc/README.mx31 b/doc/README.mx31 deleted file mode 100644 index 291c2f3..0000000 --- a/doc/README.mx31 +++ /dev/null @@ -1,17 +0,0 @@ -U-Boot for Freescale i.MX31 - -This file contains information for the port of U-Boot to the Freescale -i.MX31 SoC. - -1. CONFIGURATION OPTIONS/SETTINGS ---------------------------------- - -1.1 Configuration of MC13783 SPI bus ------------------------------------- -The power management companion chip MC13783 is connected to the -i.MX31 via an SPI bus. Use the following configuration options -to setup the bus and chip select used for a particular board. - -CONFIG_MC13783_SPI_BUS -- defines the SPI bus the MC13783 is connected to. - Note that 0 is CSPI1, 1 is CSPI2 and 2 is CSPI3. -CONFIG_MC13783_SPI_CS -- define the chip select the MC13783 s connected to. -- 1.5.6.5

2 2

[U-Boot] [RFC][PATCH 3/3] New i386 board (includes code relocation)
by Graeme Russ 29 Sep '08

29 Sep '08

Added relocation code Removed temporary testing code Signed-off-by: Graeme Russ <graeme.russ(a)gmail.com> -- diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c index 1b4af58..5355fb6 100644 --- a/board/eNET/eNET.c +++ b/board/eNET/eNET.c @@ -45,40 +45,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PRINTF(fmt,args...) #endif - -extern int do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_bdinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_iminfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -/* extern int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); */ -extern int do_coninfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_itest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_md (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_mm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_nm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_mw (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_cp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_base (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_imgextract (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_version (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern int do_help (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - - void hw_watchdog_reset(void) { u16 wd_state; @@ -95,8 +61,6 @@ void hw_watchdog_reset(void) } } -/* ------------------------------------------------------------------------- */ - void init_sc520_enet (void) { @@ -595,44 +559,6 @@ int last_stage_init(void) major = minor = 0; printf("Serck Controls eNET\n"); - printf("last_stage_init() at %08lx\n", (ulong)last_stage_init); - - printf("autoscript => do_autoscript() @ 0x%08lx\n", (ulong)do_autoscript); - printf("bdinfo => do_bdinfo() @ 0x%08lx\n", (ulong)do_bdinfo); - printf("go => do_go() @ 0x%08lx\n", (ulong)do_go); - printf("reset => do_reset() @ 0x%08lx\n", (ulong)do_reset); - printf("bootm => do_bootm() @ 0x%08lx\n", (ulong)do_bootm); - printf("boot => do_bootd() @ 0x%08lx\n", (ulong)do_bootd); - printf("bootd => do_bootd() @ 0x%08lx\n", (ulong)do_bootd); - printf("iminfo => do_iminfo() @ 0x%08lx\n", (ulong)do_iminfo); -/* printf("imls => do_imls() @ 0x%08lx\n", (ulong)do_imls); */ - printf("imls => do_imls() @ <undefined>\n"); - printf("coninfo => do_coninfo() @ 0x%08lx\n", (ulong)do_coninfo); - printf("itest => do_itest() @ 0x%08lx\n", (ulong)do_itest); - printf("loads => do_load_serial() @ 0x%08lx\n", (ulong)do_load_serial); - printf("loadb => do_load_serial_bin() @ 0x%08lx\n", (ulong)do_load_serial_bin); - printf("loady => do_load_serial_bin() @ 0x%08lx\n", (ulong)do_load_serial_bin); - printf("md => do_mem_md() @ 0x%08lx\n", (ulong)do_mem_md); - printf("mm => do_mem_mm() @ 0x%08lx\n", (ulong)do_mem_mm); - printf("nm => do_mem_nm() @ 0x%08lx\n", (ulong)do_mem_nm); - printf("mw => do_mem_mw() @ 0x%08lx\n", (ulong)do_mem_mw); - printf("cp => do_mem_cp() @ 0x%08lx\n", (ulong)do_mem_cp); - printf("cmp => do_mem_cmp() @ 0x%08lx\n", (ulong)do_mem_cmp); - printf("crc32 => do_mem_crc() @ 0x%08lx\n", (ulong)do_mem_crc); - printf("base => do_mem_base() @ 0x%08lx\n", (ulong)do_mem_base); - printf("loop => do_mem_loop() @ 0x%08lx\n", (ulong)do_mem_loop); - printf("mtest => do_mem_mtest() @ 0x%08lx\n", (ulong)do_mem_mtest); - printf("sleep => do_sleep() @ 0x%08lx\n", (ulong)do_sleep); - printf("printenv => do_printenv() @ 0x%08lx\n", (ulong)do_printenv); - printf("setenv => do_setenv() @ 0x%08lx\n", (ulong)do_setenv); - printf("saveenv => do_saveenv() @ 0x%08lx\n", (ulong)do_saveenv); - printf("run => do_run() @ 0x%08lx\n", (ulong)do_run); - printf("imxtract => do_imgextract() @ 0x%08lx\n", (ulong)do_imgextract); - printf("version => do_version() @ 0x%08lx\n", (ulong)do_version); - printf("echo => do_echo() @ 0x%08lx\n", (ulong)do_echo); - printf("help => do_help() @ 0x%08lx\n", (ulong)do_help); - printf("? => do_help() @ 0x%08lx\n", (ulong)do_help); - return 0; } diff --git a/cpu/i386/start.S b/cpu/i386/start.S index 84888aa..6330dd8 100644 --- a/cpu/i386/start.S +++ b/cpu/i386/start.S @@ -174,8 +174,41 @@ bss_fail: bss_ok: - wbinvd + /* indicate progress */ + movw $0x06, %ax + movl $.progress6, %ebp + jmp show_boot_progress_asm +.progress6: + /* copy text section to ram, size must be 4-byte aligned */ + movl $CFG_RELOC_ADDR, %edi /* destination address */ + movl $TEXT_BASE, %esi /* source address */ + movl $_i386boot_text_size, %ecx /* number of bytes to copy */ + movl %ecx, %eax + andl $3, %eax + jz text_copy /* Already 4-byte aligned */ + subl $4, %eax /* Add extra bytes to size */ + addl %eax, %ecx +text_copy: + shrl $2, %ecx /* copy 4 byte each time */ + cld + cmpl $0, %ecx + je text_ok +text_segment: + movsl + loop text_segment + jmp text_ok +text_fail: + /* indicate (lack of) progress */ + movw $0x86, %ax + movl $.progress5a, %ebp + jmp show_boot_progress_asm +.progress5a: + jmp die + +text_ok: + + wbinvd /* indicate progress */ movw $0x05, %ax @@ -183,7 +216,10 @@ bss_ok: jmp show_boot_progress_asm .progress4: - call start_i386boot /* Enter, U-boot! */ + /* Jump to the RAM copy of start_i386boot */ + movl $start_i386boot, %ebp + addl $(CFG_RELOC_ADDR - TEXT_BASE), %ebp + call *%ebp /* Enter, U-boot! */ /* indicate (lack of) progress */ movw $0x85, %ax diff --git a/examples/82559_eeprom.c b/examples/82559_eeprom.c index 047d3aa..5e2eee9 100644 --- a/examples/82559_eeprom.c +++ b/examples/82559_eeprom.c @@ -19,7 +19,6 @@ */ #define _PPC_STRING_H_ /* avoid unnecessary str/mem functions */ -/* #define _LINUX_STRING_H_ */ /* avoid unnecessary str/mem functions */ #include <common.h> #include <exports.h> diff --git a/lib_i386/board.c b/lib_i386/board.c index f3da0a2..b7ab1a7 100644 --- a/lib_i386/board.c +++ b/lib_i386/board.c @@ -57,7 +57,7 @@ extern long _i386boot_bios_size; * which is somewhat inconveient ... */ ulong i386boot_start = (ulong)&_i386boot_start; /* code start (in flash) defined in start.S */ ulong i386boot_end = (ulong)&_i386boot_end; /* code end (in flash) */ -ulong i386boot_romdata_start = (ulong)&_i386boot_romdata_start; /* datasegment in flash (also code+rodata end) */ +ulong i386boot_romdata_start = (ulong)&_i386boot_romdata_start; /* data segment in flash (also code+rodata end) */ ulong i386boot_romdata_dest = (ulong)&_i386boot_romdata_dest; /* data location segment in ram */ ulong i386boot_romdata_size = (ulong)&_i386boot_romdata_size; /* size of data segment */ ulong i386boot_bss_start = (ulong)&_i386boot_bss_start; /* bss start */ @@ -139,7 +139,6 @@ static int display_banner (void) i386boot_bss_start+i386boot_bss_size, i386boot_bss_start+i386boot_bss_size+CFG_STACK_SIZE-1); - return (0); } @@ -163,13 +162,13 @@ static int display_dram_config (void) return (0); } - +#if 0 static void display_flash_config (ulong size) { puts ("Flash: "); print_size (size, "\n"); } - +#endif /* * Breath some life into the board... @@ -217,9 +216,9 @@ gd_t *gd; void start_i386boot (void) { + cmd_tbl_t *cmdtp; char *s; int i; - ulong size; static gd_t gd_data; static bd_t bd_data; init_fnc_t **init_fnc_ptr; @@ -246,18 +245,42 @@ void start_i386boot (void) } show_boot_progress(0x23); + gd->reloc_off = CFG_RELOC_ADDR - TEXT_BASE; + + for (cmdtp = &__u_boot_cmd_start; cmdtp != &__u_boot_cmd_end; cmdtp++) { + ulong addr; + addr = (ulong) (cmdtp->cmd) + gd->reloc_off; + cmdtp->cmd = + (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr; + + addr = (ulong)(cmdtp->name) + gd->reloc_off; + cmdtp->name = (char *)addr; + + if (cmdtp->usage) { + addr = (ulong)(cmdtp->usage) + gd->reloc_off; + cmdtp->usage = (char *)addr; + } +#ifdef CFG_LONGHELP + if (cmdtp->help) { + addr = (ulong)(cmdtp->help) + gd->reloc_off; + cmdtp->help = (char *)addr; + } +#endif + } + +#if 0 /* configure available FLASH banks */ size = flash_init(); display_flash_config(size); show_boot_progress(0x24); - +#endif show_boot_progress(0x25); /* initialize environment */ env_relocate (); show_boot_progress(0x26); - +#if 0 /* IP Address */ bd_data.bi_ip_addr = getenv_IPaddr ("ipaddr"); @@ -277,6 +300,7 @@ void start_i386boot (void) s = (*e) ? e + 1 : e; } } +#endif #if defined(CONFIG_PCI) /*

1 0

[U-Boot] [RFC][PATCH 0/3] New i386 board (includes code relocation)
by Graeme Russ 29 Sep '08

29 Sep '08

Hi All, I have managed to get the initial port of U-Boot to my custom sc520 (x86) based board built and running and even managed (I think) to get the fundamentals of the code relocation working (really happy about that) and I would like some feedback on my mods - specifically the relocation methodology I am using does not, I think, quite fit that used on other boards. When the i386 code was originally written, start.S calls start_i386boot (). Other boards seem to call board_init_f () which calls relocate_code () which performs the actual relocation and calls board_init_r (). Whats more, I have defined CFG_RELOC_ADDR which specifies the destination in RAM of the relocated code whereas other boards seem to dynamically calculate the relocation address based on stack, data, bss etc segment sizes. My relocation code performs the code relocation before the first C function is called rather than between board_init_f and board_init_r. Q. Should I spend a some more time and implement board_init_f / relocate_code / board_init_r as per other boards or is the approach I have taken acceptable? I am concerned about the size of the relocation copy - If you take a look at /board/eNET/u-boot.lds . = 0x38040000; /* Where bootcode in the flash is mapped */ .text : { *(.text); } . = ALIGN(4); .rodata : { *(.rodata) *(.rodata.str1.1) *(.rodata.str1.32) } _i386boot_text_size = SIZEOF(.text) + SIZEOF(.rodata); I only copy _i386boot_text_size bytes (adjusted up to the nearest 4-byte boundary. Q. Will _i386boot_text_size take into account the . = ALIGN(4) between .text and .rodata or should I add some further adjustments? Finally a quick warning about [PATCH 3/3] - I've broken a cardinal rule and combined implementing a new feature with removing an old (test printf()'s) Regards, Graeme

1 0

[U-Boot] [PATCH] [sensor]: Make the LM75 MULTI_BUS compatible.
by Heiko Schocher 29 Sep '08

29 Sep '08

also fix CodingStyle issues for the LM75 Signed-off-by: Heiko Schocher <hs(a)denx.de> --- drivers/hwmon/lm75.c | 228 +++++++++++++++++++++++--------------------------- 1 files changed, 105 insertions(+), 123 deletions(-) diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 67a18f6..b95601d 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -50,159 +50,141 @@ int dtt_read(int sensor, int reg) { - int dlen; - uchar data[2]; + int dlen; + uchar data[2]; #ifdef CONFIG_DTT_AD7414 - /* - * On AD7414 the first value upon bootup is not read correctly. - * This is most likely because of the 800ms update time of the - * temp register in normal update mode. To get current values - * each time we issue the "dtt" command including upon powerup - * we switch into one-short mode. - * - * Issue one-shot mode command - */ - dtt_write(sensor, DTT_CONFIG, 0x64); + /* + * On AD7414 the first value upon bootup is not read correctly. + * This is most likely because of the 800ms update time of the + * temp register in normal update mode. To get current values + * each time we issue the "dtt" command including upon powerup + * we switch into one-short mode. + * + * Issue one-shot mode command + */ + dtt_write(sensor, DTT_CONFIG, 0x64); #endif - /* - * Validate 'reg' param - */ - if((reg < 0) || (reg > 3)) - return -1; - - /* - * Calculate sensor address and register. - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* calculate address of lm75 */ - - /* - * Prepare to handle 2 byte result. - */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_HYST) || - (reg == DTT_TEMP_SET)) - dlen = 2; - else - dlen = 1; - - /* - * Now try to read the register. - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - /* - * Handle 2 byte result. - */ - if (dlen == 2) - return ((int)((short)data[1] + (((short)data[0]) << 8))); - - - return (int)data[0]; + /* Validate 'reg' param */ + if((reg < 0) || (reg > 3)) + return -1; + + /* Calculate sensor address and register. */ + sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); + + /* Prepare to handle 2 byte result. */ + if ((reg == DTT_READ_TEMP) || + (reg == DTT_TEMP_HYST) || + (reg == DTT_TEMP_SET)) + dlen = 2; + else + dlen = 1; + + /* Now try to read the register. */ + if (i2c_read(sensor, reg, 1, data, dlen) != 0) + return -1; + + /* Handle 2 byte result. */ + if (dlen == 2) + return ((int)((short)data[1] + (((short)data[0]) << 8))); + + return (int)data[0]; } /* dtt_read() */ int dtt_write(int sensor, int reg, int val) { - int dlen; - uchar data[2]; - - /* - * Validate 'reg' param - */ - if ((reg < 0) || (reg > 3)) - return 1; - - /* - * Calculate sensor address and register. - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* calculate address of lm75 */ - - /* - * Handle 2 byte values. - */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_HYST) || - (reg == DTT_TEMP_SET)) { - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - } else { - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* - * Write value to register. - */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; + int dlen; + uchar data[2]; + + /* Validate 'reg' param */ + if ((reg < 0) || (reg > 3)) + return 1; + + /* Calculate sensor address and register. */ + sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); + + /* Handle 2 byte values. */ + if ((reg == DTT_READ_TEMP) || + (reg == DTT_TEMP_HYST) || + (reg == DTT_TEMP_SET)) { + dlen = 2; + data[0] = (char)((val >> 8) & 0xff); /* MSB first */ + data[1] = (char)(val & 0xff); + } else { + dlen = 1; + data[0] = (char)(val & 0xff); + } + + /* Write value to register. */ + if (i2c_write(sensor, reg, 1, data, dlen) != 0) + return 1; + + return 0; } /* dtt_write() */ static int _dtt_init(int sensor) { - int val; - - /* - * Setup TSET ( trip point ) register - */ - val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */ - if (dtt_write(sensor, DTT_TEMP_SET, val) != 0) - return 1; - - /* - * Setup THYST ( untrip point ) register - Hysteresis - */ - val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0) - return 1; - - /* - * Setup configuraton register - */ + int val; + + /* Setup TSET ( trip point ) register */ + val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */ + if (dtt_write(sensor, DTT_TEMP_SET, val) != 0) + return 1; + + /* Setup THYST ( untrip point ) register - Hysteresis */ + val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80; + if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0) + return 1; + + /* Setup configuraton register */ #ifdef CONFIG_DTT_AD7414 - /* config = alert active low and disabled */ - val = 0x60; + /* config = alert active low and disabled */ + val = 0x60; #else - /* config = 6 sample integration, int mode, active low, and enable */ - val = 0x18; + /* config = 6 sample integration, int mode, active low, and enable */ + val = 0x18; #endif - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; + if (dtt_write(sensor, DTT_CONFIG, val) != 0) + return 1; - return 0; + return 0; } /* _dtt_init() */ int dtt_init (void) { - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - const char *const header = "DTT: "; + int i; + unsigned char sensors[] = CONFIG_DTT_SENSORS; + const char *const header = "DTT: "; + int old_bus; + + /* switch to correct I2C bus */ + old_bus = I2C_GET_BUS(); + I2C_SET_BUS(CFG_DTT_BUS_NUM); - for (i = 0; i < sizeof(sensors); i++) { + for (i = 0; i < sizeof(sensors); i++) { if (_dtt_init(sensors[i]) != 0) - printf("%s%d FAILED INIT\n", header, i+1); + printf("%s%d FAILED INIT\n", header, i+1); else - printf("%s%d is %i C\n", header, i+1, - dtt_get_temp(sensors[i])); - } + printf("%s%d is %i C\n", header, i+1, + dtt_get_temp(sensors[i])); + } + /* switch back to original I2C bus */ + I2C_SET_BUS(old_bus); - return (0); + return (0); } /* dtt_init() */ int dtt_get_temp(int sensor) { - int const ret = dtt_read(sensor, DTT_READ_TEMP); + int const ret = dtt_read(sensor, DTT_READ_TEMP); - if (ret < 0) { - printf("DTT temperature read failed.\n"); - return 0; - } - return (int)((int16_t) ret / 256); + if (ret < 0) { + printf("DTT temperature read failed.\n"); + return 0; + } + return (int)((int16_t) ret / 256); } /* dtt_get_temp() */ -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

3 2

[U-Boot] ELDK 4.1 - ARM target
by Roman Mashak 29 Sep '08

29 Sep '08

Hello just downloaded ISO image for of ELDK 4.1, ARM targets. After mounted it as a 'loop' device on my Debian system, I didn't find script in the root of ELDK directory tree. What am I supposed to do, is this distribution installed in another manner? I referred to this page for instructions - http://www.denx.de/wiki/view/DULG/ELDKInitialInstallation Thanks. -- Roman Mashak

2 1