API tools faq
paste
Advertisement
premi

omap3evm-h-incremental-patches

premi
Sep 23rd, 2011
99
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 42.40 KB | None | 0 0
raw download clone embed print report
  1. From 8541e8ab187be96f6b33f2d3a3424036544ae613 Mon Sep 17 00:00:00 2001
  2. From: Sanjeev Premi <premi@localhost>
  3. Date: Mon, 28 Mar 2011 20:33:18 +0530
  4. Subject: [PATCH 01/26] omap3evm: Reorder related config options
  5.  
  6. This patch brings related config options together.
  7. Most config options won't be evaluated for numerical
  8. value, but they are being set to 1. This patch also
  9. removes this assignment.
  10.  
  11. Some formatting changes were also done for consistent
  12. look-n-feel after the movement.
  13.  
  14. The patch doesn't make/include any other functional
  15. change.
  16.  
  17. Signed-off-by: Sanjeev Premi <premi@localhost>
  18. ---
  19. include/configs/omap3_evm.h |   17 ++++++-----------
  20.  1 files changed, 6 insertions(+), 11 deletions(-)
  21.  
  22. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  23. index ea51216..2887205 100644
  24. --- a/include/configs/omap3_evm.h
  25. +++ b/include/configs/omap3_evm.h
  26. @@ -41,11 +41,15 @@
  27.  #define CONFIG_OMAP3430        1   /* which is in a 3430 */
  28.  #define CONFIG_OMAP3_EVM   1   /* working with EVM */
  29.  
  30. -#define CONFIG_SDRC    /* The chip has SDRC controller */
  31. +#define CONFIG_SDRC            /* The chip has SDRC controller */
  32. +#define CONFIG_OMAP3_MICRON_DDR
  33. +#define CONFIG_TWL4030_POWER
  34.  
  35. -#include <asm/arch/cpu.h>  /* get chip and board defs */
  36. +#include <asm/arch/cpu.h>      /* get chip and board defs */
  37.  #include <asm/arch/omap3.h>
  38.  
  39. +#undef CONFIG_USE_IRQ          /* no support for IRQs */
  40. +
  41.  /*
  42.   * Display CPU and Board information
  43.   */
  44. @@ -56,7 +60,6 @@
  45.  #define V_OSCK         26000000    /* Clock output from T2 */
  46.  #define V_SCLK         (V_OSCK >> 1)
  47.  
  48. -#undef CONFIG_USE_IRQ          /* no support for IRQs */
  49.  #define CONFIG_MISC_INIT_R
  50.  
  51.  #define CONFIG_CMDLINE_TAG     1   /* enable passing of ATAGs */
  52. @@ -101,9 +104,6 @@
  53.  #define CONFIG_OMAP_HSMMC      1
  54.  #define CONFIG_DOS_PARTITION       1
  55.  
  56. -/* DDR - I use Micron DDR */
  57. -#define CONFIG_OMAP3_MICRON_DDR        1
  58. -
  59.  /* USB
  60.   * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
  61.   * Enable CONFIG_MUSB_UDD for Device functionalities.
  62. @@ -169,11 +169,6 @@
  63.  #define CONFIG_DRIVER_OMAP34XX_I2C 1
  64.  
  65.  /*
  66. - * TWL4030
  67. - */
  68. -#define CONFIG_TWL4030_POWER       1
  69. -
  70. -/*
  71.   * Board NAND Info.
  72.   */
  73.  #define CONFIG_SYS_NAND_ADDR       NAND_BASE   /* physical address */
  74. --
  75. 1.7.0.4
  76.  
  77. From 181a2c59ecfd6111db9cb61464d5b87be8999864 Mon Sep 17 00:00:00 2001
  78. From: Sanjeev Premi <premi@localhost>
  79. Date: Mon, 28 Mar 2011 21:13:21 +0530
  80. Subject: [PATCH 02/26] incremental delta
  81.  
  82. Signed-off-by: Sanjeev Premi <premi@localhost>
  83. ---
  84. include/configs/omap3_evm.h |   10 ++++++----
  85.  1 files changed, 6 insertions(+), 4 deletions(-)
  86.  
  87. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  88. index 2887205..f4761de 100644
  89. --- a/include/configs/omap3_evm.h
  90. +++ b/include/configs/omap3_evm.h
  91. @@ -51,15 +51,17 @@
  92.  #undef CONFIG_USE_IRQ          /* no support for IRQs */
  93.  
  94.  /*
  95. + * Clock related definitions
  96. + */
  97. +#define V_OSCK         26000000    /* Clock output from T2 */
  98. +#define V_SCLK         (V_OSCK >> 1)
  99. +
  100. +/*
  101.   * Display CPU and Board information
  102.   */
  103.  #define CONFIG_DISPLAY_CPUINFO     1
  104.  #define CONFIG_DISPLAY_BOARDINFO   1
  105.  
  106. -/* Clock Defines */
  107. -#define V_OSCK         26000000    /* Clock output from T2 */
  108. -#define V_SCLK         (V_OSCK >> 1)
  109. -
  110.  #define CONFIG_MISC_INIT_R
  111.  
  112.  #define CONFIG_CMDLINE_TAG     1   /* enable passing of ATAGs */
  113. --
  114. 1.7.0.4
  115.  
  116. From 1b6c2a14941a5f572ea6a72c789d9fe9cd8fb2f3 Mon Sep 17 00:00:00 2001
  117. From: Sanjeev Premi <premi@localhost>
  118. Date: Mon, 28 Mar 2011 21:14:11 +0530
  119. Subject: [PATCH 03/26] incremental delta
  120.  
  121. Signed-off-by: Sanjeev Premi <premi@localhost>
  122. ---
  123. include/configs/omap3_evm.h |   18 +++++++++---------
  124.  1 files changed, 9 insertions(+), 9 deletions(-)
  125.  
  126. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  127. index f4761de..79ce1cf 100644
  128. --- a/include/configs/omap3_evm.h
  129. +++ b/include/configs/omap3_evm.h
  130. @@ -57,6 +57,15 @@
  131.  #define V_SCLK         (V_OSCK >> 1)
  132.  
  133.  /*
  134. + * OMAP3 has 12 GP timers, they can be driven by the system clock
  135. + * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  136. + * This rate is divided by a local divisor.
  137. + */
  138. +#define CONFIG_SYS_TIMERBASE       OMAP34XX_GPT2
  139. +#define CONFIG_SYS_PTV         2   /* Divisor: 2^(PTV+1) => 8 */
  140. +#define CONFIG_SYS_HZ          1000
  141. +
  142. +/*
  143.   * Display CPU and Board information
  144.   */
  145.  #define CONFIG_DISPLAY_CPUINFO     1
  146. @@ -255,15 +264,6 @@
  147.  #define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0) /* default load */
  148.                                 /* address */
  149.  
  150. -/*
  151. - * OMAP3 has 12 GP timers, they can be driven by the system clock
  152. - * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  153. - * This rate is divided by a local divisor.
  154. - */
  155. -#define CONFIG_SYS_TIMERBASE       OMAP34XX_GPT2
  156. -#define CONFIG_SYS_PTV         2   /* Divisor: 2^(PTV+1) => 8 */
  157. -#define CONFIG_SYS_HZ          1000
  158. -
  159.  /*-----------------------------------------------------------------------
  160.   * Stack sizes
  161.   *
  162. --
  163. 1.7.0.4
  164.  
  165. From 5503e7f05bac5a6dc257c6e7f9b3d5f953b11c32 Mon Sep 17 00:00:00 2001
  166. From: Sanjeev Premi <premi@localhost>
  167. Date: Mon, 28 Mar 2011 21:14:58 +0530
  168. Subject: [PATCH 04/26] incremental delta
  169.  
  170. Signed-off-by: Sanjeev Premi <premi@localhost>
  171. ---
  172. include/configs/omap3_evm.h |   12 ++++++------
  173.  1 files changed, 6 insertions(+), 6 deletions(-)
  174.  
  175. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  176. index 79ce1cf..af8fb26 100644
  177. --- a/include/configs/omap3_evm.h
  178. +++ b/include/configs/omap3_evm.h
  179. @@ -66,6 +66,12 @@
  180.  #define CONFIG_SYS_HZ          1000
  181.  
  182.  /*
  183. + * Size of malloc() pool
  184. + */
  185. +#define CONFIG_ENV_SIZE            (128 << 10) /* 128 KiB */
  186. +                           /* Sector */
  187. +#define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + (128 << 10))
  188. +/*
  189.   * Display CPU and Board information
  190.   */
  191.  #define CONFIG_DISPLAY_CPUINFO     1
  192. @@ -79,12 +85,6 @@
  193.  #define CONFIG_REVISION_TAG        1
  194.  
  195.  /*
  196. - * Size of malloc() pool
  197. - */
  198. -#define CONFIG_ENV_SIZE            (128 << 10) /* 128 KiB */
  199. -                       /* Sector */
  200. -#define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + (128 << 10))
  201. -/*
  202.   * Hardware drivers
  203.   */
  204.  
  205. --
  206. 1.7.0.4
  207.  
  208. From f10e7cfd983711b34ab259ef9c6516ae1e858305 Mon Sep 17 00:00:00 2001
  209. From: Sanjeev Premi <premi@localhost>
  210. Date: Mon, 28 Mar 2011 21:16:13 +0530
  211. Subject: [PATCH 05/26] incremental delta
  212.  
  213. Signed-off-by: Sanjeev Premi <premi@localhost>
  214. ---
  215. include/configs/omap3_evm.h |   23 ++++++++++++-----------
  216.  1 files changed, 12 insertions(+), 11 deletions(-)
  217.  
  218. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  219. index af8fb26..2e1a647 100644
  220. --- a/include/configs/omap3_evm.h
  221. +++ b/include/configs/omap3_evm.h
  222. @@ -71,6 +71,18 @@
  223.  #define CONFIG_ENV_SIZE            (128 << 10) /* 128 KiB */
  224.                             /* Sector */
  225.  #define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + (128 << 10))
  226. +
  227. +/*
  228. + * Stack sizes
  229. + *
  230. + * The stack sizes are set up in start.S using the settings below
  231. + */
  232. +#define CONFIG_STACKSIZE   (128 << 10) /* regular stack 128 KiB */
  233. +#ifdef CONFIG_USE_IRQ
  234. +#define CONFIG_STACKSIZE_IRQ   (4 << 10)   /* IRQ stack 4 KiB */
  235. +#define CONFIG_STACKSIZE_FIQ   (4 << 10)   /* FIQ stack 4 KiB */
  236. +#endif
  237. +
  238.  /*
  239.   * Display CPU and Board information
  240.   */
  241. @@ -265,17 +277,6 @@
  242.                                 /* address */
  243.  
  244.  /*-----------------------------------------------------------------------
  245. - * Stack sizes
  246. - *
  247. - * The stack sizes are set up in start.S using the settings below
  248. - */
  249. -#define CONFIG_STACKSIZE   (128 << 10) /* regular stack 128 KiB */
  250. -#ifdef CONFIG_USE_IRQ
  251. -#define CONFIG_STACKSIZE_IRQ   (4 << 10)   /* IRQ stack 4 KiB */
  252. -#define CONFIG_STACKSIZE_FIQ   (4 << 10)   /* FIQ stack 4 KiB */
  253. -#endif
  254. -
  255. -/*-----------------------------------------------------------------------
  256.   * Physical Memory Map
  257.   */
  258.  #define CONFIG_NR_DRAM_BANKS   2   /* CS1 may or may not be populated */
  259. --
  260. 1.7.0.4
  261.  
  262. From 9452e5fdd0a73b71a2b88e006bd9661769a3fe70 Mon Sep 17 00:00:00 2001
  263. From: Sanjeev Premi <premi@localhost>
  264. Date: Mon, 28 Mar 2011 21:17:19 +0530
  265. Subject: [PATCH 06/26] incremental delta
  266.  
  267. Signed-off-by: Sanjeev Premi <premi@localhost>
  268. ---
  269. include/configs/omap3_evm.h |   18 ++++++++++--------
  270.  1 files changed, 10 insertions(+), 8 deletions(-)
  271.  
  272. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  273. index 2e1a647..4f78a92 100644
  274. --- a/include/configs/omap3_evm.h
  275. +++ b/include/configs/omap3_evm.h
  276. @@ -84,6 +84,16 @@
  277.  #endif
  278.  
  279.  /*
  280. + * Physical Memory Map
  281. + * Note 1: CS1 may or may not be populated
  282. + * Note 2: SDRAM size is expected to be at least 32MB
  283. + */
  284. +#define CONFIG_NR_DRAM_BANKS       2
  285. +#define PHYS_SDRAM_1           OMAP34XX_SDRC_CS0
  286. +#define PHYS_SDRAM_1_SIZE      (32 << 20)
  287. +#define PHYS_SDRAM_2           OMAP34XX_SDRC_CS1
  288. +
  289. +/*
  290.   * Display CPU and Board information
  291.   */
  292.  #define CONFIG_DISPLAY_CPUINFO     1
  293. @@ -276,14 +286,6 @@
  294.  #define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0) /* default load */
  295.                                 /* address */
  296.  
  297. -/*-----------------------------------------------------------------------
  298. - * Physical Memory Map
  299. - */
  300. -#define CONFIG_NR_DRAM_BANKS   2   /* CS1 may or may not be populated */
  301. -#define PHYS_SDRAM_1       OMAP34XX_SDRC_CS0
  302. -#define PHYS_SDRAM_1_SIZE  (32 << 20)  /* at least 32 MiB */
  303. -#define PHYS_SDRAM_2       OMAP34XX_SDRC_CS1
  304. -
  305.  /* SDRAM Bank Allocation method */
  306.  #define SDRC_R_B_C     1
  307.  
  308. --
  309. 1.7.0.4
  310.  
  311. From d0364733a5f4add19b49f99ed372ef72b213dfbf Mon Sep 17 00:00:00 2001
  312. From: Sanjeev Premi <premi@localhost>
  313. Date: Mon, 28 Mar 2011 21:19:39 +0530
  314. Subject: [PATCH 07/26] incremental delta
  315.  
  316. Signed-off-by: Sanjeev Premi <premi@localhost>
  317. ---
  318. include/configs/omap3_evm.h |   18 ++++++++++--------
  319.  1 files changed, 10 insertions(+), 8 deletions(-)
  320.  
  321. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  322. index 4f78a92..644f0b9 100644
  323. --- a/include/configs/omap3_evm.h
  324. +++ b/include/configs/omap3_evm.h
  325. @@ -93,6 +93,16 @@
  326.  #define PHYS_SDRAM_1_SIZE      (32 << 20)
  327.  #define PHYS_SDRAM_2           OMAP34XX_SDRC_CS1
  328.  
  329. +/* Limits for memtest */
  330. +#define CONFIG_SYS_MEMTEST_START   (OMAP34XX_SDRC_CS0)
  331. +#define CONFIG_SYS_MEMTEST_END     (OMAP34XX_SDRC_CS0 + \
  332. +                       0x01F00000) /* 31MB */
  333. +
  334. +/*
  335. + * SDRAM Bank Allocation method
  336. + */
  337. +#define SDRC_R_B_C         1
  338. +
  339.  /*
  340.   * Display CPU and Board information
  341.   */
  342. @@ -278,17 +288,9 @@
  343.                         /* args */
  344.  /* Boot Argument Buffer Size */
  345.  #define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  346. -/* memtest works on */
  347. -#define CONFIG_SYS_MEMTEST_START   (OMAP34XX_SDRC_CS0)
  348. -#define CONFIG_SYS_MEMTEST_END     (OMAP34XX_SDRC_CS0 + \
  349. -                   0x01F00000) /* 31MB */
  350.  
  351.  #define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0) /* default load */
  352.                                 /* address */
  353. -
  354. -/* SDRAM Bank Allocation method */
  355. -#define SDRC_R_B_C     1
  356. -
  357.  /*-----------------------------------------------------------------------
  358.   * FLASH and environment organization
  359.   */
  360. --
  361. 1.7.0.4
  362.  
  363. From fc9624a55c3e88997977ebc98a0aba5b28ab88c9 Mon Sep 17 00:00:00 2001
  364. From: Sanjeev Premi <premi@localhost>
  365. Date: Thu, 22 Sep 2011 21:18:04 +0530
  366. Subject: [PATCH 08/26] incremental delta
  367.  
  368. Signed-off-by: Sanjeev Premi <premi@localhost>
  369. ---
  370. include/configs/omap3_evm.h |    8 +++-----
  371.  1 files changed, 3 insertions(+), 5 deletions(-)
  372.  
  373. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  374. index 644f0b9..0563b3a 100644
  375. --- a/include/configs/omap3_evm.h
  376. +++ b/include/configs/omap3_evm.h
  377. @@ -93,17 +93,15 @@
  378.  #define PHYS_SDRAM_1_SIZE      (32 << 20)
  379.  #define PHYS_SDRAM_2           OMAP34XX_SDRC_CS1
  380.  
  381. +/* SDRAM Bank Allocation method */
  382. +#define SDRC_R_B_C
  383. +
  384.  /* Limits for memtest */
  385.  #define CONFIG_SYS_MEMTEST_START   (OMAP34XX_SDRC_CS0)
  386.  #define CONFIG_SYS_MEMTEST_END     (OMAP34XX_SDRC_CS0 + \
  387.                         0x01F00000) /* 31MB */
  388.  
  389.  /*
  390. - * SDRAM Bank Allocation method
  391. - */
  392. -#define SDRC_R_B_C         1
  393. -
  394. -/*
  395.   * Display CPU and Board information
  396.   */
  397.  #define CONFIG_DISPLAY_CPUINFO     1
  398. --
  399. 1.7.0.4
  400.  
  401. From 72ee8d3417f2a997e937f52326344ef28142aae0 Mon Sep 17 00:00:00 2001
  402. From: Sanjeev Premi <premi@localhost>
  403. Date: Mon, 28 Mar 2011 21:20:24 +0530
  404. Subject: [PATCH 09/26] incremental delta
  405.  
  406. Signed-off-by: Sanjeev Premi <premi@localhost>
  407. ---
  408. include/configs/omap3_evm.h |    5 +++--
  409.  1 files changed, 3 insertions(+), 2 deletions(-)
  410.  
  411. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  412. index 0563b3a..c94e7e9 100644
  413. --- a/include/configs/omap3_evm.h
  414. +++ b/include/configs/omap3_evm.h
  415. @@ -101,6 +101,9 @@
  416.  #define CONFIG_SYS_MEMTEST_END     (OMAP34XX_SDRC_CS0 + \
  417.                         0x01F00000) /* 31MB */
  418.  
  419. +/* Default load address */
  420. +#define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0)
  421. +
  422.  /*
  423.   * Display CPU and Board information
  424.   */
  425. @@ -287,8 +290,6 @@
  426.  /* Boot Argument Buffer Size */
  427.  #define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  428.  
  429. -#define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0) /* default load */
  430. -                               /* address */
  431.  /*-----------------------------------------------------------------------
  432.   * FLASH and environment organization
  433.   */
  434. --
  435. 1.7.0.4
  436.  
  437. From e87c4ea58ebd4e44598d8ef987901ae4fb58d009 Mon Sep 17 00:00:00 2001
  438. From: Sanjeev Premi <premi@localhost>
  439. Date: Mon, 28 Mar 2011 21:24:08 +0530
  440. Subject: [PATCH 10/26] incremental delta
  441.  
  442. Signed-off-by: Sanjeev Premi <premi@localhost>
  443. ---
  444. include/configs/omap3_evm.h |   38 ++++++++++++++++++++------------------
  445.  1 files changed, 20 insertions(+), 18 deletions(-)
  446.  
  447. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  448. index c94e7e9..228afbf 100644
  449. --- a/include/configs/omap3_evm.h
  450. +++ b/include/configs/omap3_evm.h
  451. @@ -104,21 +104,9 @@
  452.  /* Default load address */
  453.  #define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0)
  454.  
  455. -/*
  456. - * Display CPU and Board information
  457. - */
  458. -#define CONFIG_DISPLAY_CPUINFO     1
  459. -#define CONFIG_DISPLAY_BOARDINFO   1
  460. -
  461. -#define CONFIG_MISC_INIT_R
  462. -
  463. -#define CONFIG_CMDLINE_TAG     1   /* enable passing of ATAGs */
  464. -#define CONFIG_SETUP_MEMORY_TAGS   1
  465. -#define CONFIG_INITRD_TAG      1
  466. -#define CONFIG_REVISION_TAG        1
  467. -
  468. -/*
  469. +/* -----------------------------------------------------------------------------
  470.   * Hardware drivers
  471. + * -----------------------------------------------------------------------------
  472.   */
  473.  
  474.  /*
  475. @@ -135,14 +123,28 @@
  476.   * select serial console configuration
  477.   */
  478.  #define CONFIG_CONS_INDEX      1
  479. -#define CONFIG_SYS_NS16550_COM1        OMAP34XX_UART1
  480.  #define CONFIG_SERIAL1         1   /* UART1 on OMAP3 EVM */
  481. -
  482. -/* allow to overwrite serial and ethaddr */
  483. -#define CONFIG_ENV_OVERWRITE
  484. +#define CONFIG_SYS_NS16550_COM1        OMAP34XX_UART1
  485.  #define CONFIG_BAUDRATE            115200
  486.  #define CONFIG_SYS_BAUDRATE_TABLE  {4800, 9600, 19200, 38400, 57600,\
  487.                     115200}
  488. +
  489. +/*
  490. + * Display CPU and Board information
  491. + */
  492. +#define CONFIG_DISPLAY_CPUINFO
  493. +#define CONFIG_DISPLAY_BOARDINFO
  494. +
  495. +#define CONFIG_MISC_INIT_R
  496. +
  497. +#define CONFIG_CMDLINE_TAG         /* enable passing of ATAGs */
  498. +#define CONFIG_SETUP_MEMORY_TAGS
  499. +#define CONFIG_INITRD_TAG
  500. +#define CONFIG_REVISION_TAG
  501. +
  502. +
  503. +/* allow to overwrite serial and ethaddr */
  504. +#define CONFIG_ENV_OVERWRITE
  505.  #define CONFIG_MMC         1
  506.  #define CONFIG_GENERIC_MMC     1
  507.  #define CONFIG_OMAP_HSMMC      1
  508. --
  509. 1.7.0.4
  510.  
  511. From 0218d68f185f45c91093e1d49bdce8cc9e8e1a3b Mon Sep 17 00:00:00 2001
  512. From: Sanjeev Premi <premi@localhost>
  513. Date: Mon, 28 Mar 2011 21:26:18 +0530
  514. Subject: [PATCH 11/26] incremental delta
  515.  
  516. Signed-off-by: Sanjeev Premi <premi@localhost>
  517. ---
  518. include/configs/omap3_evm.h |   38 ++++++++++++++++++++++++++------------
  519.  1 files changed, 26 insertions(+), 12 deletions(-)
  520.  
  521. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  522. index 228afbf..99e978b 100644
  523. --- a/include/configs/omap3_evm.h
  524. +++ b/include/configs/omap3_evm.h
  525. @@ -130,6 +130,32 @@
  526.                     115200}
  527.  
  528.  /*
  529. + * Size of Console IO Buffer
  530. + */
  531. +#define CONFIG_SYS_CBSIZE      512
  532. +
  533. +/*
  534. + * Size of print buffer
  535. + */
  536. +#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
  537. +                       sizeof(CONFIG_SYS_PROMPT) + 16)
  538. +
  539. +/*
  540. + * Size of bootarg buffer
  541. + */
  542. +#define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  543. +
  544. +/*
  545. + * I2C
  546. + */
  547. +#define CONFIG_HARD_I2C
  548. +#define CONFIG_SYS_I2C_SPEED       100000
  549. +#define CONFIG_SYS_I2C_SLAVE       1
  550. +#define CONFIG_SYS_I2C_BUS     0
  551. +#define CONFIG_SYS_I2C_BUS_SELECT  1
  552. +#define CONFIG_DRIVER_OMAP34XX_I2C 1
  553. +
  554. +/*
  555.   * Display CPU and Board information
  556.   */
  557.  #define CONFIG_DISPLAY_CPUINFO
  558. @@ -207,12 +233,6 @@
  559.  #undef CONFIG_CMD_IMLS     /* List all found images    */
  560.  
  561.  #define CONFIG_SYS_NO_FLASH
  562. -#define CONFIG_HARD_I2C            1
  563. -#define CONFIG_SYS_I2C_SPEED       100000
  564. -#define CONFIG_SYS_I2C_SLAVE       1
  565. -#define CONFIG_SYS_I2C_BUS     0
  566. -#define CONFIG_SYS_I2C_BUS_SELECT  1
  567. -#define CONFIG_DRIVER_OMAP34XX_I2C 1
  568.  
  569.  /*
  570.   * Board NAND Info.
  571. @@ -283,14 +303,8 @@
  572.  #define CONFIG_SYS_HUSH_PARSER     /* use "hush" command parser */
  573.  #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
  574.  #define CONFIG_SYS_PROMPT      "OMAP3_EVM # "
  575. -#define CONFIG_SYS_CBSIZE      512 /* Console I/O Buffer Size */
  576. -/* Print Buffer Size */
  577. -#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
  578. -                   sizeof(CONFIG_SYS_PROMPT) + 16)
  579.  #define CONFIG_SYS_MAXARGS     16  /* max number of command */
  580.                         /* args */
  581. -/* Boot Argument Buffer Size */
  582. -#define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  583.  
  584.  /*-----------------------------------------------------------------------
  585.   * FLASH and environment organization
  586. --
  587. 1.7.0.4
  588.  
  589. From 3315f228eb9089efa45979243f6d982d7c8a7e61 Mon Sep 17 00:00:00 2001
  590. From: Sanjeev Premi <premi@localhost>
  591. Date: Wed, 22 Jun 2011 21:34:25 +0530
  592. Subject: [PATCH 12/26] incremental delta
  593.  
  594. Signed-off-by: Sanjeev Premi <premi@localhost>
  595. ---
  596. include/configs/omap3_evm.h |   47 ++++++++++++++++++++++---------------------
  597.  1 files changed, 24 insertions(+), 23 deletions(-)
  598.  
  599. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  600. index 99e978b..9f8103d 100644
  601. --- a/include/configs/omap3_evm.h
  602. +++ b/include/configs/omap3_evm.h
  603. @@ -156,6 +156,30 @@
  604.  #define CONFIG_DRIVER_OMAP34XX_I2C 1
  605.  
  606.  /*
  607. + * PISMO support
  608. + */
  609. +#define PISMO1_NAND_SIZE       GPMC_SIZE_128M
  610. +#define PISMO1_ONEN_SIZE       GPMC_SIZE_128M
  611. +
  612. +#if defined(CONFIG_CMD_NAND)
  613. +#define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  614. +#elif defined(CONFIG_CMD_ONENAND)
  615. +#define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  616. +#endif
  617. +
  618. +/* Monitor at start of flash - Reserve 2 sectors */
  619. +#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
  620. +#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  621. +
  622. +#define CONFIG_SYS_MONITOR_LEN     (256 << 10)
  623. +
  624. +/* Start location & size of environment */
  625. +#define ONENAND_ENV_OFFSET     0x260000
  626. +#define SMNAND_ENV_OFFSET      0x260000
  627. +
  628. +#define CONFIG_SYS_ENV_SECT_SIZE   (128 << 10) /* 128 KiB */
  629. +
  630. +/*
  631.   * Display CPU and Board information
  632.   */
  633.  #define CONFIG_DISPLAY_CPUINFO
  634. @@ -309,28 +333,6 @@
  635.  /*-----------------------------------------------------------------------
  636.   * FLASH and environment organization
  637.   */
  638. -
  639. -/* **** PISMO SUPPORT *** */
  640. -
  641. -/* Configure the PISMO */
  642. -#define PISMO1_NAND_SIZE       GPMC_SIZE_128M
  643. -#define PISMO1_ONEN_SIZE       GPMC_SIZE_128M
  644. -
  645. -#define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 2 sectors */
  646. -
  647. -#if defined(CONFIG_CMD_NAND)
  648. -#define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  649. -#elif defined(CONFIG_CMD_ONENAND)
  650. -#define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  651. -#endif
  652. -
  653. -/* Monitor at start of flash */
  654. -#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
  655. -#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  656. -
  657. -#define ONENAND_ENV_OFFSET     0x260000 /* environment starts here */
  658. -#define SMNAND_ENV_OFFSET      0x260000 /* environment starts here */
  659. -
  660.  #if defined(CONFIG_CMD_NAND)
  661.  #define CONFIG_NAND_OMAP_GPMC
  662.  #define GPMC_NAND_ECC_LP_x16_LAYOUT    1
  663. @@ -341,7 +343,6 @@
  664.  #define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  665.  #endif
  666.  
  667. -#define CONFIG_SYS_ENV_SECT_SIZE   (128 << 10) /* 128 KiB */
  668.  #define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  669.  
  670.  /*
  671. --
  672. 1.7.0.4
  673.  
  674. From c6de16c1da3cacca5feb888ecd4922e8bc379102 Mon Sep 17 00:00:00 2001
  675. From: Sanjeev Premi <premi@localhost>
  676. Date: Wed, 22 Jun 2011 23:51:23 +0530
  677. Subject: [PATCH 13/26] incremental delta
  678.  
  679. Signed-off-by: Sanjeev Premi <premi@localhost>
  680. ---
  681. include/configs/omap3_evm.h |   54 +++++++++++++++++++++++++++----------------
  682.  1 files changed, 34 insertions(+), 20 deletions(-)
  683.  
  684. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  685. index 9f8103d..f10ff05 100644
  686. --- a/include/configs/omap3_evm.h
  687. +++ b/include/configs/omap3_evm.h
  688. @@ -180,6 +180,40 @@
  689.  #define CONFIG_SYS_ENV_SECT_SIZE   (128 << 10) /* 128 KiB */
  690.  
  691.  /*
  692. + * NAND
  693. + */
  694. +/* Physical address to access NAND */
  695. +#define CONFIG_SYS_NAND_ADDR       NAND_BASE
  696. +
  697. +/* Physical address to access NAND at CS0 */
  698. +#define CONFIG_SYS_NAND_BASE       NAND_BASE
  699. +
  700. +/* Max number of NAND devices */
  701. +#define CONFIG_SYS_MAX_NAND_DEVICE 1
  702. +
  703. +/* Timeout values (in ticks) */
  704. +#define CONFIG_SYS_FLASH_ERASE_TOUT    (100 * CONFIG_SYS_HZ)
  705. +#define CONFIG_SYS_FLASH_WRITE_TOUT    (100 * CONFIG_SYS_HZ)
  706. +
  707. +/* Flash banks JFFS2 should use */
  708. +#define CONFIG_SYS_MAX_MTD_BANKS   (CONFIG_SYS_MAX_FLASH_BANKS + \
  709. +                       CONFIG_SYS_MAX_NAND_DEVICE)
  710. +
  711. +#define CONFIG_SYS_JFFS2_MEM_NAND
  712. +#define CONFIG_SYS_JFFS2_FIRST_BANK    CONFIG_SYS_MAX_FLASH_BANKS
  713. +#define CONFIG_SYS_JFFS2_NUM_BANKS 1
  714. +
  715. +#define CONFIG_JFFS2_NAND
  716. +/* nand device jffs2 lives on */
  717. +#define CONFIG_JFFS2_DEV       "nand0"
  718. +/* Start of jffs2 partition */
  719. +#define CONFIG_JFFS2_PART_OFFSET   0x680000
  720. +/* Size of jffs2 partition */
  721. +#define CONFIG_JFFS2_PART_SIZE     0xf980000
  722. +
  723. +#define CONFIG_SYS_NO_FLASH
  724. +
  725. +/*
  726.   * Display CPU and Board information
  727.   */
  728.  #define CONFIG_DISPLAY_CPUINFO
  729. @@ -256,26 +290,6 @@
  730.  #undef CONFIG_CMD_IMI      /* iminfo           */
  731.  #undef CONFIG_CMD_IMLS     /* List all found images    */
  732.  
  733. -#define CONFIG_SYS_NO_FLASH
  734. -
  735. -/*
  736. - * Board NAND Info.
  737. - */
  738. -#define CONFIG_SYS_NAND_ADDR       NAND_BASE   /* physical address */
  739. -                           /* to access nand */
  740. -#define CONFIG_SYS_NAND_BASE       NAND_BASE   /* physical address */
  741. -                           /* to access */
  742. -                           /* nand at CS0 */
  743. -
  744. -#define CONFIG_SYS_MAX_NAND_DEVICE 1       /* Max number of */
  745. -                           /* NAND devices */
  746. -#define CONFIG_JFFS2_NAND
  747. -/* nand device jffs2 lives on */
  748. -#define CONFIG_JFFS2_DEV       "nand0"
  749. -/* start of jffs2 partition */
  750. -#define CONFIG_JFFS2_PART_OFFSET   0x680000
  751. -#define CONFIG_JFFS2_PART_SIZE     0xf980000   /* sz of jffs2 part */
  752. -
  753.  /* Environment information */
  754.  #define CONFIG_BOOTDELAY   10
  755.  
  756. --
  757. 1.7.0.4
  758.  
  759. From fcb5732c3ab4f2bd83762a76bd8c8c962d6f3cee Mon Sep 17 00:00:00 2001
  760. From: Sanjeev Premi <premi@localhost>
  761. Date: Mon, 28 Mar 2011 21:33:44 +0530
  762. Subject: [PATCH 14/26] incremental delta
  763.  
  764. Signed-off-by: Sanjeev Premi <premi@localhost>
  765. ---
  766. include/configs/omap3_evm.h |   12 ++++++++----
  767.  1 files changed, 8 insertions(+), 4 deletions(-)
  768.  
  769. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  770. index f10ff05..4ecad9f 100644
  771. --- a/include/configs/omap3_evm.h
  772. +++ b/include/configs/omap3_evm.h
  773. @@ -214,6 +214,14 @@
  774.  #define CONFIG_SYS_NO_FLASH
  775.  
  776.  /*
  777. + * MMC
  778. + */
  779. +#define CONFIG_MMC
  780. +#define CONFIG_GENERIC_MMC
  781. +#define CONFIG_OMAP_HSMMC
  782. +#define CONFIG_DOS_PARTITION
  783. +
  784. +/*
  785.   * Display CPU and Board information
  786.   */
  787.  #define CONFIG_DISPLAY_CPUINFO
  788. @@ -229,10 +237,6 @@
  789.  
  790.  /* allow to overwrite serial and ethaddr */
  791.  #define CONFIG_ENV_OVERWRITE
  792. -#define CONFIG_MMC         1
  793. -#define CONFIG_GENERIC_MMC     1
  794. -#define CONFIG_OMAP_HSMMC      1
  795. -#define CONFIG_DOS_PARTITION       1
  796.  
  797.  /* USB
  798.   * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
  799. --
  800. 1.7.0.4
  801.  
  802. From 4c8f967470a5081ab04f5751a39e601678d0efe2 Mon Sep 17 00:00:00 2001
  803. From: Sanjeev Premi <premi@localhost>
  804. Date: Mon, 28 Mar 2011 21:35:34 +0530
  805. Subject: [PATCH 15/26] incremental delta
  806.  
  807. Signed-off-by: Sanjeev Premi <premi@localhost>
  808. ---
  809. include/configs/omap3_evm.h |   36 ++++++++++++++++++------------------
  810.  1 files changed, 18 insertions(+), 18 deletions(-)
  811.  
  812. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  813. index 4ecad9f..776e25b 100644
  814. --- a/include/configs/omap3_evm.h
  815. +++ b/include/configs/omap3_evm.h
  816. @@ -221,24 +221,8 @@
  817.  #define CONFIG_OMAP_HSMMC
  818.  #define CONFIG_DOS_PARTITION
  819.  
  820. -/*
  821. - * Display CPU and Board information
  822. - */
  823. -#define CONFIG_DISPLAY_CPUINFO
  824. -#define CONFIG_DISPLAY_BOARDINFO
  825. -
  826. -#define CONFIG_MISC_INIT_R
  827. -
  828. -#define CONFIG_CMDLINE_TAG         /* enable passing of ATAGs */
  829. -#define CONFIG_SETUP_MEMORY_TAGS
  830. -#define CONFIG_INITRD_TAG
  831. -#define CONFIG_REVISION_TAG
  832. -
  833. -
  834. -/* allow to overwrite serial and ethaddr */
  835. -#define CONFIG_ENV_OVERWRITE
  836. -
  837.  /* USB
  838. + *
  839.   * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
  840.   * Enable CONFIG_MUSB_UDD for Device functionalities.
  841.   */
  842. @@ -257,7 +241,7 @@
  843.  
  844.  #ifdef CONFIG_USB_KEYBOARD
  845.  #define CONFIG_SYS_USB_EVENT_POLL
  846. -#define CONFIG_PREBOOT "usb start"
  847. +#define CONFIG_PREBOOT         "usb start"
  848.  #endif /* CONFIG_USB_KEYBOARD */
  849.  
  850.  #endif /* CONFIG_MUSB_HCD */
  851. @@ -276,6 +260,22 @@
  852.  
  853.  #endif /* CONFIG_USB_OMAP3 */
  854.  
  855. +/*
  856. + * Display CPU and Board information
  857. + */
  858. +#define CONFIG_DISPLAY_CPUINFO
  859. +#define CONFIG_DISPLAY_BOARDINFO
  860. +
  861. +#define CONFIG_MISC_INIT_R
  862. +
  863. +#define CONFIG_CMDLINE_TAG         /* enable passing of ATAGs */
  864. +#define CONFIG_SETUP_MEMORY_TAGS
  865. +#define CONFIG_INITRD_TAG
  866. +#define CONFIG_REVISION_TAG
  867. +
  868. +/* allow to overwrite serial and ethaddr */
  869. +#define CONFIG_ENV_OVERWRITE
  870. +
  871.  /* commands to include */
  872.  #include <config_cmd_default.h>
  873.  
  874. --
  875. 1.7.0.4
  876.  
  877. From 9feea605e4354a7f7fb175ba9b1d3bd3d6d446b6 Mon Sep 17 00:00:00 2001
  878. From: Sanjeev Premi <premi@localhost>
  879. Date: Mon, 28 Mar 2011 21:39:34 +0530
  880. Subject: [PATCH 16/26] incremental delta
  881.  
  882. Signed-off-by: Sanjeev Premi <premi@localhost>
  883. ---
  884. include/configs/omap3_evm.h |   30 +++++++++++++++---------------
  885.  1 files changed, 15 insertions(+), 15 deletions(-)
  886.  
  887. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  888. index 776e25b..9fff856 100644
  889. --- a/include/configs/omap3_evm.h
  890. +++ b/include/configs/omap3_evm.h
  891. @@ -260,9 +260,17 @@
  892.  
  893.  #endif /* CONFIG_USB_OMAP3 */
  894.  
  895. -/*
  896. - * Display CPU and Board information
  897. +/* ----------------------------------------------------------------------------
  898. + * U-boot features
  899. + * ----------------------------------------------------------------------------
  900.   */
  901. +#define CONFIG_SYS_LONGHELP
  902. +#define CONFIG_SYS_HUSH_PARSER
  903. +#define CONFIG_SYS_PROMPT      "OMAP3_EVM # "
  904. +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
  905. +#define CONFIG_SYS_MAXARGS     16  /* max args for a command */
  906. +
  907. +/* Display CPU and Board information */
  908.  #define CONFIG_DISPLAY_CPUINFO
  909.  #define CONFIG_DISPLAY_BOARDINFO
  910.  
  911. @@ -273,10 +281,13 @@
  912.  #define CONFIG_INITRD_TAG
  913.  #define CONFIG_REVISION_TAG
  914.  
  915. -/* allow to overwrite serial and ethaddr */
  916. +/* Allow to overwrite serial and ethaddr */
  917.  #define CONFIG_ENV_OVERWRITE
  918.  
  919. -/* commands to include */
  920. +/* Add auto-completion support */
  921. +#define CONFIG_AUTO_COMPLETE
  922. +
  923. +/* Default commands to include */
  924.  #include <config_cmd_default.h>
  925.  
  926.  #define CONFIG_CMD_EXT2        /* EXT2 Support         */
  927. @@ -337,17 +348,6 @@
  928.         "fi; " \
  929.     "else run nandboot; fi"
  930.  
  931. -#define CONFIG_AUTO_COMPLETE   1
  932. -/*
  933. - * Miscellaneous configurable options
  934. - */
  935. -#define CONFIG_SYS_LONGHELP        /* undef to save memory */
  936. -#define CONFIG_SYS_HUSH_PARSER     /* use "hush" command parser */
  937. -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
  938. -#define CONFIG_SYS_PROMPT      "OMAP3_EVM # "
  939. -#define CONFIG_SYS_MAXARGS     16  /* max number of command */
  940. -                       /* args */
  941. -
  942.  /*-----------------------------------------------------------------------
  943.   * FLASH and environment organization
  944.   */
  945. --
  946. 1.7.0.4
  947.  
  948. From 6e1dca33100ee2bbbc5d833d489805ab37fc5049 Mon Sep 17 00:00:00 2001
  949. From: Sanjeev Premi <premi@localhost>
  950. Date: Mon, 28 Mar 2011 21:42:33 +0530
  951. Subject: [PATCH 17/26] incremental delta
  952.  
  953. Signed-off-by: Sanjeev Premi <premi@localhost>
  954. ---
  955. include/configs/omap3_evm.h |   26 ++++++++++----------------
  956.  1 files changed, 10 insertions(+), 16 deletions(-)
  957.  
  958. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  959. index 9fff856..82e9702 100644
  960. --- a/include/configs/omap3_evm.h
  961. +++ b/include/configs/omap3_evm.h
  962. @@ -130,22 +130,6 @@
  963.                     115200}
  964.  
  965.  /*
  966. - * Size of Console IO Buffer
  967. - */
  968. -#define CONFIG_SYS_CBSIZE      512
  969. -
  970. -/*
  971. - * Size of print buffer
  972. - */
  973. -#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
  974. -                       sizeof(CONFIG_SYS_PROMPT) + 16)
  975. -
  976. -/*
  977. - * Size of bootarg buffer
  978. - */
  979. -#define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  980. -
  981. -/*
  982.   * I2C
  983.   */
  984.  #define CONFIG_HARD_I2C
  985. @@ -287,6 +271,16 @@
  986.  /* Add auto-completion support */
  987.  #define CONFIG_AUTO_COMPLETE
  988.  
  989. +/* Size of Console IO buffer */
  990. +#define CONFIG_SYS_CBSIZE      512
  991. +
  992. +/* Size of print buffer */
  993. +#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
  994. +                       sizeof(CONFIG_SYS_PROMPT) + 16)
  995. +
  996. +/* Size of bootarg buffer */
  997. +#define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  998. +
  999.  /* Default commands to include */
  1000.  #include <config_cmd_default.h>
  1001.  
  1002. --
  1003. 1.7.0.4
  1004.  
  1005. From 2d21de12c14e42ba5cd3503ffe2897f95f8c63e7 Mon Sep 17 00:00:00 2001
  1006. From: Sanjeev Premi <premi@localhost>
  1007. Date: Thu, 23 Jun 2011 00:19:51 +0530
  1008. Subject: [PATCH 18/26] incremental delta
  1009.  
  1010. Signed-off-by: Sanjeev Premi <premi@localhost>
  1011. ---
  1012. include/configs/omap3_evm.h |   31 ++++++++++++++++---------------
  1013.  1 files changed, 16 insertions(+), 15 deletions(-)
  1014.  
  1015. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1016. index 82e9702..c3ea4cf 100644
  1017. --- a/include/configs/omap3_evm.h
  1018. +++ b/include/configs/omap3_evm.h
  1019. @@ -299,6 +299,22 @@
  1020.  #undef CONFIG_CMD_IMI      /* iminfo           */
  1021.  #undef CONFIG_CMD_IMLS     /* List all found images    */
  1022.  
  1023. +/*
  1024. + * Additional definitions that depend on chosen commands
  1025. + */
  1026. +/* NAND */
  1027. +#if defined(CONFIG_CMD_NAND)
  1028. +#define CONFIG_NAND_OMAP_GPMC
  1029. +#define GPMC_NAND_ECC_LP_x16_LAYOUT    1
  1030. +#define CONFIG_ENV_IS_IN_NAND
  1031. +#define CONFIG_ENV_OFFSET      SMNAND_ENV_OFFSET
  1032. +#elif defined(CONFIG_CMD_ONENAND)
  1033. +#define CONFIG_ENV_IS_IN_ONENAND   1
  1034. +#define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  1035. +#endif
  1036. +
  1037. +#define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  1038. +
  1039.  /* Environment information */
  1040.  #define CONFIG_BOOTDELAY   10
  1041.  
  1042. @@ -342,21 +358,6 @@
  1043.         "fi; " \
  1044.     "else run nandboot; fi"
  1045.  
  1046. -/*-----------------------------------------------------------------------
  1047. - * FLASH and environment organization
  1048. - */
  1049. -#if defined(CONFIG_CMD_NAND)
  1050. -#define CONFIG_NAND_OMAP_GPMC
  1051. -#define GPMC_NAND_ECC_LP_x16_LAYOUT    1
  1052. -#define CONFIG_ENV_IS_IN_NAND
  1053. -#define CONFIG_ENV_OFFSET      SMNAND_ENV_OFFSET
  1054. -#elif defined(CONFIG_CMD_ONENAND)
  1055. -#define CONFIG_ENV_IS_IN_ONENAND   1
  1056. -#define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  1057. -#endif
  1058. -
  1059. -#define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  1060. -
  1061.  /*
  1062.   * Support for relocation
  1063.   */
  1064. --
  1065. 1.7.0.4
  1066.  
  1067. From 3c404891b92f5717953c3e3f4cd1aed8d8d7a561 Mon Sep 17 00:00:00 2001
  1068. From: Sanjeev Premi <premi@localhost>
  1069. Date: Thu, 23 Jun 2011 00:24:56 +0530
  1070. Subject: [PATCH 19/26] incremental delta
  1071.  
  1072. Signed-off-by: Sanjeev Premi <premi@localhost>
  1073. ---
  1074. include/configs/omap3_evm.h |   38 ++++++++++++++++----------------------
  1075.  1 files changed, 16 insertions(+), 22 deletions(-)
  1076.  
  1077. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1078. index c3ea4cf..7ab35f6 100644
  1079. --- a/include/configs/omap3_evm.h
  1080. +++ b/include/configs/omap3_evm.h
  1081. @@ -315,6 +315,22 @@
  1082.  
  1083.  #define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  1084.  
  1085. +/* Ethernet (SMSC9115 from SMSC9118 family) */
  1086. +#if defined(CONFIG_CMD_NET)
  1087. +
  1088. +#define CONFIG_NET_MULTI
  1089. +#define CONFIG_SMC911X
  1090. +#define CONFIG_SMC911X_32_BIT
  1091. +#define CONFIG_SMC911X_BASE    0x2C000000
  1092. +
  1093. +/* BOOTP fields */
  1094. +#define CONFIG_BOOTP_SUBNETMASK        0x00000001
  1095. +#define CONFIG_BOOTP_GATEWAY       0x00000002
  1096. +#define CONFIG_BOOTP_HOSTNAME      0x00000004
  1097. +#define CONFIG_BOOTP_BOOTPATH      0x00000010
  1098. +
  1099. +#endif /* CONFIG_CMD_NET */
  1100. +
  1101.  /* Environment information */
  1102.  #define CONFIG_BOOTDELAY   10
  1103.  
  1104. @@ -373,26 +389,4 @@
  1105.   */
  1106.  /* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
  1107.  
  1108. -/*----------------------------------------------------------------------------
  1109. - * SMSC9115 Ethernet from SMSC9118 family
  1110. - *----------------------------------------------------------------------------
  1111. - */
  1112. -#if defined(CONFIG_CMD_NET)
  1113. -
  1114. -#define CONFIG_NET_MULTI
  1115. -#define CONFIG_SMC911X
  1116. -#define CONFIG_SMC911X_32_BIT
  1117. -#define CONFIG_SMC911X_BASE    0x2C000000
  1118. -
  1119. -#endif /* (CONFIG_CMD_NET) */
  1120. -
  1121. -/*
  1122. - * BOOTP fields
  1123. - */
  1124. -
  1125. -#define CONFIG_BOOTP_SUBNETMASK        0x00000001
  1126. -#define CONFIG_BOOTP_GATEWAY       0x00000002
  1127. -#define CONFIG_BOOTP_HOSTNAME      0x00000004
  1128. -#define CONFIG_BOOTP_BOOTPATH      0x00000010
  1129. -
  1130.  #endif /* __CONFIG_H */
  1131. --
  1132. 1.7.0.4
  1133.  
  1134. From 5a5bd5927f412a595195d8cd8d9ca4dc48aaf373 Mon Sep 17 00:00:00 2001
  1135. From: Sanjeev Premi <premi@localhost>
  1136. Date: Mon, 28 Mar 2011 21:54:10 +0530
  1137. Subject: [PATCH 20/26] incremental delta
  1138.  
  1139. Signed-off-by: Sanjeev Premi <premi@localhost>
  1140. ---
  1141. include/configs/omap3_evm.h |   46 ++++++++++++++++++++++++------------------
  1142.  1 files changed, 26 insertions(+), 20 deletions(-)
  1143.  
  1144. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1145. index 7ab35f6..6b47151 100644
  1146. --- a/include/configs/omap3_evm.h
  1147. +++ b/include/configs/omap3_evm.h
  1148. @@ -45,7 +45,10 @@
  1149.  #define CONFIG_OMAP3_MICRON_DDR
  1150.  #define CONFIG_TWL4030_POWER
  1151.  
  1152. -#include <asm/arch/cpu.h>      /* get chip and board defs */
  1153. +/*
  1154. + * Get cpu and chip specific definitions
  1155. + */
  1156. +#include <asm/arch/cpu.h>
  1157.  #include <asm/arch/omap3.h>
  1158.  
  1159.  #undef CONFIG_USE_IRQ          /* no support for IRQs */
  1160. @@ -195,8 +198,6 @@
  1161.  /* Size of jffs2 partition */
  1162.  #define CONFIG_JFFS2_PART_SIZE     0xf980000
  1163.  
  1164. -#define CONFIG_SYS_NO_FLASH
  1165. -
  1166.  /*
  1167.   * MMC
  1168.   */
  1169. @@ -235,6 +236,7 @@
  1170.  #define CONFIG_USB_DEVICE      1
  1171.  #define CONFIG_USB_TTY         1
  1172.  #define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
  1173. +
  1174.  /* Change these to suit your needs */
  1175.  #define CONFIG_USBD_VENDORID       0x0451
  1176.  #define CONFIG_USBD_PRODUCTID      0x5678
  1177. @@ -331,9 +333,28 @@
  1178.  
  1179.  #endif /* CONFIG_CMD_NET */
  1180.  
  1181. -/* Environment information */
  1182. -#define CONFIG_BOOTDELAY   10
  1183. +/* Support for relocation */
  1184. +#define CONFIG_SYS_SDRAM_BASE      PHYS_SDRAM_1
  1185. +#define CONFIG_SYS_INIT_RAM_ADDR   0x4020f800
  1186. +#define CONFIG_SYS_INIT_RAM_SIZE   0x800
  1187. +#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_INIT_RAM_ADDR + \
  1188. +                    CONFIG_SYS_INIT_RAM_SIZE - \
  1189. +                    GENERATED_GBL_DATA_SIZE)
  1190. +
  1191. +/* -----------------------------------------------------------------------------
  1192. + * Board specific
  1193. + * -----------------------------------------------------------------------------
  1194. + */
  1195. +#define CONFIG_SYS_NO_FLASH
  1196. +
  1197. +/* Uncomment to define the board revision statically */
  1198. +/* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
  1199.  
  1200. +/* -----------------------------------------------------------------------------
  1201. + * Default environment
  1202. + * -----------------------------------------------------------------------------
  1203. + */
  1204. +#define CONFIG_BOOTDELAY   10
  1205.  #define CONFIG_BOOTFILE        uImage
  1206.  
  1207.  #define CONFIG_EXTRA_ENV_SETTINGS \
  1208. @@ -374,19 +395,4 @@
  1209.         "fi; " \
  1210.     "else run nandboot; fi"
  1211.  
  1212. -/*
  1213. - * Support for relocation
  1214. - */
  1215. -#define CONFIG_SYS_SDRAM_BASE      PHYS_SDRAM_1
  1216. -#define CONFIG_SYS_INIT_RAM_ADDR   0x4020f800
  1217. -#define CONFIG_SYS_INIT_RAM_SIZE   0x800
  1218. -#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_INIT_RAM_ADDR + \
  1219. -                    CONFIG_SYS_INIT_RAM_SIZE - \
  1220. -                    GENERATED_GBL_DATA_SIZE)
  1221. -
  1222. -/*
  1223. - * Define the board revision statically
  1224. - */
  1225. -/* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
  1226. -
  1227.  #endif /* __CONFIG_H */
  1228. --
  1229. 1.7.0.4
  1230.  
  1231. From 294be8bf99bdb1f30facdf8e75b463d5f2c7c263 Mon Sep 17 00:00:00 2001
  1232. From: Sanjeev Premi <premi@localhost>
  1233. Date: Fri, 23 Sep 2011 15:11:40 +0530
  1234. Subject: [PATCH 21/26] incremental delta
  1235.  
  1236. Add (dummy) definition of CONFIG_ARMCORTEXA8.
  1237. Clean-up the definitions where no numerical value
  1238. is required.
  1239.  
  1240. Signed-off-by: Sanjeev Premi <premi@localhost>
  1241. ---
  1242. include/configs/omap3_evm.h |   13 +++++++------
  1243.  1 files changed, 7 insertions(+), 6 deletions(-)
  1244.  
  1245. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1246. index 6b47151..9277af3 100644
  1247. --- a/include/configs/omap3_evm.h
  1248. +++ b/include/configs/omap3_evm.h
  1249. @@ -36,14 +36,15 @@
  1250.  /*
  1251.   * High Level Configuration Options
  1252.   */
  1253. -#define CONFIG_OMAP        1   /* in a TI OMAP core */
  1254. -#define CONFIG_OMAP34XX        1   /* which is a 34XX */
  1255. -#define CONFIG_OMAP3430        1   /* which is in a 3430 */
  1256. -#define CONFIG_OMAP3_EVM   1   /* working with EVM */
  1257. +#define CONFIG_OMAP            /* This is TI OMAP core */
  1258. +#define CONFIG_OMAP34XX            /* belonging to 34XX family */
  1259. +#define CONFIG_OMAP3430            /* which is in a 3430 */
  1260.  
  1261.  #define CONFIG_SDRC            /* The chip has SDRC controller */
  1262. -#define CONFIG_OMAP3_MICRON_DDR
  1263. -#define CONFIG_TWL4030_POWER
  1264. +
  1265. +#define CONFIG_OMAP3_EVM       /* This is a OMAP3 EVM */
  1266. +#define CONFIG_OMAP3_MICRON_DDR        /* with MICRON DDR part */
  1267. +#define CONFIG_TWL4030_POWER       /* with TWL4030 PMIC */
  1268.  
  1269.  /*
  1270.   * Get cpu and chip specific definitions
  1271. --
  1272. 1.7.0.4
  1273.  
  1274. From e8438ba784049d6090e25d6cb60d6396c1774670 Mon Sep 17 00:00:00 2001
  1275. From: Sanjeev Premi <premi@localhost>
  1276. Date: Fri, 23 Sep 2011 15:30:40 +0530
  1277. Subject: [PATCH 22/26] incremental delta
  1278.  
  1279. Signed-off-by: Sanjeev Premi <premi@localhost>
  1280. ---
  1281. include/configs/omap3_evm.h |   21 +++++++++++----------
  1282.  1 files changed, 11 insertions(+), 10 deletions(-)
  1283.  
  1284. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1285. index 9277af3..2264fc6 100644
  1286. --- a/include/configs/omap3_evm.h
  1287. +++ b/include/configs/omap3_evm.h
  1288. @@ -137,11 +137,12 @@
  1289.   * I2C
  1290.   */
  1291.  #define CONFIG_HARD_I2C
  1292. +#define CONFIG_DRIVER_OMAP34XX_I2C
  1293. +
  1294.  #define CONFIG_SYS_I2C_SPEED       100000
  1295.  #define CONFIG_SYS_I2C_SLAVE       1
  1296.  #define CONFIG_SYS_I2C_BUS     0
  1297.  #define CONFIG_SYS_I2C_BUS_SELECT  1
  1298. -#define CONFIG_DRIVER_OMAP34XX_I2C 1
  1299.  
  1300.  /*
  1301.   * PISMO support
  1302. @@ -212,9 +213,9 @@
  1303.   * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
  1304.   * Enable CONFIG_MUSB_UDD for Device functionalities.
  1305.   */
  1306. -#define CONFIG_USB_OMAP3       1
  1307. -#define CONFIG_MUSB_HCD            1
  1308. -/* #define CONFIG_MUSB_UDC     1 */
  1309. +#define CONFIG_USB_OMAP3
  1310. +#define CONFIG_MUSB_HCD
  1311. +/* #define CONFIG_MUSB_UDC */
  1312.  
  1313.  #ifdef CONFIG_USB_OMAP3
  1314.  
  1315. @@ -234,9 +235,9 @@
  1316.  
  1317.  #ifdef CONFIG_MUSB_UDC
  1318.  /* USB device configuration */
  1319. -#define CONFIG_USB_DEVICE      1
  1320. -#define CONFIG_USB_TTY         1
  1321. -#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
  1322. +#define CONFIG_USB_DEVICE
  1323. +#define CONFIG_USB_TTY
  1324. +#define CONFIG_SYS_CONSOLE_IS_IN_ENV
  1325.  
  1326.  /* Change these to suit your needs */
  1327.  #define CONFIG_USBD_VENDORID       0x0451
  1328. @@ -308,11 +309,11 @@
  1329.  /* NAND */
  1330.  #if defined(CONFIG_CMD_NAND)
  1331.  #define CONFIG_NAND_OMAP_GPMC
  1332. -#define GPMC_NAND_ECC_LP_x16_LAYOUT    1
  1333. +#define GPMC_NAND_ECC_LP_x16_LAYOUT
  1334.  #define CONFIG_ENV_IS_IN_NAND
  1335.  #define CONFIG_ENV_OFFSET      SMNAND_ENV_OFFSET
  1336.  #elif defined(CONFIG_CMD_ONENAND)
  1337. -#define CONFIG_ENV_IS_IN_ONENAND   1
  1338. +#define CONFIG_ENV_IS_IN_ONENAND
  1339.  #define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  1340.  #endif
  1341.  
  1342. @@ -324,7 +325,7 @@
  1343.  #define CONFIG_NET_MULTI
  1344.  #define CONFIG_SMC911X
  1345.  #define CONFIG_SMC911X_32_BIT
  1346. -#define CONFIG_SMC911X_BASE    0x2C000000
  1347. +#define CONFIG_SMC911X_BASE        0x2C000000
  1348.  
  1349.  /* BOOTP fields */
  1350.  #define CONFIG_BOOTP_SUBNETMASK        0x00000001
  1351. --
  1352. 1.7.0.4
  1353.  
  1354. From 3a16207ebb825e356bc5ada87c723322251219ea Mon Sep 17 00:00:00 2001
  1355. From: Sanjeev Premi <premi@localhost>
  1356. Date: Fri, 23 Sep 2011 15:54:50 +0530
  1357. Subject: [PATCH 23/26] incremental delta
  1358.  
  1359. Signed-off-by: Sanjeev Premi <premi@localhost>
  1360. ---
  1361. include/configs/omap3_evm.h |    2 +-
  1362.  1 files changed, 1 insertions(+), 1 deletions(-)
  1363.  
  1364. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1365. index 2264fc6..bbf26f5 100644
  1366. --- a/include/configs/omap3_evm.h
  1367. +++ b/include/configs/omap3_evm.h
  1368. @@ -319,9 +319,9 @@
  1369.  
  1370.  #define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  1371.  
  1372. -/* Ethernet (SMSC9115 from SMSC9118 family) */
  1373.  #if defined(CONFIG_CMD_NET)
  1374.  
  1375. +/* Ethernet (SMSC9115 from SMSC9118 family) */
  1376.  #define CONFIG_NET_MULTI
  1377.  #define CONFIG_SMC911X
  1378.  #define CONFIG_SMC911X_32_BIT
  1379. --
  1380. 1.7.0.4
  1381.  
  1382. From 20882aa81d6d2f510e646afea7bbff13d4f34611 Mon Sep 17 00:00:00 2001
  1383. From: Sanjeev Premi <premi@localhost>
  1384. Date: Fri, 23 Sep 2011 16:01:05 +0530
  1385. Subject: [PATCH 24/26] incremental delta
  1386.  
  1387. Signed-off-by: Sanjeev Premi <premi@localhost>
  1388. ---
  1389. include/configs/omap3_evm.h |    9 ++++-----
  1390.  1 files changed, 4 insertions(+), 5 deletions(-)
  1391.  
  1392. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1393. index bbf26f5..6d39e41 100644
  1394. --- a/include/configs/omap3_evm.h
  1395. +++ b/include/configs/omap3_evm.h
  1396. @@ -69,11 +69,10 @@
  1397.  #define CONFIG_SYS_PTV         2   /* Divisor: 2^(PTV+1) => 8 */
  1398.  #define CONFIG_SYS_HZ          1000
  1399.  
  1400. -/*
  1401. - * Size of malloc() pool
  1402. - */
  1403. -#define CONFIG_ENV_SIZE            (128 << 10) /* 128 KiB */
  1404. -                           /* Sector */
  1405. +/* Size of environment - 128KB */
  1406. +#define CONFIG_ENV_SIZE            (128 << 10)
  1407. +
  1408. +/* Size of malloc pool */
  1409.  #define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + (128 << 10))
  1410.  
  1411.  /*
  1412. --
  1413. 1.7.0.4
  1414.  
  1415. From d32e9ec6086dd7926ff33c9f35f2493cb6a5f286 Mon Sep 17 00:00:00 2001
  1416. From: Sanjeev Premi <premi@localhost>
  1417. Date: Fri, 23 Sep 2011 17:52:23 +0530
  1418. Subject: [PATCH 25/26] incremental delta
  1419.  
  1420. Signed-off-by: Sanjeev Premi <premi@localhost>
  1421. ---
  1422. include/configs/omap3_evm.h |    2 +-
  1423.  1 files changed, 1 insertions(+), 1 deletions(-)
  1424.  
  1425. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1426. index 6d39e41..242eea3 100644
  1427. --- a/include/configs/omap3_evm.h
  1428. +++ b/include/configs/omap3_evm.h
  1429. @@ -153,11 +153,11 @@
  1430.  #define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  1431.  #elif defined(CONFIG_CMD_ONENAND)
  1432.  #define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  1433. +#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  1434.  #endif
  1435.  
  1436.  /* Monitor at start of flash - Reserve 2 sectors */
  1437.  #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
  1438. -#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  1439.  
  1440.  #define CONFIG_SYS_MONITOR_LEN     (256 << 10)
  1441.  
  1442. --
  1443. 1.7.0.4
  1444.  
  1445. From 70eaa43067f89f031015fa23d439e0c1c60e3b2a Mon Sep 17 00:00:00 2001
  1446. From: Sanjeev Premi <premi@localhost>
  1447. Date: Fri, 23 Sep 2011 17:56:45 +0530
  1448. Subject: [PATCH 26/26] incremental delta
  1449.  
  1450. Signed-off-by: Sanjeev Premi <premi@localhost>
  1451. ---
  1452. include/configs/omap3_evm.h |   12 +++++-------
  1453.  1 files changed, 5 insertions(+), 7 deletions(-)
  1454.  
  1455. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  1456. index 242eea3..dd44ae3 100644
  1457. --- a/include/configs/omap3_evm.h
  1458. +++ b/include/configs/omap3_evm.h
  1459. @@ -149,13 +149,6 @@
  1460.  #define PISMO1_NAND_SIZE       GPMC_SIZE_128M
  1461.  #define PISMO1_ONEN_SIZE       GPMC_SIZE_128M
  1462.  
  1463. -#if defined(CONFIG_CMD_NAND)
  1464. -#define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  1465. -#elif defined(CONFIG_CMD_ONENAND)
  1466. -#define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  1467. -#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  1468. -#endif
  1469. -
  1470.  /* Monitor at start of flash - Reserve 2 sectors */
  1471.  #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
  1472.  
  1473. @@ -307,11 +300,16 @@
  1474.   */
  1475.  /* NAND */
  1476.  #if defined(CONFIG_CMD_NAND)
  1477. +#define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  1478. +
  1479.  #define CONFIG_NAND_OMAP_GPMC
  1480.  #define GPMC_NAND_ECC_LP_x16_LAYOUT
  1481.  #define CONFIG_ENV_IS_IN_NAND
  1482.  #define CONFIG_ENV_OFFSET      SMNAND_ENV_OFFSET
  1483.  #elif defined(CONFIG_CMD_ONENAND)
  1484. +#define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  1485. +#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  1486. +
  1487.  #define CONFIG_ENV_IS_IN_ONENAND
  1488.  #define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  1489.  #endif
  1490. --
  1491. 1.7.0.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!