Home Explore Help
Register Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 0 Pull Requests 0 Wiki
Tree: 0a5a07f888
Branches Tags
openadk
/
target
/
ag241
/
patches
/
ar7.patch

ar7.patch 6.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157 
  1. diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/platform.c linux-2.6.33.1/arch/mips/ar7/platform.c
    2. 

  2. --- linux-2.6.33.1.orig/arch/mips/ar7/platform.c	2010-03-15 17:09:39.000000000 +0100
    3. 

  3. +++ linux-2.6.33.1/arch/mips/ar7/platform.c	2010-03-28 19:26:53.000000000 +0200
    4. 

  4. @@ -509,7 +509,7 @@
    5. 

  5.  
    6. 

  6.  	memset(uart_port, 0, sizeof(struct uart_port) * 2);
    7. 

  7.  
    8. 

  8. -	uart_port[0].type = PORT_16550A;
    9. 

  9. +	uart_port[0].type = PORT_AR7;
    10. 

  10.  	uart_port[0].line = 0;
    11. 

  11.  	uart_port[0].irq = AR7_IRQ_UART0;
    12. 

  12.  	uart_port[0].uartclk = ar7_bus_freq() / 2;
    13. 

  13. @@ -524,7 +524,7 @@
    14. 

  14.  
    15. 

  15.  	/* Only TNETD73xx have a second serial port */
    16. 

  16.  	if (ar7_has_second_uart()) {
    17. 

  17. -		uart_port[1].type = PORT_16550A;
    18. 

  18. +		uart_port[1].type = PORT_AR7;
    19. 

  19.  		uart_port[1].line = 1;
    20. 

  20.  		uart_port[1].irq = AR7_IRQ_UART1;
    21. 

  21.  		uart_port[1].uartclk = ar7_bus_freq() / 2;
    22. 

  22. diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/prom.c linux-2.6.33.1/arch/mips/ar7/prom.c
    23. 

  23. --- linux-2.6.33.1.orig/arch/mips/ar7/prom.c	2010-03-15 17:09:39.000000000 +0100
    24. 

  24. +++ linux-2.6.33.1/arch/mips/ar7/prom.c	2010-03-28 19:26:53.000000000 +0200
    25. 

  25. @@ -219,6 +219,14 @@
    26. 

  26.  	if (strstr(prom_getcmdline(), "console="))
    27. 

  27.  		return;
    28. 

  28.  
    29. 

  29. +#ifdef CONFIG_KGDB
    30. 

  30. +	if (!strstr(prom_getcmdline(), "nokgdb")) {
    31. 

  31. +		strcat(prom_getcmdline(), " console=kgdb");
    32. 

  32. +		kgdb_enabled = 1;
    33. 

  33. +		return;
    34. 

  34. +	}
    35. 

  35. +#endif
    36. 

  36. +
    37. 

  37.  	s = prom_getenv("modetty0");
    38. 

  38.  	if (s) {
    39. 

  39.  		baud = simple_strtoul(s, &p, 10);
    40. 

  40. diff -Nur linux-2.6.33.1.orig/arch/mips/include/asm/page.h linux-2.6.33.1/arch/mips/include/asm/page.h
    41. 

  41. --- linux-2.6.33.1.orig/arch/mips/include/asm/page.h	2010-03-15 17:09:39.000000000 +0100
    42. 

  42. +++ linux-2.6.33.1/arch/mips/include/asm/page.h	2010-03-28 19:26:53.000000000 +0200
    43. 

  43. @@ -200,8 +200,11 @@
    44. 

  44.  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
    45. 

  45.  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
    46. 

  46.  
    47. 

  47. -#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE)
    48. 

  48. -#define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET)
    49. 

  49. +#define UNCAC_ADDR(addr)       ((addr) - PAGE_OFFSET + UNCAC_BASE +    \
    50. 

  50. +                                PHYS_OFFSET)
    51. 

  51. +#define CAC_ADDR(addr)         ((addr) - UNCAC_BASE + PAGE_OFFSET -    \
    52. 

  52. +                                PHYS_OFFSET)
    53. 

  53. +
    54. 

  54.  
    55. 

  55.  #include <asm-generic/memory_model.h>
    56. 

  56.  #include <asm-generic/getorder.h>
    57. 

  57. diff -Nur linux-2.6.33.1.orig/arch/mips/Kconfig linux-2.6.33.1/arch/mips/Kconfig
    58. 

  58. --- linux-2.6.33.1.orig/arch/mips/Kconfig	2010-03-15 17:09:39.000000000 +0100
    59. 

  59. +++ linux-2.6.33.1/arch/mips/Kconfig	2010-03-28 19:26:53.000000000 +0200
    60. 

  60. @@ -34,7 +34,6 @@
    61. 

  61.  	select CEVT_R4K
    62. 

  62.  	select CSRC_R4K
    63. 

  63.  	select IRQ_CPU
    64. 

  64. -	select NO_EXCEPT_FILL
    65. 

  65.  	select SWAP_IO_SPACE
    66. 

  66.  	select SYS_HAS_CPU_MIPS32_R1
    67. 

  67.  	select SYS_HAS_EARLY_PRINTK
    68. 

  68. diff -Nur linux-2.6.33.1.orig/arch/mips/kernel/traps.c linux-2.6.33.1/arch/mips/kernel/traps.c
    69. 

  69. --- linux-2.6.33.1.orig/arch/mips/kernel/traps.c	2010-03-15 17:09:39.000000000 +0100
    70. 

  70. +++ linux-2.6.33.1/arch/mips/kernel/traps.c	2010-03-28 19:26:53.000000000 +0200
    71. 

  71. @@ -1283,9 +1283,22 @@
    72. 

  72.  
    73. 

  73.  	exception_handlers[n] = handler;
    74. 

  74.  	if (n == 0 && cpu_has_divec) {
    75. 

  75. -		*(u32 *)(ebase + 0x200) = 0x08000000 |
    76. 

  76. -					  (0x03ffffff & (handler >> 2));
    77. 

  77. -		local_flush_icache_range(ebase + 0x200, ebase + 0x204);
    78. 

  78. +              if ((handler ^ (ebase + 4)) & 0xfc000000) {
    79. 

  79. +                      /* lui k0, 0x0000 */
    80. 

  80. +                      *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
    81. 

  81. +                      /* ori k0, 0x0000 */
    82. 

  82. +                      *(u32 *)(ebase + 0x204) =
    83. 

  83. +                                      0x375a0000 | (handler & 0xffff);
    84. 

  84. +                      /* jr k0 */
    85. 

  85. +                      *(u32 *)(ebase + 0x208) = 0x03400008;
    86. 

  86. +                      /* nop */
    87. 

  87. +                      *(u32 *)(ebase + 0x20C) = 0x00000000;
    88. 

  88. +                      flush_icache_range(ebase + 0x200, ebase + 0x210);
    89. 

  89. +              } else {
    90. 

  90. +                      *(u32 *)(ebase + 0x200) =
    91. 

  91. +                              0x08000000 | (0x03ffffff & (handler >> 2));
    92. 

  92. +                      flush_icache_range(ebase + 0x200, ebase + 0x204);
    93. 

  93. +              }
    94. 

  94.  	}
    95. 

  95.  	return (void *)old_handler;
    96. 

  96.  }
    97. 

  97. diff -Nur linux-2.6.33.1.orig/drivers/mtd/ar7part.c linux-2.6.33.1/drivers/mtd/ar7part.c
    98. 

  98. --- linux-2.6.33.1.orig/drivers/mtd/ar7part.c	2010-03-15 17:09:39.000000000 +0100
    99. 

  99. +++ linux-2.6.33.1/drivers/mtd/ar7part.c	2010-03-28 19:26:53.000000000 +0200
    100. 

  100. @@ -28,7 +28,7 @@
    101. 

  101.  #include <linux/bootmem.h>
    102. 

  102.  #include <linux/magic.h>
    103. 

  103.  
    104. 

  104. -#define AR7_PARTS	4
    105. 

  105. +#define AR7_PARTS	5
    106. 

  106.  #define ROOT_OFFSET	0xe0000
    107. 

  107.  
    108. 

  108.  #define LOADER_MAGIC1	le32_to_cpu(0xfeedfa42)
    109. 

  109. @@ -122,14 +122,19 @@
    110. 

  110.  
    111. 

  111.  	ar7_parts[2].name = "linux";
    112. 

  112.  	ar7_parts[2].offset = pre_size;
    113. 

  113. -	ar7_parts[2].size = master->size - pre_size - post_size;
    114. 

  114. +	ar7_parts[2].size = master->size - pre_size - post_size - 2*master->erasesize;
    115. 

  115.  	ar7_parts[2].mask_flags = 0;
    116. 

  116.  
    117. 

  117.  	ar7_parts[3].name = "rootfs";
    118. 

  118.  	ar7_parts[3].offset = root_offset;
    119. 

  119. -	ar7_parts[3].size = master->size - root_offset - post_size;
    120. 

  120. +	ar7_parts[3].size = master->size - root_offset - post_size - 2*master->erasesize;
    121. 

  121.  	ar7_parts[3].mask_flags = 0;
    122. 

  122.  
    123. 

  123. +	ar7_parts[4].name = "cfgfs";
    124. 

  124. +	ar7_parts[4].offset = master->size - 2*master->erasesize;
    125. 

  125. +	ar7_parts[4].size = 2*master->erasesize;
    126. 

  126. +	ar7_parts[4].mask_flags = 0;
    127. 

  127. +
    128. 

  128.  	*pparts = ar7_parts;
    129. 

  129.  	return AR7_PARTS;
    130. 

  130.  }
    131. 

  131. diff -Nur linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c linux-2.6.33.1/drivers/mtd/maps/physmap.c
    132. 

  132. --- linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c	2010-03-15 17:09:39.000000000 +0100
    133. 

  133. +++ linux-2.6.33.1/drivers/mtd/maps/physmap.c	2010-03-28 19:26:53.000000000 +0200
    134. 

  134. @@ -79,7 +79,7 @@
    135. 

  135.  					"map_rom",
    136. 

  136.  					NULL };
    137. 

  137.  #ifdef CONFIG_MTD_PARTITIONS
    138. 

  138. -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
    139. 

  139. +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL };
    140. 

  140.  #endif
    141. 

  141.  
    142. 

  142.  static int physmap_flash_probe(struct platform_device *dev)
    143. 

  143. diff -Nur linux-2.6.33.1.orig/drivers/serial/8250.c linux-2.6.33.1/drivers/serial/8250.c
    144. 

  144. --- linux-2.6.33.1.orig/drivers/serial/8250.c	2010-03-15 17:09:39.000000000 +0100
    145. 

  145. +++ linux-2.6.33.1/drivers/serial/8250.c	2010-03-28 19:26:53.000000000 +0200
    146. 

  146. @@ -2715,7 +2715,11 @@
    147. 

  147.  {
    148. 

  148.  	struct uart_8250_port *up = (struct uart_8250_port *)port;
    149. 

  149.  
    150. 

  150. +#ifdef CONFIG_AR7
    151. 

  151. +	wait_for_xmitr(up, BOTH_EMPTY);
    152. 

  152. +#else
    153. 

  153.  	wait_for_xmitr(up, UART_LSR_THRE);
    154. 

  154. +#endif
    155. 

  155.  	serial_out(up, UART_TX, ch);
    156. 

  156.  }
    157. 

  157.  
    158.