September 2009 - U-Boot

[U-Boot] U-Boot load and run via NAND flash - ARM926EJ-S
by Thomas Jackson 18 Sep '09

18 Sep '09

Hi List, I understand NOR-based flash memory devices have traditionally been used for non-volatile storage for a bootloader and other various advantages including support for execute-in-place code, random access to memory, and zero error rate, etc. However, we have a project that we would like to have U-Boot bootloader run via NAND Flash memory device on a ARM926EJ-S based board. I searched the mailing list for this and didn't see anything. I only found a question posted in 2006 where it was asked if the kernel based on ARM926EJ-S can boot from NAND flash. Which I know is ok. Does the community know of any existing mechanisms for this type of configuration to enable U-Boot load and run via NAND flash? Thanks in advance! TJ -- View this message in context: http://www.nabble.com/U-Boot-load-and-run-via-NAND-flash---ARM926EJ-S-tp254… Sent from the Uboot - Users mailing list archive at Nabble.com.

4 3

[U-Boot] [PATCH][v4] FDT: remove obsolete OF_CPU and OF_SOC macros.
by Marcel Ziswiler 18 Sep '09

18 Sep '09

Signed-off-by: Marcel Ziswiler <marcel.ziswiler(a)noser.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> Acked-by: Heiko Schocher <hs(a)denx.de> --- Changes since v1: - CC all respective board maintainers Changes since v2: - Added Guennadi Liakhovetski's ack Changes since v3: - Added Heiko's ack for IDS8247, mgcoge and muas3001 README | 6 ++++-- include/configs/IDS8247.h | 2 -- include/configs/MPC8260ADS.h | 1 - include/configs/linkstation.h | 2 -- include/configs/mgcoge.h | 2 -- include/configs/mpc7448hpc2.h | 1 - include/configs/muas3001.h | 2 -- include/configs/stxxtc.h | 1 - 8 files changed, 4 insertions(+), 13 deletions(-) diff --git a/README b/README index ff4ed8b..3cb7786 100644 --- a/README +++ b/README @@ -368,8 +368,10 @@ The following options need to be configured: * Adds the "fdt" command * The bootm command automatically updates the fdt - OF_CPU - The proper name of the cpus node. - OF_SOC - The proper name of the soc node. + OF_CPU - The proper name of the cpus node (only required for + MPC512X and MPC5xxx based boards). + OF_SOC - The proper name of the soc node (only required for + MPC512X and MPC5xxx based boards). OF_TBCLK - The timebase frequency. OF_STDOUT_PATH - The path to the console device diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 4c4af05..147a8b2 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -125,8 +125,6 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 -#define OF_CPU "PowerPC,8247@0" -#define OF_SOC "soc@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc@f0000000/serial8250@e0008000" diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 942a4cc..677a143 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -209,7 +209,6 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 #if defined(CONFIG_OF_LIBFDT) -#define OF_CPU "cpu@0" #define OF_TBCLK (bd->bi_busfreq / 4) #endif diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 2feb3ae..16b464c 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -96,8 +96,6 @@ #define CONFIG_OF_LIBFDT 1 -#define OF_CPU "PowerPC,603e" -#define OF_SOC "soc10x@80000000" #define OF_STDOUT_PATH "/soc10x/serial@80004600" /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index b955749..55d1fc9 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -347,8 +347,6 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 -#define OF_CPU "PowerPC,8247@0" -#define OF_SOC "soc@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc/cpm/serial@11a90" diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index 4f98ba4..be12186 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -79,7 +79,6 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 -#define OF_CPU "PowerPC,7448@0" #define OF_TSI "tsi108@c0000000" #define OF_TBCLK (bd->bi_busfreq / 8) #define OF_STDOUT_PATH "/tsi108@c0000000/serial@7808" diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index ae033b2..c94daa3 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -405,8 +405,6 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 -#define OF_CPU "PowerPC,8270@0" -#define OF_SOC "soc@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) #if defined(CONFIG_MUAS_DEV_BOARD) #define OF_STDOUT_PATH "/soc/cpm/serial@11a90" diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index d16262b..5854366 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -509,7 +509,6 @@ typedef unsigned int led_id_t; /* pass open firmware flattened device tree */ #define CONFIG_OF_LIBFDT 1 -#define OF_CPU "PowerPC,MPC870@0" #define OF_TBCLK (MPC8XX_HZ / 16) #endif /* __CONFIG_H */ -- 1.6.4.2

1 0

[U-Boot] Details of fw_env.config file
by Rahanesh 18 Sep '09

18 Sep '09

Hi All,. I wanted to know the meaning of Device Offset in the config file (fw_env.config). I used it as MTD device name Device offset Env. size Flash sector size Number of sectors /dev/mtd0 0x0000 0x1000 0x10000 The partition mtd0 contains uboot as well as Environment variables. when i used fw_setenv command to set the boot delay to 6, it actually erased my u-boot itself. Should i Keep Environment variables in separate mtd partition say mtd1.? Is it enough to change the device offset to point the environment variables within mtd1 itself? Please help!!!! Thanks Rahanesh

2 1

[U-Boot] [PATCH 1/1] SPARC: fixes exported function stub for standalone applications. jmp ensures we get back to the location we came from, size(void *) make sure we get the function addresses correctly from the table (entry*4 instead of entry*1).
by Daniel Hellstrom 18 Sep '09

18 Sep '09

Hello Wolfgang, This patch fixes the SPARC support for standalone u-boot applications. -------------------- SPARC/LEON3 -------------------- => tftpboot 0x41000000 192.168.0.47:hello_world.bin Using GRETH 10/100 device TFTP from server 192.168.0.47; our IP address is 192.168.0.206 Filename 'hello_world.bin'. Load address: 0x41000000 Loading: # done Bytes transferred = 1232 (4d0 hex) => go 41000008 hej ## Starting application at 0x41000008 ... Example expects ABI version 5 Actual U-Boot ABI version 5 Hello World argc = 2 argv[0] = "41000008" argv[1] = "hej" argv[2] = "<NULL>" Hit any key to exit ... ## Application terminated, rc = 0x0 => ----------------------------------------------------- Best Regards, Daniel Hellstrom Signed-off-by: Daniel Hellstrom <daniel(a)gaisler.com> --- examples/standalone/stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index 339bbf9..ce3371d 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -181,9 +181,9 @@ gd_t *global_data; " or %%g1, %%g7, %%g1\n" \ " ld [%%g1], %%g1\n" \ " ld [%%g1 + %1], %%g1\n" \ -" call %%g1\n" \ +" jmp %%g1\n" \ " nop\n" \ - : : "i"(offsetof(gd_t, jt)), "i"(XF_ ## x) : "g1" ); + : : "i"(offsetof(gd_t, jt)), "i"(XF_ ## x * sizeof(void *)) : "g1" ); #else #error stubs definition missing for this architecture -- 1.5.4

1 0

[U-Boot] RAM burst mode problem
by Mikhail Zaturenskiy 18 Sep '09

18 Sep '09

Hello, I am working on a board similar to the EP88xC and am having trouble getting the sdram_table[] setup with the correct values (at least I think that's the problem). The board words fine if i burst-inhibit memc_or1 so I know single read/write works, but if I remove burst-inhibit, it results in a crash when U-Boot transfers itself from flash to RAM and jumps to the relocated code. My board uses the MPC875 processor and MT48LC16M16A2 for the RAM. The following is my current SDRAM table: static uint sdram_table[] = { /* Single read (offset 0x00 in UPM RAM) */ 0x0F03C004, 0x0FFFC004, 0x00FCC004, 0x0FFFC000, 0x0FF30004, 0x0FFFC004, 0xFFFFC005, 0xFFFFC005, /* Burst read (offset 0x08 in UPM RAM) */ 0x0F03C004, 0x0FFFC004, 0x00FCC004, 0x00FFC000, 0x00FFC000, 0x00FFC000, 0x00FFC000, 0x00FFC000, 0x00FFC000, 0x00FFC000, 0x0FF30000, 0x0FFFC004, 0xFFFFC005, 0xFFFFC005, 0xFFFFC005, 0xFFFFC005, /* Single write (offset 0x18 in UPM RAM) */ 0x0F03C004, 0x0FFFC004, 0x00FC0004, 0x0FFFC002, 0x0FF30004, 0X0FFFC004, 0xFFFFC005, 0xFFFFC005, /* Burst write (offset 0x20 in UPM RAM) */ 0x0F03C004, 0x0FFFC004, 0x00FC0004, 0X00FFC000, 0x00FFC000, 0x00FFC000, 0x00FFC000, 0X00FFC000, 0x00FFC000, 0x00FFC000, 0x0FF30002, 0x0FFFC004, 0xFFFFC005, 0xFFFFC005, 0xFFFFC005, 0xFFFFC005, /* Refresh (offset 0x30 in UPM RAM) */ 0x0FF0C004, 0x0FFFC004, 0x0FFFC004, 0x0FFFC004, 0xFFFFC005, 0x0FA30004, 0x0FFFC004, 0x0FF0C084, 0x0FFFC004, 0x0FFFC004, 0x0FFFC004, 0x0FFFC084, /* Exception (offset 0x3C in UPM RAM) */ 0x0FFFC004, 0x0FF00004, 0x0FFFC004, 0xFFFFC005 }; And the following is my ram init function: phys_size_t initdram (int board_type) { long int msize; volatile immap_t *immap = (volatile immap_t *)CONFIG_SYS_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; upmconfig(UPMA, sdram_table, sizeof(sdram_table) / sizeof(uint)); /* Configure SDRAM refresh */ memctl->memc_mptpr = MPTPR_PTP_DIV2; /* BRGCLK/2 */ memctl->memc_mamr = (65 << 24) | CONFIG_SYS_MAMR; /* No refresh */ udelay(100); /* Run MRS pattern from location 0x35 */ // MZ - was 0x36 memctl->memc_mar = 0x46; // MZ - was 0x88 memctl->memc_mcr = 0x80002235; // MZ - was 0x80002236 udelay(100); memctl->memc_mamr |= MAMR_PTAE; /* Enable refresh */ memctl->memc_or1 = ~(CONFIG_SYS_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM; // memctl->memc_or1 = ~(CONFIG_SYS_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM | OR_BI; // MZ - temp, burst inhibit memctl->memc_br1 = CONFIG_SYS_SDRAM_BASE | BR_PS_16 | BR_MS_UPMA | BR_V; msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE); memctl->memc_or1 |= ~(msize - 1); return msize; } Also attached is a spreadsheet which illustrates the RAM timing. Is there something wrong with my RAM table? Am I missing any flags? Something else wrong? Any ideas/suggestions are appreciated. Thank you, Mikhail Zaturenskiy

3 6

[U-Boot] AMCC 405EX - EMAC0 + EMAC1 Problems
by Jonathan Haws 18 Sep '09

18 Sep '09

All, I am having issues getting EMAC1 working alongside EMAC0. We need both EMACs running at the same time in U-Boot (U-Boot handles the PHY configuration, since the VxWorks implementation of PHY initialization is buggy). What I have done is this: In net/eth.c I have modified the eth_init(bd_t *bis) function to simply initialize both EMACs (line 443). We use EMAC0 by default, so I set eth_current back to EMAC0 when I am finished and return 0 on success. Here is what the function looks like right now: (I know I can clean this up better, but I am looking for a first cut solution that works. When I have it working, I will clean up the code.) int eth_init(bd_t *bis) { struct eth_device* old_current; if (!eth_current) { puts ("No ethernet found.\n"); return -1; } old_current = eth_current; do { debug ("Trying %s\n", eth_current->name); if (eth_current->init(eth_current,bis) < 0) { debug ("FAIL\n"); eth_try_another(0); return -1; } eth_current->state = ETH_STATE_ACTIVE; eth_try_another(0); debug ("Trying %s\n", eth_current->name); if (eth_current->init(eth_current,bis) < 0) { debug ("FAIL\n"); eth_try_another(0); return -1; } eth_current->state = ETH_STATE_ACTIVE; eth_current = old_current; return 0; } while (old_current != eth_current); return -1; } What happens is this, when I boot via TFTP, both EMACs and PHYs get initialized, but the system hangs as soon as it starts the protocol's request (ping, tftp, etc.). It seems that I am missing something somewhere - I am overwriting some configuration that I should not be or something of that sort. But shouldn't the EMAC data structure be separated to the point where I should be able to initialize them individually without causing problems? Thanks for any insight! Jonathan

4 3

[U-Boot] [PATCH] mpc8536: simplify the top makefile for 36-bit config
by Mingkai Hu 18 Sep '09

18 Sep '09

Signed-off-by: Mingkai Hu <Mingkai.hu(a)freescale.com> --- Makefile | 4 +--- include/configs/MPC8536DS.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0b61d05..99837a3 100644 --- a/Makefile +++ b/Makefile @@ -2448,9 +2448,7 @@ ATUM8548_config: unconfig MPC8536DS_36BIT_config \ MPC8536DS_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h - @$(MKCONFIG) -a MPC8536DS ppc mpc85xx mpc8536ds freescale + @$(MKCONFIG) -t $(@:_config=) MPC8536DS ppc mpc85xx mpc8536ds freescale MPC8540ADS_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 4746e2e..faca805 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -27,7 +27,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MPC8536DS_36BIT +#ifdef CONFIG_MK_36BIT #define CONFIG_PHYS_64BIT 1 #endif -- 1.6.4

1 0

[U-Boot] Uboot 1.1.3 and USB
by Stephen Banville 17 Sep '09

17 Sep '09

Hello, I would like to post a problem I am encountering regarding Uboot 1.1.3 and USB. My processor is an AMD 1550. In short I am seeing the following error when I execute The "usb start" command. I also noticed that a CTL:Timeout occurs. It appears the Uboot can see the device, but for some reason the device does not respond to requests. I have browsed through Some mail threads from other folks encountering the same issue, and the resolution for them resulted In an upgrade to Uboot 1.1.4. I would like to know if anyone has worked around / fixed such an issue without upgrading U-Boot. DEBUG: RET(ctlr) URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:0/8 stat:0x20 DEBUG: usb_new_device() usb_get_descriptor RETURN err: ffffffff, act_len/status; 8/20 DEBUG: usb_new_device() device_descriptor: 00 00 00 00 00 00 00 08 USB device not responding, giving up (status=20) ------------------------------------------------------ ENTIRE DEBUG OUTPUT ---------------------------------------- BOOT>usb start (Re)start USB... USB: INFO: aligned ghcca afffe800 DEBUG: USB HC reset_hc usb-au1550: ctrl = 0x0 ; DEBUG: OHCI controller usb-au1550 state DEBUG: control: 0x0000008f HCFS=operational IE PLE CBSR=3 DEBUG: cmdstatus: 0x00000000 SOC=0 DEBUG: intrstatus: 0x00000004 SF DEBUG: intrenable: 0x00000053 RHSC UE WDH SO DEBUG: hcca frame #0000 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS scanning bus for devices... New Device 0 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x100 index 0x0 length 0x8 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:0/8 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:0/8 stat:0x80000000 INFO: Root-Hub: adr: 0 cmd(8): 00000680 0100 0000 0008 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:8/8 stat:0x0 DEBUG: usb_new_device() usb_get_descriptor RETURN err: 8, act_len/status; 8/0 DEBUG: usb_new_device() device_descriptor: 12 01 10 01 09 00 00 08 set address 1 usb_control_msg: request: 0x5, requesttype: 0x0 value 0x1 index 0x0 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 0,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 0,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000500 0001 0000 0000 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 0,ep: 0-O,type:CTRL,len:0/0 stat:0x0 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x100 index 0x0 length 0x12 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/18 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/18 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000680 0100 0000 0012 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:18/18 stat:0x0 DEBUG: usb_new_device() device_descriptor: 12 01 10 01 09 00 00 08 00 00 00 00 00 00 00 01 00 01 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x200 index 0x0 length 0x8 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/8 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/8 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000680 0200 0000 0008 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:8/8 stat:0x0 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x200 index 0x0 length 0x19 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/25 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/25 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000680 0200 0000 0019 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:25/25 stat:0x0 get_conf_no 0 Result 25, wLength 25 if 0, ep 0 ##EP epmaxpacketin[1] = 2 set configuration 1 usb_control_msg: request: 0x9, requesttype: 0x0 value 0x1 index 0x0 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000900 0001 0000 0000 INFO: WR:status 0x10000 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 new device strings: Mfr=0, Product=1, SerialNumber=0 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x300 index 0x0 length 0xFF INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/255 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/255 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000680 0300 0000 00ff DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:255/255 stat:0x0 USB device number 1 default language ID 0x409 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x301 index 0x409 length 0xFF INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/255 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/255 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000680 0301 0409 00ff DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:255/255 stat:0x0 Manufacturer Product OHCI Root Hub SerialNumber usb_control_msg: request: 0x6, requesttype: 0xA0 value 0x2900 index 0x0 length 0x4 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000006a0 2900 0000 0004 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:4/4 stat:0x0 usb_control_msg: request: 0x6, requesttype: 0xA0 value 0x2900 index 0x0 length 0x9 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/9 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/9 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000006a0 2900 0000 0009 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:9/9 stat:0x0 usb_control_msg: request: 0x0, requesttype: 0xA0 value 0x0 index 0x0 length 0x4 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000000a0 0000 0000 0004 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:4/4 stat:0x0 usb_control_msg: request: 0x3, requesttype: 0x23 value 0x8 index 0x1 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000323 0008 0001 0000 INFO: WR:portstatus[0] 0x100 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 usb_control_msg: request: 0x3, requesttype: 0x23 value 0x8 index 0x2 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000323 0008 0002 0000 INFO: WR:portstatus[1] 0x100 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 usb_control_msg: request: 0x0, requesttype: 0xA3 value 0x0 index 0x1 length 0x4 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000000a3 0000 0001 0004 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:4/4 stat:0x0 usb_control_msg: request: 0x0, requesttype: 0xA3 value 0x0 index 0x1 length 0x4 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000000a3 0000 0001 0004 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00010101 CSC PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:4/4 stat:0x0 usb_control_msg: request: 0x1, requesttype: 0x23 value 0x10 index 0x1 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000123 0010 0001 0000 INFO: WR:portstatus[0] 0x10000 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00000101 PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 usb_control_msg: request: 0x3, requesttype: 0x23 value 0x4 index 0x1 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000323 0004 0001 0000 INFO: WR:portstatus[0] 0x10 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00100103 PRSC PPS PES CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 usb_control_msg: request: 0x0, requesttype: 0xA3 value 0x0 index 0x1 length 0x4 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000000a3 0000 0001 0004 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00100103 PRSC PPS PES CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:4/4 stat:0x0 usb_control_msg: request: 0x1, requesttype: 0x23 value 0x14 index 0x1 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000123 0014 0001 0000 INFO: WR:portstatus[0] 0x100000 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00000103 PPS PES CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 New Device 1 usb_control_msg: request: 0x6, requesttype: 0x80 value 0x100 index 0x0 length 0x8 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:0/8 stat:0x80000000 DEBUG: SUB URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:0/8 stat:0x80000000 DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: hc_interrupt: returning.. DEBUG: % DEBUG: USB Schedule overrun DEBUG: RET(ctlr) URB:[ 0] dev: 0,ep: 0-I,type:CTRL,len:0/8 stat:0x20 DEBUG: usb_new_device() usb_get_descriptor RETURN err: ffffffff, act_len/status; 8/20 DEBUG: usb_new_device() device_descriptor: 00 00 00 00 00 00 00 08 USB device not responding, giving up (status=20) usb_control_msg: request: 0x1, requesttype: 0x23 value 0x1 index 0x1 length 0x0 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 00000123 0001 0001 0000 INFO: WR:portstatus[0] 0x1 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00000101 PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-O,type:CTRL,len:0/0 stat:0x0 usb_control_msg: request: 0x0, requesttype: 0xA3 value 0x0 index 0x2 length 0x4 INFO: submit_control_msg DEBUG: SUB URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 DEBUG: SUB(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:0/4 stat:0x80000000 INFO: Root-Hub: adr: 1 cmd(8): 000000a3 0000 0002 0004 DEBUG: roothub.a: 02001202 POTPGT=2 NOCP NPS NDP=2 DEBUG: roothub.b: 00000000 PPCM=0000 DR=0000 DEBUG: roothub.status: 00000000 DEBUG: roothub.portstatus [0] = 0x00000101 PPS CCS DEBUG: roothub.portstatus [1] = 0x00000100 PPS DEBUG: RET(rh) URB:[ 0] dev: 1,ep: 0-I,type:CTRL,len:4/4 stat:0x0 2 USB Device(s) found scanning bus for storage devices... i=0 i=1 i=2 0 Storage Device(s) found BOOT>usb tree Device Tree: 1 Hub (12MBit/s, 0mA) | OHCI Root Hub | +-0 See Interface (12MBit/s, 0mA)

2 1

[U-Boot] Please pull u-boot-ppc4xx
by Stefan Roese 17 Sep '09

17 Sep '09

Hi Wolfgang, please pull the following changes: The following changes since commit 15fba3279b56333bdb65ead366f82c945ed320d1: Kumar Gala (1): ppc/85xx: Disable all async interrupt sources when we boot are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Stefan Roese (3): ppc4xx: Fix 405EZ uart base baud calculation ppc4xx: Enable commands for FDT enabled Linux booting on AMCC Acadia ppc4xx: Consolidate get_OPB_freq() cpu/ppc4xx/speed.c | 96 ++++++++++------------------------------------ include/configs/acadia.h | 3 +- 2 files changed, 22 insertions(+), 77 deletions(-)

2 1

[U-Boot] [PATCH] Correct ffs/fls regression for PowerPC etc
by Simon Kagstrom 17 Sep '09

17 Sep '09

Correct ffs/fls regression for PowerPC etc Commits 02f99901ed1c9d828e3ea117f94ce2264bf8389e 52d61227b66d4099b39c8309ab37cb67ee09a405 introduced a regression where platform-specific ffs/fls implementations were defined away. This patch corrects that by using PLATFORM_xxx instead of the name itself. Signed-off-by: Simon Kagstrom <simon.kagstrom(a)netinsight.net> --- I've runtime tested on ARM (OpenRD base) and build-tested on MPC8536DS, where __ilog2_u64 now at least is non-empty. It would be nice if (at least!) some PowerPC people could test the patch. include/asm-arm/bitops.h | 8 -------- include/asm-blackfin/bitops.h | 10 +--------- include/asm-i386/bitops.h | 2 +- include/asm-m68k/bitops.h | 2 +- include/asm-microblaze/bitops.h | 3 ++- include/asm-mips/bitops.h | 13 +------------ include/asm-nios/bitops.h | 2 +- include/asm-nios2/bitops.h | 2 +- include/asm-ppc/bitops.h | 4 ++-- include/asm-sh/bitops.h | 2 +- include/linux/bitops.h | 8 ++++---- 11 files changed, 15 insertions(+), 41 deletions(-) diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h index 3c7b00c..270f163 100644 --- a/include/asm-arm/bitops.h +++ b/include/asm-arm/bitops.h @@ -125,14 +125,6 @@ static inline unsigned long ffz(unsigned long word) } /* - * ffs: find first bit set. This is defined the same way as - * the libc and compiler builtin ffs routines, therefore - * differs in spirit from the above ffz (man ffs). - */ - -#define ffs(x) generic_ffs(x) - -/* * hweightN: returns the hamming weight (i.e. the number * of bits set) of a N-bit word */ diff --git a/include/asm-blackfin/bitops.h b/include/asm-blackfin/bitops.h index cc3685d..f469f1c 100644 --- a/include/asm-blackfin/bitops.h +++ b/include/asm-blackfin/bitops.h @@ -79,7 +79,7 @@ static __inline__ void __set_bit(int nr, volatile void *addr) mask = 1 << (nr & 0x1f); *a |= mask; } -#define __set_bit +#define PLATFORM__set_bit /* * clear_bit() doesn't provide any barrier for the compiler. @@ -270,14 +270,6 @@ static __inline__ int find_next_zero_bit(void *addr, int size, int offset) } /* - * ffs: find first bit set. This is defined the same way as - * the libc and compiler builtin ffs routines, therefore - * differs in spirit from the above ffz (man ffs). - */ - -#define ffs(x) generic_ffs(x) - -/* * hweightN: returns the hamming weight (i.e. the number * of bits set) of a N-bit word */ diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h index ac6285a..c7a38f2 100644 --- a/include/asm-i386/bitops.h +++ b/include/asm-i386/bitops.h @@ -349,7 +349,7 @@ static __inline__ int ffs(int x) "1:" : "=r" (r) : "g" (x)); return r+1; } -#define ffs +#define PLATFORM_FFS /** * hweightN - returns the hamming weight of a N-bit word diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h index e0c35fa..ad971b4 100644 --- a/include/asm-m68k/bitops.h +++ b/include/asm-m68k/bitops.h @@ -51,7 +51,7 @@ extern __inline__ int ffs(int x) return r; } #define __ffs(x) (ffs(x) - 1) -#define ffs +#define PLATFORM_FFS #endif /* __KERNEL__ */ diff --git a/include/asm-microblaze/bitops.h b/include/asm-microblaze/bitops.h index aac9061..3b39e16 100644 --- a/include/asm-microblaze/bitops.h +++ b/include/asm-microblaze/bitops.h @@ -23,6 +23,7 @@ extern void __set_bit(int nr, volatile void * addr); extern void clear_bit(int nr, volatile void * addr); #define __clear_bit(nr, addr) clear_bit(nr, addr) +#define PLATFORM__clear_bit extern void change_bit(int nr, volatile void * addr); extern void __change_bit(int nr, volatile void * addr); @@ -75,7 +76,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr) mask = 1 << (nr & 0x1f); *a |= mask; } -#define __set_bit +#define PLATFORM__set_bit /* * clear_bit() doesn't provide any barrier for the compiler. diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 0c07b68..18dee51 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h @@ -90,7 +90,7 @@ static __inline__ void __set_bit(int nr, volatile void * addr) *m |= 1UL << (nr & 31); } -#define __set_bit +#define PLATFORM__set_bit /* * clear_bit - Clears a bit in memory @@ -706,17 +706,6 @@ static __inline__ unsigned long ffz(unsigned long word) #ifdef __KERNEL__ -/** - * ffs - find first bit set - * @x: the word to search - * - * This is defined the same way as - * the libc and compiler builtin ffs routines, therefore - * differs in spirit from the above ffz (man ffs). - */ - -#define ffs(x) generic_ffs(x) - /* * hweightN - returns the hamming weight of a N-bit word * @x: the word to weigh diff --git a/include/asm-nios/bitops.h b/include/asm-nios/bitops.h index 8315fb7..2047b7c 100644 --- a/include/asm-nios/bitops.h +++ b/include/asm-nios/bitops.h @@ -33,6 +33,6 @@ extern int test_and_set_bit(int nr, volatile void * a); extern int test_and_change_bit(int nr, volatile void * addr); extern int test_bit(int nr, volatile void * a); extern int ffs(int i); -#define ffs +#define PLATFORM_ffs #endif /* _ASM_NIOS_BITOPS_H */ diff --git a/include/asm-nios2/bitops.h b/include/asm-nios2/bitops.h index b01a89d..c4851ef 100644 --- a/include/asm-nios2/bitops.h +++ b/include/asm-nios2/bitops.h @@ -33,6 +33,6 @@ extern int test_and_set_bit(int nr, volatile void * a); extern int test_and_change_bit(int nr, volatile void * addr); extern int test_bit(int nr, volatile void * a); extern int ffs(int i); -#define ffs +#define PLATFORM_ffs #endif /* __ASM_NIOS2_BITOPS_H */ diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h index 9ed2f5d..1ad1256 100644 --- a/include/asm-ppc/bitops.h +++ b/include/asm-ppc/bitops.h @@ -178,7 +178,7 @@ static __inline__ int fls(unsigned int x) { return __ilog2(x) + 1; } -#define fls +#define PLATFORM_fls /** * fls64 - find last set bit in a 64-bit word @@ -231,7 +231,7 @@ extern __inline__ int ffs(int x) { return __ilog2(x & -x) + 1; } -#define ffs +#define PLATFORM_ffs /* * hweightN: returns the hamming weight (i.e. the number diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h index 95167bd..405c9ff 100644 --- a/include/asm-sh/bitops.h +++ b/include/asm-sh/bitops.h @@ -146,7 +146,7 @@ static inline int ffs (int x) } return r; } -#define ffs +#define PLATFORM_ffs #endif /* __KERNEL__ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index e14e6c7..2ea19ce 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -111,19 +111,19 @@ static inline unsigned int generic_hweight8(unsigned int w) /* linux/include/asm-generic/bitops/non-atomic.h */ -#ifndef __set_bit +#ifndef PLATFORM__set_bit # define __set_bit generic_set_bit #endif -#ifndef __clear_bit +#ifndef PLATFORM__clear_bit # define __clear_bit generic_clear_bit #endif -#ifndef ffs +#ifndef PLATFORM_ffs # define ffs generic_ffs #endif -#ifndef fls +#ifndef PLATFORM_fls # define fls generic_fls #endif -- 1.6.0.4

4 8