Part of Slepp's Projects — Pastebin — TURL — Imagebin — Filebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate
Sign In | Create Account

Paste Actions

Download Raw
Embed
pBox URL
Post to Twitter
Remove Paste

Paste Details

Raw format, 1 year 1 month old, and 161 hits.

Advertising

Stuff
Friday, May 4th, 2012 at 9:36:19pm MDT 

  1. From 3ecb0d18dbf2aeb2a14c004fe97026511ded0e9f Mon Sep 17 00:00:00 2001
  2. From: Tobias Droste <tdroste@gmx.de>
  3. Date: Sat, 5 May 2012 05:34:35 +0200
  4. Subject: [PATCH] arch/msm: remove pmem_camera
  5.  
  6. it is and was never used! this gives us more RAM for the camera.
  7.  
  8. Signed-off-by: Tobias Droste <tdroste@gmx.de>
  9. ---
  10.  arch/arm/mach-msm/board-liberty.c  |    2 --
  11.  arch/arm/mach-msm/board-liberty.h  |    7 ++-----
  12.  arch/arm/mach-msm/board-marvel.c   |    2 --
  13.  arch/arm/mach-msm/board-marvel.h   |    7 ++-----
  14.  arch/arm/mach-msm/board-marvelc.c  |    2 --
  15.  arch/arm/mach-msm/board-marvelc.h  |    7 ++-----
  16.  arch/arm/mach-msm/board-marvelct.c |    2 --
  17.  arch/arm/mach-msm/board-marvelct.h |    7 ++-----
  18.  8 files changed, 8 insertions(+), 28 deletions(-)
  19.  
  20. diff --git a/arch/arm/mach-msm/board-liberty.c b/arch/arm/mach-msm/board-liberty.c
  21. index 68351c8..0a9be40 100644
  22. --- a/arch/arm/mach-msm/board-liberty.c
  23. +++ b/arch/arm/mach-msm/board-liberty.c
  24. @@ -573,8 +573,6 @@ static struct msm_pmem_setting pmem_setting = {
  25.         .pmem_size = MSM_PMEM_MDP_SIZE,
  26.         .pmem_adsp_start = MSM_PMEM_ADSP_BASE,
  27.         .pmem_adsp_size = MSM_PMEM_ADSP_SIZE,
  28. -       .pmem_camera_start = MSM_PMEM_CAMERA_BASE,
  29. -       .pmem_camera_size = MSM_PMEM_CAMERA_SIZE,
  30.         .ram_console_start = MSM_RAM_CONSOLE_BASE,
  31.         .ram_console_size = MSM_RAM_CONSOLE_SIZE,
  32.          .kgsl_start = MSM_GPU_MEM_BASE,
  33. diff --git a/arch/arm/mach-msm/board-liberty.h b/arch/arm/mach-msm/board-liberty.h
  34. index 9c4b9f7..abb2174 100644
  35. --- a/arch/arm/mach-msm/board-liberty.h
  36. +++ b/arch/arm/mach-msm/board-liberty.h
  37. @@ -36,13 +36,10 @@
  38.  #define MSM_PMEM_MDP_SIZE       0x01000000
  39.  
  40.  #define MSM_PMEM_ADSP_BASE      MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE
  41. -#define MSM_PMEM_ADSP_SIZE      0x00C1B000
  42. -
  43. -#define MSM_PMEM_CAMERA_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  44. -#define MSM_PMEM_CAMERA_SIZE    0x00800000
  45. +#define MSM_PMEM_ADSP_SIZE      0x0141B000
  46.  
  47.  /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */
  48. -#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE
  49. +#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  50.  #define MSM_RAM_CONSOLE_SIZE    128 * SZ_1K
  51.  
  52.  #define LIBERTY_GPIO_TO_INT(x)           (x+64) /* from gpio_to_irq */
  53. diff --git a/arch/arm/mach-msm/board-marvel.c b/arch/arm/mach-msm/board-marvel.c
  54. index b7337fb..76a3827 100644
  55. --- a/arch/arm/mach-msm/board-marvel.c
  56. +++ b/arch/arm/mach-msm/board-marvel.c
  57. @@ -1042,8 +1042,6 @@ static struct msm_pmem_setting pmem_setting = {
  58.         .pmem_size = MSM_PMEM_MDP_SIZE,
  59.         .pmem_adsp_start = MSM_PMEM_ADSP_BASE,
  60.         .pmem_adsp_size = MSM_PMEM_ADSP_SIZE,
  61. -       .pmem_camera_start = MSM_PMEM_CAMERA_BASE,
  62. -       .pmem_camera_size = MSM_PMEM_CAMERA_SIZE,
  63.         .ram_console_start = MSM_RAM_CONSOLE_BASE,
  64.         .ram_console_size = MSM_RAM_CONSOLE_SIZE,
  65.          .kgsl_start = MSM_GPU_MEM_BASE,
  66. diff --git a/arch/arm/mach-msm/board-marvel.h b/arch/arm/mach-msm/board-marvel.h
  67. index 2e94127..9a6743b 100644
  68. --- a/arch/arm/mach-msm/board-marvel.h
  69. +++ b/arch/arm/mach-msm/board-marvel.h
  70. @@ -36,13 +36,10 @@
  71.  #define MSM_PMEM_MDP_SIZE       0x01000000
  72.  
  73.  #define MSM_PMEM_ADSP_BASE      MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE
  74. -#define MSM_PMEM_ADSP_SIZE      0x00C1B000
  75. -
  76. -#define MSM_PMEM_CAMERA_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  77. -#define MSM_PMEM_CAMERA_SIZE    0x00800000
  78. +#define MSM_PMEM_ADSP_SIZE      0x0141B000
  79.  
  80.  /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */
  81. -#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE
  82. +#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  83.  #define MSM_RAM_CONSOLE_SIZE    128 * SZ_1K
  84.  
  85.  #define MARVEL_GPIO_TO_INT(x)           (x+64) /* from gpio_to_irq */
  86. diff --git a/arch/arm/mach-msm/board-marvelc.c b/arch/arm/mach-msm/board-marvelc.c
  87. index b2cdf1e..6683a3d 100644
  88. --- a/arch/arm/mach-msm/board-marvelc.c
  89. +++ b/arch/arm/mach-msm/board-marvelc.c
  90. @@ -554,8 +554,6 @@ static struct msm_pmem_setting pmem_setting = {
  91.         .pmem_size = MSM_PMEM_MDP_SIZE,
  92.         .pmem_adsp_start = MSM_PMEM_ADSP_BASE,
  93.         .pmem_adsp_size = MSM_PMEM_ADSP_SIZE,
  94. -       .pmem_camera_start = MSM_PMEM_CAMERA_BASE,
  95. -       .pmem_camera_size = MSM_PMEM_CAMERA_SIZE,
  96.         .ram_console_start = MSM_RAM_CONSOLE_BASE,
  97.         .ram_console_size = MSM_RAM_CONSOLE_SIZE,
  98.          .kgsl_start = MSM_GPU_MEM_BASE,
  99. diff --git a/arch/arm/mach-msm/board-marvelc.h b/arch/arm/mach-msm/board-marvelc.h
  100. index a39ee78..5b4c5c5 100644
  101. --- a/arch/arm/mach-msm/board-marvelc.h
  102. +++ b/arch/arm/mach-msm/board-marvelc.h
  103. @@ -36,13 +36,10 @@
  104.  #define MSM_PMEM_MDP_SIZE       0x01000000
  105.  
  106.  #define MSM_PMEM_ADSP_BASE      MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE
  107. -#define MSM_PMEM_ADSP_SIZE      0x00C1B000
  108. -
  109. -#define MSM_PMEM_CAMERA_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  110. -#define MSM_PMEM_CAMERA_SIZE    0x00800000
  111. +#define MSM_PMEM_ADSP_SIZE      0x0141B000
  112.  
  113.  /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */
  114. -#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE
  115. +#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  116.  #define MSM_RAM_CONSOLE_SIZE    128 * SZ_1K
  117.  
  118.  #define MARVELC_GPIO_TO_INT(x)           (x+64) /* from gpio_to_irq */
  119. diff --git a/arch/arm/mach-msm/board-marvelct.c b/arch/arm/mach-msm/board-marvelct.c
  120. index 0f0ebce..c0c0cdb 100644
  121. --- a/arch/arm/mach-msm/board-marvelct.c
  122. +++ b/arch/arm/mach-msm/board-marvelct.c
  123. @@ -556,8 +556,6 @@ static struct msm_pmem_setting pmem_setting = {
  124.         .pmem_size = MSM_PMEM_MDP_SIZE,
  125.         .pmem_adsp_start = MSM_PMEM_ADSP_BASE,
  126.         .pmem_adsp_size = MSM_PMEM_ADSP_SIZE,
  127. -       .pmem_camera_start = MSM_PMEM_CAMERA_BASE,
  128. -       .pmem_camera_size = MSM_PMEM_CAMERA_SIZE,
  129.         .ram_console_start = MSM_RAM_CONSOLE_BASE,
  130.         .ram_console_size = MSM_RAM_CONSOLE_SIZE,
  131.          .kgsl_start = MSM_GPU_MEM_BASE,
  132. diff --git a/arch/arm/mach-msm/board-marvelct.h b/arch/arm/mach-msm/board-marvelct.h
  133. index 7c50b9b..971a2a7 100644
  134. --- a/arch/arm/mach-msm/board-marvelct.h
  135. +++ b/arch/arm/mach-msm/board-marvelct.h
  136. @@ -36,13 +36,10 @@
  137.  #define MSM_PMEM_MDP_SIZE       0x01000000
  138.  
  139.  #define MSM_PMEM_ADSP_BASE      MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE
  140. -#define MSM_PMEM_ADSP_SIZE      0x00C1B000
  141. -
  142. -#define MSM_PMEM_CAMERA_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  143. -#define MSM_PMEM_CAMERA_SIZE    0x00800000
  144. +#define MSM_PMEM_ADSP_SIZE      0x0141B000
  145.  
  146.  /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */
  147. -#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE
  148. +#define MSM_RAM_CONSOLE_BASE    MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE
  149.  #define MSM_RAM_CONSOLE_SIZE    128 * SZ_1K
  150.  
  151.  #define MARVELCT_GPIO_TO_INT(x)           (x+64) /* from gpio_to_irq */
  152. --
  153. 1.7.7

advertising

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will expire by default in one month. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

worth-right