TQ2440移植u-boot-2010.06-rc1---6usb下载

以前做过usb下载的东东,现在把它搞到u-boot-2010.06-rc1上去.

网上有usb下载的代码,可以在这儿下载:

http://blogimg.chinaunix.net/blog/upfile2/100109001526.bz2

一. 先编译过再说

1.下载后,解压到u-boot-2010.06-rc1/drivers/usb/slave目录

并在顶层Makefile中添加: LIBS += drivers/usb/slave/libusb_slave.a

2. 将driver/usb/slave/目录下所有C文件所个替换

1. a. 

2. #if defined(CONFIG_S3C2400)
   

3. #include 
   

4. #elif defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
   

5. #include 
   

6. #endif

7. #include

8. 替换为

9. #include

10. b. 删除driver/usb/slave/interrupt.c

11. c. 修改driver/usb/slave/Makefile中的 COBJS, 去掉interrupt.o

3.u-boot-2010.06-rc1中结构体都是小写,跟下载的代码中结构体名字是大写的,需要将大写的名字改成小写的,这样才可以编译过去.

1. a. 将usbin.c中 
   

2. L21
   

3.     /* 
   

4.     extern S3C24X0_USB_DEVICE * usbdevregs;
   

5.     extern S3C24X0_DMAS * dmaregs;
   

6.     */
   

7.     extern struct s3c24x0_usb_device * usbdevregs;
   

8.     extern struct s3c24x0_dmas * dmaregs;
   

9. L32 解决: warning: suggest parentheses around arithmetic in operand of |

10. 
    

11.  #define SET_EP1_IN_PKT_READY()  usbdevregs->EP0_CSR_IN_CSR1_REG= ( (in_csr1 &(~ EPI_WR_BITS)) \

12.          | EPI_IN_PKT_READY )

13.  #define SET_EP1_SEND_STALL()    usbdevregs->EP0_CSR_IN_CSR1_REG= ( (in_csr1 & (~EPI_WR_BITS))\

14.          | EPI_SEND_STALL) )

15.  #define CLR_EP1_SENT_STALL()    usbdevregs->EP0_CSR_IN_CSR1_REG= ( (in_csr1 & (~EPI_WR_BITS))\

16.           &(~EPI_SENT_STALL) )

17.  #define FLUSH_EP1_FIFO()    usbdevregs->EP0_CSR_IN_CSR1_REG= ( (in_csr1 & (~EPI_WR_BITS))\

18.           |(EPI_FIFO_FLUSH) )

19. b. 将usblib.c中
    

20. L23
    

21.     /*
    

22.     extern S3C24X0_INTERRUPT * intregs;
    

23.     extern S3C24X0_USB_DEVICE * usbdevregs;
    

24.     extern S3C24X0_DMAS * dmaregs;
    

25.     */
    

26.     extern struct s3c24x0_interrupt * intregs;
    

27.     extern struct s3c24x0_usb_device *usbdevregs;
    

28.     extern struct s3c24x0_dmas * dmaregs;
    

29. c. usbinit.c 中 
    

30. L22
    

31.     /*
    

32.     extern S3C24X0_INTERRUPT * intregs;
    

33.     S3C24X0_USB_DEVICE * usbdevregs;
    

34.     S3C24X0_DMAS * dmaregs;
    

35.     S3C24X0_CLOCK_POWER * clk_powerregs;
    

36.     S3C24X0_GPIO * gpioregs;
    

37.     */
    

38.     extern struct s3c24x0_interrupt * intregs;
    

39.     struct s3c24x0_usb_device * usbdevregs;
    

40.     struct s3c24x0_dmas * dmaregs;
    

41.     struct s3c24x0_clock_power * clk_powerregs;
    

42.     struct s3c24x0_gpio * gpioregs;
    

43. L122:
    

44.     //gpioregs = S3C24X0_GetBase_GPIO(); 
    

45.     gpioregs = s3c24x0_get_base_gpio();
    

46. L222
    

47.     /*
    

48.     clk_powerregs = S3C24X0_GetBase_CLOCK_POWER();
    

49.     usbdevregs = S3C24X0_GetBase_USB_DEVICE();
    

50.     dmaregs = S3C24X0_GetBase_DMAS();
    

51.     */
    

52.     clk_powerregs = s3c24x0_get_base_clock_power();
    

53.     usbdevregs = s3c24x0_get_base_usb_device();
    

54.     dmaregs = s3c24x0_get_base_dmas();
    

55. 
    

56. L297
    

57.     //S3C24X0_INTERRUPT * intregs;
    

58.     struct s3c24x0_interrupt * intregs;
    

59. 
    

60.     //intregs = S3C24X0_GetBase_INTERRUPT();
    

61.     intregs = s3c24x0_get_base_interrupt();
    

62. d. usbmain.c 中 
    

63. L20
    

64.     /*
    

65.     extern S3C24X0_USB_DEVICE * usbdevregs;
    

66.     extern S3C24X0_DMAS * dmaregs;
    

67.     */
    

68.     extern struct s3c24x0_usb_device * usbdevregs;
    

69.     extern struct s3c24x0_dmas * dmaregs;

70. L444 解决: warning: suggest parentheses around arithmetic in operand of |

71. 
    

72. 444     gpioregs->MISCCR = (gpioregs->MISCCR&~(7<<4)) | (clock_sel<<4);

73. 445     gpioregs->GPHCON = (gpioregs->GPHCON&~(3<<18)) | (2<<18);

74. e. usbout.c中 
    

75. L28
    

76.     /*
    

77.     extern S3C24X0_INTERRUPT * intregs;
    

78.     extern S3C24X0_USB_DEVICE * usbdevregs;
    

79.     extern S3C24X0_DMAS * dmaregs;
    

80.     */
    

81.     extern struct s3c24x0_interrupt * intregs;
    

82.     extern struct s3c24x0_usb_device * usbdevregs;
    

83.     extern struct s3c24x0_dmas * dmaregs;
    

84. L188

85.     //ClearPending_my(BIT_DMA2);

86.    ClearPending(BIT_DMA2);

87. f. usbsetup.c中 
    

88. L19
    

89.     /*
    

90.     extern S3C24X0_INTERRUPT * intregs;
    

91.     extern S3C24X0_USB_DEVICE * usbdevregs;
    

92.     extern S3C24X0_DMAS * dmaregs;
    

93.     */
    

94.     extern struct s3c24x0_interrupt * intregs;
    

95.     extern struct s3c24x0_usb_device * usbdevregs;
    

96.     extern struct s3c24x0_dmas * dmaregs;

97. L46 解决: warning: suggest parentheses around arithmetic in operand of |

98. 
    

99. #define CLR_EP0_OUT_PKT_RDY()       usbdevregs->EP0_CSR_IN_CSR1_REG=( (ep0_csr & (~EP0_WR_BITS))| \

100.         EP0_SERVICED_OUT_PKT_RDY )

101. #define CLR_EP0_OUTPKTRDY_DATAEND()     usbdevregs->EP0_CSR_IN_CSR1_REG=( (ep0_csr & (~EP0_WR_BITS) )| \

102.         (EP0_SERVICED_OUT_PKT_RDY|EP0_DATA_END) )

103. 
     

104. #define SET_EP0_IN_PKT_RDY()        usbdevregs->EP0_CSR_IN_CSR1_REG=( (ep0_csr & (~EP0_WR_BITS) ) | \

105.         (EP0_IN_PKT_READY) )

106. #define SET_EP0_INPKTRDY_DATAEND()  usbdevregs->EP0_CSR_IN_CSR1_REG=( (ep0_csr & (~EP0_WR_BITS))| \

107.         (EP0_IN_PKT_READY|EP0_DATA_END) )

108. 
     

109. #define CLR_EP0_SETUP_END()         usbdevregs->EP0_CSR_IN_CSR1_REG=( (ep0_csr & (~EP0_WR_BITS)) | \

110.         (EP0_SERVICED_SETUP_END) )

111. 
     

112. #define CLR_EP0_SENT_STALL()        usbdevregs->EP0_CSR_IN_CSR1_REG=( (ep0_csr & (~EP0_WR_BITS) )& \

113.         (~EP0_SENT_STALL) )

114. 
     

115. #define FLUSH_EP0_FIFO()        {while(usbdevregs->OUT_FIFO_CNT1_REG)usbdevregs->fifo[0].EP_FIFO_REG;}

4.arch/arm/include/asm/arch/s3c24x0.h中

1. a. 添加两个宏定义

2.     #define BIT_DMA2 (0x1<<19)
   

3.     #define BIT_USBD (0x1<<25)
   

4. 
   

5. b. 修改s3c24x0_usb_device结构体
   

6.     //u8 res10[7]
   

7.     u8 res10[3];
   

8.     //u8 res12[3]
   

9.     u8 res12[7];
   

10.     //u8 res13[7]
    

11.     u8 res13[3];
    

12.     /*
    

13.     struct s3c24x0_usb_dev_fifos fifo[5];
    

14.     struct s3c24x0_usb_dev_dmas dma[5];
    

15.     */
    

16.     u32 res17[8];
    

17.     struct s3c24x0_usb_dev_fifos fifo[5];
    

18.     u32 res18[11];
    

19.     struct s3c24x0_usb_dev_dmas ep1;
    

20.     struct s3c24x0_usb_dev_dmas ep2;
    

21.     u8 res19[16];
    

22.     struct s3c24x0_usb_dev_dmas ep3;
    

23.     struct s3c24x0_usb_dev_dmas ep4;
    

24. 
    

25. c. 修改 struct s3c24x0_gpio
    

26. L481 添加:
    

27.     /* s3c2440 */
    

28.     u32 res9[4];
    

29.     u32 GPJCON;
    

30.     u32 GPJDAT;
    

31.     u32 GPJUP;

5. usbmain.c中void IsrUsbd(void)调用了ClearPending,其实现如下:

1. arch/arm/cpu/arm920t/interrupt.c

2. //添加 ClearPending的实现:

3. void ClearPending(int bit)
   

4. {
   

5.     intregs->SRCPND = bit;
   

6.     intregs->INTPND = bit;
   

7. }

8. 并修改driver/usb/slave/usbmain.c

9.  //ClearPending_my(BIT_USBD);

10.  ClearPending(BIT_USBD);

6. usbmain.c的usb_init_slave(void)调用了Isr_Init(),其实现如下

arch/arm/cpu/arm920t/interrupt.c中添加

1. #include 
   

2. 
   

3. struct s3c24x0_interrupt * intregs;
   

4. void (*isr_handle_array[50])(void);
   

5. extern void IsrUsbd(void);

6. extern void IsrDma2(void);

7. void Dummy_isr(void)
   

8. {
   

9.     printf("Dummy_isr error, interrupt number: %d, INTMSK = 0x%x\n", intregs->INTOFFSET, intregs->INTMSK);
   

10.     while(1);
    

11. }
    

12. //初始化irq的中断向量表

13. void Isr_Init(void)
    

14. {
    

15.     int i = 0;
    

16.     intregs = s3c24x0_get_base_interrupt();
    

17. 
    

18.     for (i = 0; i < sizeof(isr_handle_array) / sizeof(isr_handle_array[0]); i++ )
    

19.     {
    

20.         isr_handle_array[i] = Dummy_isr;
    

21.     }
    

22. 
    

23.     intregs->INTMOD=0x0;     // All=IRQ mode
    

24.     intregs->INTMSK=BIT_ALLMSK;     // All interrupt is masked.
    

25. 
    

26. #ifdef CONFIG_USB_DEVICE
    

27.     isr_handle_array[ISR_USBD_OFT] = IsrUsbd;
    

28.     isr_handle_array[ISR_DMA2_OFT] = IsrDma2;
    

29.     ClearPending(BIT_DMA2);
    

30.     ClearPending(BIT_USBD);
    

31. #endif
    

32. }

33. b. 同时在 arch/arm/include/asm/arch/s3c24x0.h中添加

34. 
    

35. #define ISR_DMA2_OFT      19

36. #define ISR_USBD_OFT      25

37.  

38. c. 并在 include/configs/smdk2410.h 中添加

39.  #define CONFIG_USB_DEVICE 1

40. d. arch/arm/lib/bootm.c中,注掉udc_disconnect,否则编译不过

41. 
    

42. #ifdef CONFIG_USB_DEVICE

43. {

44. extern void udc_disconnect (void);

45. //udc_disconnect ();

46. }

47. #endif

7. 开启中断

start_armboot --> 调用enable_interrupts ();

在include/configs/smdk2410.h 中添加 

1. //#undef CONFIG_USE_IRQ            /* we don't need IRQ/FIQ stuff */
   

2. #define CONFIG_USE_IRQ    1

这会导致arch/arm/cpu/arm920t/s3c24x0/interrupt.c 因为缺少readl而出错

同时报错说没有arch_interrupt_init的定义

在arch/arm/cpu/arm920t/s3c24x0/interrupt.c 中添加

1. #include 
   

2. 
   

3. int arch_interrupt_init(void)
   

4. {
   

5.     return (0);
   

6. }

8.还要在arch/arm/lib/board.c中添加

1. /* enable exceptions */
   

2. enable_interrupts ();
   

3. 
   

4. //调用usb 初始化函数
   

5. usb_init_slave();

10. 还编译不过,需要在arch/arm/cpu/arm920t/interrupt.c中添加

1. static int intCount;
   

2. 
   

3. void Timer_InitEx(void)
   

4. {
   

5.     intCount=0;
   

6.     intregs->SUBSRCPND    = (1<<13);
   

7.     ClearPending(BIT_WDT_AC97/*BIT_WDT*/);
   

8.     intregs->INTMSK&=~(BIT_WDT_AC97 /*BIT_WDT*/);
   

9.     intregs->INTSUBMSK &= ~(1<<13);
   

10. }
    

11. 
    

12. void Timer_StartEx(void)
    

13. {
    

14.     //S3C24X0_WATCHDOG * const wdtregs = S3C24X0_GetBase_WATCHDOG();
    

15.     struct s3c24x0_watchdog * const wdtregs = s3c24x0_get_base_watchdog();
    

16.     wdtregs->WTCON=((get_PCLK()/1000000-1)<<8)|(0<<3)|(1<<2);    // 16us
    

17.     wdtregs->WTDAT=0xffff;
    

18.     wdtregs->WTCNT=0xffff;
    

19. 
    

20.     // 1/16/(65+1),interrupt enable,reset disable,watchdog enable
    

21.     wdtregs->WTCON=((get_PCLK()/1000000-1)<<8)|(0<<3)|(1<<2)|(0<<0)|(1<<5);
    

22. }
    

23. unsigned int Timer_StopEx(void)
    

24. {
    

25.     int count;
    

26.     //S3C24X0_WATCHDOG * const wdtregs = S3C24X0_GetBase_WATCHDOG();
    

27.     struct s3c24x0_watchdog * const wdtregs = s3c24x0_get_base_watchdog();
    

28. 
    

29.     wdtregs->WTCON=((get_PCLK()/1000000-1)<<8);
    

30.     intregs->INTMSK|=BIT_WDT_AC97; //BIT_WDT;
    

31.     intregs->INTSUBMSK |= (1<<13);
    

32. 
    

33.     count=(0xffff-wdtregs->WTCNT)+(intCount*0xffff);
    

34.     return ((unsigned int)count*16/1000000);
    

35. }

11. 加入usbslave命令

Common/Makefile中

1. COBJS-$(CONFIG_USB_DEVICE) += usb_storage.o

common/cmd_usbslave.c  cmd_usbslave.c.txt   (改名为: cmd_usbslave.c, 放在common/目录下)

12 打通中断的路

arch/arm/cpu/arm920t/start.S  L399

1. irq:

2. /*
   

3.     get_irq_stack
   

4.     irq_save_user_regs
   

5.     bl    do_irq
   

6.     irq_restore_user_regs
   

7. */
   

8. 
   

9.     sub lr, lr, #4                    @ the return address
   

10.     /*@在完成保存堆栈的操作后，跳到中断处理函数IRQ_Handle中*/

11.     ldr sp, IRQ_STACK_START         @ the stack for irq
    

12.     stmdb        { r0-r12,lr }    @ save registers
    

13. 
    

14.     ldr lr, =int_return             @ set the return addr
    

15.     ldr pc, =IRQ_Handle             @ call the isr
    

16. int_return:
    

17.     ldmia        { r0-r12,pc }^    @ return from interrupt

arch/arm/cpu/arm920t/interrupt.c //irq的中断服务程序

1. void IRQ_Handle()
   

2. {
   

3.     unsigned long oft = intregs->INTOFFSET;
   

4.     //S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
   

5.     struct s3c24x0_gpio *const gpio = s3c24x0_get_base_gpio();
   

6. 
   

7.     //清中断

8.     if( oft == 4 ) gpio->EINTPEND = 1<<7;        //EINT4-7合用IRQ4，注意EINTPEND[3:0]保留未用，向这些位写入1可能导致未知结果
   

9.     intregs->SRCPND = 1<

10.     intregs->INTPND    = intregs->INTPND;
    

11. 
    

12.     /* run the isr */
    

13.     isr_handle_array[oft]();
    

14. }

在Isr_init()中    

   isr_handle_array[ISR_USBD_OFT] = IsrUsbd;

   isr_handle_array[ISR_DMA2_OFT] = IsrDma2;

所以当有usb中断时,就会调用IsrUsbd()函数.

13. 最关键的一步, 打开irq中断,重启复位时默认进入0xD3模式,并不开启irq中断,

在start_armboot中完成Port_init之后就要打开irq中断.

1. /* enable IRQ interrupts */
   

2. void enable_interrupts (void)
   

3. {
   

4.     unsigned long temp;
   

5.     __asm__ __volatile__("mrs %0, cpsr\n"
   

6.              "bic %0, %0, #0x80\n"
   

7.              "msr cpsr_c, %0"
   

8.              : "=r" (temp)
   

9.              :
   

10.              : "memory");
    

11. }

当调用enable_interrupts函数之后,irq中断这条路就己经通了,当有usb中断发生时就会进入自己写的usb中断服务程序.

二.调试

2.1 当编译好之后,下载到板子上运行,usb设备枚举正常,但在下载时出现问题

1. SMDK2410 # usbslave 1 0x30000000
   

2. USB host is connected. Waiting a download.
   

3. 
   

4. Now, Downloading [ADDRESS:30000000h,TOTAL:1942578]
   

5. RECEIVED FILE SIZE: 65536Dummy_isr error, interrupt number: 9, INTMSK = 0xfff7fdff

2.2 加入watchdog和timer中断

1. int g_TimerIntHappen;

2. static int intCount;

3. void IsrTimer4(void)

4. {

5.    ClearPending(BIT_TIMER4);

6.    *(volatile int *)&g_TimerIntHappen = 1;

7. }

8. 
   

9. 
   

10. void Dummy_isr(void)

11. {

12. printf("Dummy_isr error, interrupt number: %d, INTMSK = 0x%x\n", intregs->INTOFFSET, intregs->INTMSK);

13. while(1);

14. }

15. void Isr_Init(void) //加入中断处理函数

16. {

17.    isr_handle_array[ISR_TIMER4_OFT] = IsrTimer4;  

18.    isr_handle_array[ISR_WDT_OFT]  = IsrWatchdog;
    }