API tools faq
paste
Advertisement
premi

omap3evm-h-incremental-patches2

premi
Sep 23rd, 2011
99
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 33.51 KB | None | 0 0
raw download clone embed print report
  1. From 6262c4d634eac9843d0933b4b7d3b077c6ff2ad9 Mon Sep 17 00:00:00 2001
  2. From: Sanjeev Premi <premi@localhost>
  3. Date: Fri, 23 Sep 2011 18:14:20 +0530
  4. Subject: [PATCH 1/7] omap3evm: Prepare to split configuration
  5.  
  6. This patch marks the beginning of steps that would
  7. lead to clean and easy split of the configuration
  8. file. Common portion can then be re-used by other
  9. configurations.
  10.  
  11. Signed-off-by: Sanjeev Premi <premi@localhost>
  12. ---
  13. include/configs/omap3_evm.h |   21 +++++++++++++++------
  14.  1 files changed, 15 insertions(+), 6 deletions(-)
  15.  
  16. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  17. index dd44ae3..2bf9b91 100644
  18. --- a/include/configs/omap3_evm.h
  19. +++ b/include/configs/omap3_evm.h
  20. @@ -33,6 +33,21 @@
  21.  #ifndef __CONFIG_H
  22.  #define __CONFIG_H
  23.  
  24. +#include <asm/arch/cpu.h>
  25. +#include <asm/arch/omap3.h>
  26. +
  27. +/* =============================================================================
  28. + * This section holds the common definitions that correspond to the
  29. + * current default configuration - omap3_evm_config
  30. + * =============================================================================
  31. + */
  32. +
  33. +/* =============================================================================
  34. + * This section holds the common definitions that can be used by
  35. + * all OMAP3EVM based configurations.
  36. + * =============================================================================
  37. + */
  38. +
  39.  /*
  40.   * High Level Configuration Options
  41.   */
  42. @@ -46,12 +61,6 @@
  43.  #define CONFIG_OMAP3_MICRON_DDR        /* with MICRON DDR part */
  44.  #define CONFIG_TWL4030_POWER       /* with TWL4030 PMIC */
  45.  
  46. -/*
  47. - * Get cpu and chip specific definitions
  48. - */
  49. -#include <asm/arch/cpu.h>
  50. -#include <asm/arch/omap3.h>
  51. -
  52.  #undef CONFIG_USE_IRQ          /* no support for IRQs */
  53.  
  54.  /*
  55. --
  56. 1.7.0.4
  57.  
  58. From 54ea938b8626b6f476ff90cfe4f0250867d83ef2 Mon Sep 17 00:00:00 2001
  59. From: Sanjeev Premi <premi@localhost>
  60. Date: Fri, 23 Sep 2011 18:30:25 +0530
  61. Subject: [PATCH 2/7] Incremental delta
  62.  
  63. Signed-off-by: Sanjeev Premi <premi@localhost>
  64. ---
  65. include/configs/omap3_evm.h |   14 +++++++-------
  66.  1 files changed, 7 insertions(+), 7 deletions(-)
  67.  
  68. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  69. index 2bf9b91..87666db 100644
  70. --- a/include/configs/omap3_evm.h
  71. +++ b/include/configs/omap3_evm.h
  72. @@ -1,6 +1,8 @@
  73.  /*
  74. - * (C) Copyright 2006-2008
  75. - * Texas Instruments.
  76. + * Configuration settings for the TI OMAP3 EVM board.
  77. + *
  78. + * Copyright (C) 2006-2011 Texas Instruments Incorporated - http://www.ti.com/
  79. + *
  80.   * Author :
  81.   * Manikandan Pillai <mani.pillai@ti.com>
  82.   * Derived from Beagle Board and 3430 SDP code by
  83. @@ -9,8 +11,6 @@
  84.   *
  85.   * Manikandan Pillai <mani.pillai@ti.com>
  86.   *
  87. - * Configuration settings for the TI OMAP3 EVM board.
  88. - *
  89.   * See file CREDITS for list of people who contributed to this
  90.   * project.
  91.   *
  92. @@ -30,8 +30,8 @@
  93.   * MA 02111-1307 USA
  94.   */
  95.  
  96. -#ifndef __CONFIG_H
  97. -#define __CONFIG_H
  98. +#ifndef __OMAP3EVM_CONFIG_H
  99. +#define __OMAP3EVM_CONFIG_H
  100.  
  101.  #include <asm/arch/cpu.h>
  102.  #include <asm/arch/omap3.h>
  103. @@ -403,4 +403,4 @@
  104.         "fi; " \
  105.     "else run nandboot; fi"
  106.  
  107. -#endif /* __CONFIG_H */
  108. +#endif /* __OMAP3EVM_CONFIG_H */
  109. --
  110. 1.7.0.4
  111.  
  112. From f49040e5fc42e2b9a42075e0c078379587127e18 Mon Sep 17 00:00:00 2001
  113. From: Sanjeev Premi <premi@localhost>
  114. Date: Fri, 23 Sep 2011 18:39:29 +0530
  115. Subject: [PATCH 3/7] Incremental delta
  116.  
  117. Signed-off-by: Sanjeev Premi <premi@localhost>
  118. ---
  119. include/configs/omap3_evm.h |   47 +++++++++++++++++++++++-------------------
  120.  1 files changed, 26 insertions(+), 21 deletions(-)
  121.  
  122. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  123. index 87666db..6fdc336 100644
  124. --- a/include/configs/omap3_evm.h
  125. +++ b/include/configs/omap3_evm.h
  126. @@ -42,6 +42,29 @@
  127.   * =============================================================================
  128.   */
  129.  
  130. +/* ----------------------------------------------------------------------------
  131. + * Supported U-boot commands
  132. + * ----------------------------------------------------------------------------
  133. + */
  134. +
  135. +/* Default commands to include */
  136. +#include <config_cmd_default.h>
  137. +
  138. +#define CONFIG_CMD_EXT2        /* EXT2 Support         */
  139. +#define CONFIG_CMD_FAT     /* FAT support          */
  140. +#define CONFIG_CMD_JFFS2   /* JFFS2 Support        */
  141. +
  142. +#define CONFIG_CMD_I2C     /* I2C serial bus support   */
  143. +#define CONFIG_CMD_MMC     /* MMC support          */
  144. +#define CONFIG_CMD_NAND        /* NAND support         */
  145. +#define CONFIG_CMD_DHCP
  146. +#define CONFIG_CMD_PING
  147. +
  148. +#undef CONFIG_CMD_FLASH        /* flinfo, erase, protect   */
  149. +#undef CONFIG_CMD_FPGA     /* FPGA configuration Support   */
  150. +#undef CONFIG_CMD_IMI      /* iminfo           */
  151. +#undef CONFIG_CMD_IMLS     /* List all found images    */
  152. +
  153.  /* =============================================================================
  154.   * This section holds the common definitions that can be used by
  155.   * all OMAP3EVM based configurations.
  156. @@ -49,7 +72,7 @@
  157.   */
  158.  
  159.  /*
  160. - * High Level Configuration Options
  161. + * High level configuration options
  162.   */
  163.  #define CONFIG_OMAP            /* This is TI OMAP core */
  164.  #define CONFIG_OMAP34XX            /* belonging to 34XX family */
  165. @@ -86,10 +109,10 @@
  166.  
  167.  /*
  168.   * Stack sizes
  169. - *
  170. - * The stack sizes are set up in start.S using the settings below
  171. + * These values are used in start.S
  172.   */
  173.  #define CONFIG_STACKSIZE   (128 << 10) /* regular stack 128 KiB */
  174. +
  175.  #ifdef CONFIG_USE_IRQ
  176.  #define CONFIG_STACKSIZE_IRQ   (4 << 10)   /* IRQ stack 4 KiB */
  177.  #define CONFIG_STACKSIZE_FIQ   (4 << 10)   /* FIQ stack 4 KiB */
  178. @@ -286,24 +309,6 @@
  179.  /* Size of bootarg buffer */
  180.  #define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  181.  
  182. -/* Default commands to include */
  183. -#include <config_cmd_default.h>
  184. -
  185. -#define CONFIG_CMD_EXT2        /* EXT2 Support         */
  186. -#define CONFIG_CMD_FAT     /* FAT support          */
  187. -#define CONFIG_CMD_JFFS2   /* JFFS2 Support        */
  188. -
  189. -#define CONFIG_CMD_I2C     /* I2C serial bus support   */
  190. -#define CONFIG_CMD_MMC     /* MMC support          */
  191. -#define CONFIG_CMD_NAND        /* NAND support         */
  192. -#define CONFIG_CMD_DHCP
  193. -#define CONFIG_CMD_PING
  194. -
  195. -#undef CONFIG_CMD_FLASH        /* flinfo, erase, protect   */
  196. -#undef CONFIG_CMD_FPGA     /* FPGA configuration Support   */
  197. -#undef CONFIG_CMD_IMI      /* iminfo           */
  198. -#undef CONFIG_CMD_IMLS     /* List all found images    */
  199. -
  200.  /*
  201.   * Additional definitions that depend on chosen commands
  202.   */
  203. --
  204. 1.7.0.4
  205.  
  206. From 5e2b1907ecf352387ae0380c529a866196f50e8f Mon Sep 17 00:00:00 2001
  207. From: Sanjeev Premi <premi@localhost>
  208. Date: Fri, 23 Sep 2011 18:41:29 +0530
  209. Subject: [PATCH 4/7] Incremental delta
  210.  
  211. Signed-off-by: Sanjeev Premi <premi@localhost>
  212. ---
  213. include/configs/omap3_evm.h |   29 +++++++++++++++++------------
  214.  1 files changed, 17 insertions(+), 12 deletions(-)
  215.  
  216. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  217. index 6fdc336..e8d11b9 100644
  218. --- a/include/configs/omap3_evm.h
  219. +++ b/include/configs/omap3_evm.h
  220. @@ -65,6 +65,23 @@
  221.  #undef CONFIG_CMD_IMI      /* iminfo           */
  222.  #undef CONFIG_CMD_IMLS     /* List all found images    */
  223.  
  224. +/* ----------------------------------------------------------------------------
  225. + * Supported U-boot features
  226. + * ----------------------------------------------------------------------------
  227. + */
  228. +#define CONFIG_SYS_LONGHELP
  229. +#define CONFIG_SYS_HUSH_PARSER
  230. +
  231. +/* Display CPU and Board information */
  232. +#define CONFIG_DISPLAY_CPUINFO
  233. +#define CONFIG_DISPLAY_BOARDINFO
  234. +
  235. +/* Allow to overwrite serial and ethaddr */
  236. +#define CONFIG_ENV_OVERWRITE
  237. +
  238. +/* Add auto-completion support */
  239. +#define CONFIG_AUTO_COMPLETE
  240. +
  241.  /* =============================================================================
  242.   * This section holds the common definitions that can be used by
  243.   * all OMAP3EVM based configurations.
  244. @@ -276,16 +293,10 @@
  245.   * U-boot features
  246.   * ----------------------------------------------------------------------------
  247.   */
  248. -#define CONFIG_SYS_LONGHELP
  249. -#define CONFIG_SYS_HUSH_PARSER
  250.  #define CONFIG_SYS_PROMPT      "OMAP3_EVM # "
  251.  #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
  252.  #define CONFIG_SYS_MAXARGS     16  /* max args for a command */
  253.  
  254. -/* Display CPU and Board information */
  255. -#define CONFIG_DISPLAY_CPUINFO
  256. -#define CONFIG_DISPLAY_BOARDINFO
  257. -
  258.  #define CONFIG_MISC_INIT_R
  259.  
  260.  #define CONFIG_CMDLINE_TAG         /* enable passing of ATAGs */
  261. @@ -293,12 +304,6 @@
  262.  #define CONFIG_INITRD_TAG
  263.  #define CONFIG_REVISION_TAG
  264.  
  265. -/* Allow to overwrite serial and ethaddr */
  266. -#define CONFIG_ENV_OVERWRITE
  267. -
  268. -/* Add auto-completion support */
  269. -#define CONFIG_AUTO_COMPLETE
  270. -
  271.  /* Size of Console IO buffer */
  272.  #define CONFIG_SYS_CBSIZE      512
  273.  
  274. --
  275. 1.7.0.4
  276.  
  277. From c23693d934b9e31b14484b84dd1b3cbf70c843e2 Mon Sep 17 00:00:00 2001
  278. From: Sanjeev Premi <premi@localhost>
  279. Date: Fri, 23 Sep 2011 18:42:54 +0530
  280. Subject: [PATCH 5/7] Incremental delta
  281.  
  282. Signed-off-by: Sanjeev Premi <premi@localhost>
  283. ---
  284. include/configs/omap3_evm.h |   40 +++++++++++++++++++++++-----------------
  285.  1 files changed, 23 insertions(+), 17 deletions(-)
  286.  
  287. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  288. index e8d11b9..0fa0d6e 100644
  289. --- a/include/configs/omap3_evm.h
  290. +++ b/include/configs/omap3_evm.h
  291. @@ -82,6 +82,27 @@
  292.  /* Add auto-completion support */
  293.  #define CONFIG_AUTO_COMPLETE
  294.  
  295. +/* ----------------------------------------------------------------------------
  296. + * Supported hardware
  297. + * ----------------------------------------------------------------------------
  298. + */
  299. +
  300. +/* MMC */
  301. +#define CONFIG_MMC
  302. +#define CONFIG_GENERIC_MMC
  303. +#define CONFIG_OMAP_HSMMC
  304. +#define CONFIG_DOS_PARTITION
  305. +
  306. +/* USB
  307. + *
  308. + * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
  309. + * Enable CONFIG_MUSB_UDD for Device functionalities.
  310. + */
  311. +#define CONFIG_USB_OMAP3
  312. +#define CONFIG_MUSB_HCD
  313. +/* #define CONFIG_MUSB_UDC */
  314. +
  315. +
  316.  /* =============================================================================
  317.   * This section holds the common definitions that can be used by
  318.   * all OMAP3EVM based configurations.
  319. @@ -242,22 +263,8 @@
  320.  #define CONFIG_JFFS2_PART_SIZE     0xf980000
  321.  
  322.  /*
  323. - * MMC
  324. - */
  325. -#define CONFIG_MMC
  326. -#define CONFIG_GENERIC_MMC
  327. -#define CONFIG_OMAP_HSMMC
  328. -#define CONFIG_DOS_PARTITION
  329. -
  330. -/* USB
  331. - *
  332. - * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
  333. - * Enable CONFIG_MUSB_UDD for Device functionalities.
  334. + * USB
  335.   */
  336. -#define CONFIG_USB_OMAP3
  337. -#define CONFIG_MUSB_HCD
  338. -/* #define CONFIG_MUSB_UDC */
  339. -
  340.  #ifdef CONFIG_USB_OMAP3
  341.  
  342.  #ifdef CONFIG_MUSB_HCD
  343. @@ -315,9 +322,8 @@
  344.  #define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  345.  
  346.  /*
  347. - * Additional definitions that depend on chosen commands
  348. + * NAND / OneNAND
  349.   */
  350. -/* NAND */
  351.  #if defined(CONFIG_CMD_NAND)
  352.  #define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  353.  
  354. --
  355. 1.7.0.4
  356.  
  357. From d9476b5dd274774f2166c696bd9ca70e0425d947 Mon Sep 17 00:00:00 2001
  358. From: Sanjeev Premi <premi@localhost>
  359. Date: Fri, 23 Sep 2011 18:52:13 +0530
  360. Subject: [PATCH 6/7] Incremental delta
  361.  
  362. Signed-off-by: Sanjeev Premi <premi@localhost>
  363. ---
  364. include/configs/omap3_evm.h |   90 +++++++++++++++++++++---------------------
  365.  1 files changed, 45 insertions(+), 45 deletions(-)
  366.  
  367. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  368. index 0fa0d6e..0cd59ba 100644
  369. --- a/include/configs/omap3_evm.h
  370. +++ b/include/configs/omap3_evm.h
  371. @@ -102,6 +102,49 @@
  372.  #define CONFIG_MUSB_HCD
  373.  /* #define CONFIG_MUSB_UDC */
  374.  
  375. +/* -----------------------------------------------------------------------------
  376. + * Default environment
  377. + * -----------------------------------------------------------------------------
  378. + */
  379. +#define CONFIG_BOOTDELAY   10
  380. +
  381. +#define CONFIG_EXTRA_ENV_SETTINGS \
  382. +   "loadaddr=0x82000000\0" \
  383. +   "usbtty=cdc_acm\0" \
  384. +   "mmcdev=0\0" \
  385. +   "memsize=128M\0" \
  386. +   "console=ttyO0,115200n8\0" \
  387. +   "mmcargs=setenv bootargs console=${console} " \
  388. +       "mem=${memsize}\0 " \
  389. +       "root=/dev/mmcblk0p2 rw " \
  390. +       "rootfstype=ext3 rootwait\0" \
  391. +   "nandargs=setenv bootargs console=${console} " \
  392. +       "mem=${memsize}\0 " \
  393. +       "root=/dev/mtdblock4 rw " \
  394. +       "rootfstype=jffs2\0" \
  395. +   "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
  396. +   "bootscript=echo Running bootscript from mmc ...; " \
  397. +       "source ${loadaddr}\0" \
  398. +   "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
  399. +   "mmcboot=echo Booting from mmc ...; " \
  400. +       "run mmcargs; " \
  401. +       "bootm ${loadaddr}\0" \
  402. +   "nandboot=echo Booting from nand ...; " \
  403. +       "run nandargs; " \
  404. +       "onenand read ${loadaddr} 280000 400000; " \
  405. +       "bootm ${loadaddr}\0" \
  406. +
  407. +#define CONFIG_BOOTCOMMAND \
  408. +   "if mmc rescan ${mmcdev}; then " \
  409. +       "if run loadbootscript; then " \
  410. +           "run bootscript; " \
  411. +       "else " \
  412. +           "if run loaduimage; then " \
  413. +               "run mmcboot; " \
  414. +           "else run nandboot; " \
  415. +           "fi; " \
  416. +       "fi; " \
  417. +   "else run nandboot; fi"
  418.  
  419.  /* =============================================================================
  420.   * This section holds the common definitions that can be used by
  421. @@ -321,6 +364,8 @@
  422.  /* Size of bootarg buffer */
  423.  #define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  424.  
  425. +#define CONFIG_BOOTFILE            uImage
  426. +
  427.  /*
  428.   * NAND / OneNAND
  429.   */
  430. @@ -374,49 +419,4 @@
  431.  /* Uncomment to define the board revision statically */
  432.  /* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
  433.  
  434. -/* -----------------------------------------------------------------------------
  435. - * Default environment
  436. - * -----------------------------------------------------------------------------
  437. - */
  438. -#define CONFIG_BOOTDELAY   10
  439. -#define CONFIG_BOOTFILE        uImage
  440. -
  441. -#define CONFIG_EXTRA_ENV_SETTINGS \
  442. -   "loadaddr=0x82000000\0" \
  443. -   "usbtty=cdc_acm\0" \
  444. -   "mmcdev=0\0" \
  445. -   "memsize=128M\0" \
  446. -   "console=ttyO0,115200n8\0" \
  447. -   "mmcargs=setenv bootargs console=${console} " \
  448. -       "mem=${memsize}\0 " \
  449. -       "root=/dev/mmcblk0p2 rw " \
  450. -       "rootfstype=ext3 rootwait\0" \
  451. -   "nandargs=setenv bootargs console=${console} " \
  452. -       "mem=${memsize}\0 " \
  453. -       "root=/dev/mtdblock4 rw " \
  454. -       "rootfstype=jffs2\0" \
  455. -   "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
  456. -   "bootscript=echo Running bootscript from mmc ...; " \
  457. -       "source ${loadaddr}\0" \
  458. -   "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
  459. -   "mmcboot=echo Booting from mmc ...; " \
  460. -       "run mmcargs; " \
  461. -       "bootm ${loadaddr}\0" \
  462. -   "nandboot=echo Booting from nand ...; " \
  463. -       "run nandargs; " \
  464. -       "onenand read ${loadaddr} 280000 400000; " \
  465. -       "bootm ${loadaddr}\0" \
  466. -
  467. -#define CONFIG_BOOTCOMMAND \
  468. -   "if mmc rescan ${mmcdev}; then " \
  469. -       "if run loadbootscript; then " \
  470. -           "run bootscript; " \
  471. -       "else " \
  472. -           "if run loaduimage; then " \
  473. -               "run mmcboot; " \
  474. -           "else run nandboot; " \
  475. -           "fi; " \
  476. -       "fi; " \
  477. -   "else run nandboot; fi"
  478. -
  479.  #endif /* __OMAP3EVM_CONFIG_H */
  480. --
  481. 1.7.0.4
  482.  
  483. From 97bed455bc369bc1ab2f2213ff949e9273efc2b2 Mon Sep 17 00:00:00 2001
  484. From: Sanjeev Premi <premi@localhost>
  485. Date: Fri, 23 Sep 2011 19:10:15 +0530
  486. Subject: [PATCH 7/7] omap3evm: move common config options to new file
  487.  
  488. This patch moves common config options to a new
  489. file. Common options can now be included in other
  490. board configs for this evm.
  491.  
  492. Signed-off-by: Sanjeev Premi <premi@localhost>
  493. ---
  494. include/configs/omap3_evm.h        |  299 ++----------------------------------
  495.  include/configs/omap3_evm_common.h |  287 ++++++++++++++++++++++++++++++++++
  496.  2 files changed, 299 insertions(+), 287 deletions(-)
  497.  create mode 100644 include/configs/omap3_evm_common.h
  498.  
  499. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
  500. index 0cd59ba..824c6dd 100644
  501. --- a/include/configs/omap3_evm.h
  502. +++ b/include/configs/omap3_evm.h
  503. @@ -36,27 +36,19 @@
  504.  #include <asm/arch/cpu.h>
  505.  #include <asm/arch/omap3.h>
  506.  
  507. -/* =============================================================================
  508. - * This section holds the common definitions that correspond to the
  509. - * current default configuration - omap3_evm_config
  510. - * =============================================================================
  511. - */
  512. -
  513.  /* ----------------------------------------------------------------------------
  514.   * Supported U-boot commands
  515.   * ----------------------------------------------------------------------------
  516.   */
  517. -
  518. -/* Default commands to include */
  519.  #include <config_cmd_default.h>
  520.  
  521. -#define CONFIG_CMD_EXT2        /* EXT2 Support         */
  522. -#define CONFIG_CMD_FAT     /* FAT support          */
  523. -#define CONFIG_CMD_JFFS2   /* JFFS2 Support        */
  524. +#define CONFIG_CMD_EXT2
  525. +#define CONFIG_CMD_FAT
  526. +#define CONFIG_CMD_JFFS2
  527.  
  528. -#define CONFIG_CMD_I2C     /* I2C serial bus support   */
  529. -#define CONFIG_CMD_MMC     /* MMC support          */
  530. -#define CONFIG_CMD_NAND        /* NAND support         */
  531. +#define CONFIG_CMD_I2C
  532. +#define CONFIG_CMD_MMC
  533. +#define CONFIG_CMD_NAND
  534.  #define CONFIG_CMD_DHCP
  535.  #define CONFIG_CMD_PING
  536.  
  537. @@ -103,6 +95,12 @@
  538.  /* #define CONFIG_MUSB_UDC */
  539.  
  540.  /* -----------------------------------------------------------------------------
  541. + * Include common board configuration
  542. + * -----------------------------------------------------------------------------
  543. + */
  544. +#include "omap3_evm_common.h"
  545. +
  546. +/* -----------------------------------------------------------------------------
  547.   * Default environment
  548.   * -----------------------------------------------------------------------------
  549.   */
  550. @@ -146,277 +144,4 @@
  551.         "fi; " \
  552.     "else run nandboot; fi"
  553.  
  554. -/* =============================================================================
  555. - * This section holds the common definitions that can be used by
  556. - * all OMAP3EVM based configurations.
  557. - * =============================================================================
  558. - */
  559. -
  560. -/*
  561. - * High level configuration options
  562. - */
  563. -#define CONFIG_OMAP            /* This is TI OMAP core */
  564. -#define CONFIG_OMAP34XX            /* belonging to 34XX family */
  565. -#define CONFIG_OMAP3430            /* which is in a 3430 */
  566. -
  567. -#define CONFIG_SDRC            /* The chip has SDRC controller */
  568. -
  569. -#define CONFIG_OMAP3_EVM       /* This is a OMAP3 EVM */
  570. -#define CONFIG_OMAP3_MICRON_DDR        /* with MICRON DDR part */
  571. -#define CONFIG_TWL4030_POWER       /* with TWL4030 PMIC */
  572. -
  573. -#undef CONFIG_USE_IRQ          /* no support for IRQs */
  574. -
  575. -/*
  576. - * Clock related definitions
  577. - */
  578. -#define V_OSCK         26000000    /* Clock output from T2 */
  579. -#define V_SCLK         (V_OSCK >> 1)
  580. -
  581. -/*
  582. - * OMAP3 has 12 GP timers, they can be driven by the system clock
  583. - * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  584. - * This rate is divided by a local divisor.
  585. - */
  586. -#define CONFIG_SYS_TIMERBASE       OMAP34XX_GPT2
  587. -#define CONFIG_SYS_PTV         2   /* Divisor: 2^(PTV+1) => 8 */
  588. -#define CONFIG_SYS_HZ          1000
  589. -
  590. -/* Size of environment - 128KB */
  591. -#define CONFIG_ENV_SIZE            (128 << 10)
  592. -
  593. -/* Size of malloc pool */
  594. -#define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + (128 << 10))
  595. -
  596. -/*
  597. - * Stack sizes
  598. - * These values are used in start.S
  599. - */
  600. -#define CONFIG_STACKSIZE   (128 << 10) /* regular stack 128 KiB */
  601. -
  602. -#ifdef CONFIG_USE_IRQ
  603. -#define CONFIG_STACKSIZE_IRQ   (4 << 10)   /* IRQ stack 4 KiB */
  604. -#define CONFIG_STACKSIZE_FIQ   (4 << 10)   /* FIQ stack 4 KiB */
  605. -#endif
  606. -
  607. -/*
  608. - * Physical Memory Map
  609. - * Note 1: CS1 may or may not be populated
  610. - * Note 2: SDRAM size is expected to be at least 32MB
  611. - */
  612. -#define CONFIG_NR_DRAM_BANKS       2
  613. -#define PHYS_SDRAM_1           OMAP34XX_SDRC_CS0
  614. -#define PHYS_SDRAM_1_SIZE      (32 << 20)
  615. -#define PHYS_SDRAM_2           OMAP34XX_SDRC_CS1
  616. -
  617. -/* SDRAM Bank Allocation method */
  618. -#define SDRC_R_B_C
  619. -
  620. -/* Limits for memtest */
  621. -#define CONFIG_SYS_MEMTEST_START   (OMAP34XX_SDRC_CS0)
  622. -#define CONFIG_SYS_MEMTEST_END     (OMAP34XX_SDRC_CS0 + \
  623. -                       0x01F00000) /* 31MB */
  624. -
  625. -/* Default load address */
  626. -#define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0)
  627. -
  628. -/* -----------------------------------------------------------------------------
  629. - * Hardware drivers
  630. - * -----------------------------------------------------------------------------
  631. - */
  632. -
  633. -/*
  634. - * NS16550 Configuration
  635. - */
  636. -#define V_NS16550_CLK          48000000    /* 48MHz (APLL96/2) */
  637. -
  638. -#define CONFIG_SYS_NS16550
  639. -#define CONFIG_SYS_NS16550_SERIAL
  640. -#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
  641. -#define CONFIG_SYS_NS16550_CLK     V_NS16550_CLK
  642. -
  643. -/*
  644. - * select serial console configuration
  645. - */
  646. -#define CONFIG_CONS_INDEX      1
  647. -#define CONFIG_SERIAL1         1   /* UART1 on OMAP3 EVM */
  648. -#define CONFIG_SYS_NS16550_COM1        OMAP34XX_UART1
  649. -#define CONFIG_BAUDRATE            115200
  650. -#define CONFIG_SYS_BAUDRATE_TABLE  {4800, 9600, 19200, 38400, 57600,\
  651. -                   115200}
  652. -
  653. -/*
  654. - * I2C
  655. - */
  656. -#define CONFIG_HARD_I2C
  657. -#define CONFIG_DRIVER_OMAP34XX_I2C
  658. -
  659. -#define CONFIG_SYS_I2C_SPEED       100000
  660. -#define CONFIG_SYS_I2C_SLAVE       1
  661. -#define CONFIG_SYS_I2C_BUS     0
  662. -#define CONFIG_SYS_I2C_BUS_SELECT  1
  663. -
  664. -/*
  665. - * PISMO support
  666. - */
  667. -#define PISMO1_NAND_SIZE       GPMC_SIZE_128M
  668. -#define PISMO1_ONEN_SIZE       GPMC_SIZE_128M
  669. -
  670. -/* Monitor at start of flash - Reserve 2 sectors */
  671. -#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
  672. -
  673. -#define CONFIG_SYS_MONITOR_LEN     (256 << 10)
  674. -
  675. -/* Start location & size of environment */
  676. -#define ONENAND_ENV_OFFSET     0x260000
  677. -#define SMNAND_ENV_OFFSET      0x260000
  678. -
  679. -#define CONFIG_SYS_ENV_SECT_SIZE   (128 << 10) /* 128 KiB */
  680. -
  681. -/*
  682. - * NAND
  683. - */
  684. -/* Physical address to access NAND */
  685. -#define CONFIG_SYS_NAND_ADDR       NAND_BASE
  686. -
  687. -/* Physical address to access NAND at CS0 */
  688. -#define CONFIG_SYS_NAND_BASE       NAND_BASE
  689. -
  690. -/* Max number of NAND devices */
  691. -#define CONFIG_SYS_MAX_NAND_DEVICE 1
  692. -
  693. -/* Timeout values (in ticks) */
  694. -#define CONFIG_SYS_FLASH_ERASE_TOUT    (100 * CONFIG_SYS_HZ)
  695. -#define CONFIG_SYS_FLASH_WRITE_TOUT    (100 * CONFIG_SYS_HZ)
  696. -
  697. -/* Flash banks JFFS2 should use */
  698. -#define CONFIG_SYS_MAX_MTD_BANKS   (CONFIG_SYS_MAX_FLASH_BANKS + \
  699. -                       CONFIG_SYS_MAX_NAND_DEVICE)
  700. -
  701. -#define CONFIG_SYS_JFFS2_MEM_NAND
  702. -#define CONFIG_SYS_JFFS2_FIRST_BANK    CONFIG_SYS_MAX_FLASH_BANKS
  703. -#define CONFIG_SYS_JFFS2_NUM_BANKS 1
  704. -
  705. -#define CONFIG_JFFS2_NAND
  706. -/* nand device jffs2 lives on */
  707. -#define CONFIG_JFFS2_DEV       "nand0"
  708. -/* Start of jffs2 partition */
  709. -#define CONFIG_JFFS2_PART_OFFSET   0x680000
  710. -/* Size of jffs2 partition */
  711. -#define CONFIG_JFFS2_PART_SIZE     0xf980000
  712. -
  713. -/*
  714. - * USB
  715. - */
  716. -#ifdef CONFIG_USB_OMAP3
  717. -
  718. -#ifdef CONFIG_MUSB_HCD
  719. -#define CONFIG_CMD_USB
  720. -
  721. -#define CONFIG_USB_STORAGE
  722. -#define CONGIG_CMD_STORAGE
  723. -#define CONFIG_CMD_FAT
  724. -
  725. -#ifdef CONFIG_USB_KEYBOARD
  726. -#define CONFIG_SYS_USB_EVENT_POLL
  727. -#define CONFIG_PREBOOT         "usb start"
  728. -#endif /* CONFIG_USB_KEYBOARD */
  729. -
  730. -#endif /* CONFIG_MUSB_HCD */
  731. -
  732. -#ifdef CONFIG_MUSB_UDC
  733. -/* USB device configuration */
  734. -#define CONFIG_USB_DEVICE
  735. -#define CONFIG_USB_TTY
  736. -#define CONFIG_SYS_CONSOLE_IS_IN_ENV
  737. -
  738. -/* Change these to suit your needs */
  739. -#define CONFIG_USBD_VENDORID       0x0451
  740. -#define CONFIG_USBD_PRODUCTID      0x5678
  741. -#define CONFIG_USBD_MANUFACTURER   "Texas Instruments"
  742. -#define CONFIG_USBD_PRODUCT_NAME   "EVM"
  743. -#endif /* CONFIG_MUSB_UDC */
  744. -
  745. -#endif /* CONFIG_USB_OMAP3 */
  746. -
  747. -/* ----------------------------------------------------------------------------
  748. - * U-boot features
  749. - * ----------------------------------------------------------------------------
  750. - */
  751. -#define CONFIG_SYS_PROMPT      "OMAP3_EVM # "
  752. -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
  753. -#define CONFIG_SYS_MAXARGS     16  /* max args for a command */
  754. -
  755. -#define CONFIG_MISC_INIT_R
  756. -
  757. -#define CONFIG_CMDLINE_TAG         /* enable passing of ATAGs */
  758. -#define CONFIG_SETUP_MEMORY_TAGS
  759. -#define CONFIG_INITRD_TAG
  760. -#define CONFIG_REVISION_TAG
  761. -
  762. -/* Size of Console IO buffer */
  763. -#define CONFIG_SYS_CBSIZE      512
  764. -
  765. -/* Size of print buffer */
  766. -#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
  767. -                       sizeof(CONFIG_SYS_PROMPT) + 16)
  768. -
  769. -/* Size of bootarg buffer */
  770. -#define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  771. -
  772. -#define CONFIG_BOOTFILE            uImage
  773. -
  774. -/*
  775. - * NAND / OneNAND
  776. - */
  777. -#if defined(CONFIG_CMD_NAND)
  778. -#define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  779. -
  780. -#define CONFIG_NAND_OMAP_GPMC
  781. -#define GPMC_NAND_ECC_LP_x16_LAYOUT
  782. -#define CONFIG_ENV_IS_IN_NAND
  783. -#define CONFIG_ENV_OFFSET      SMNAND_ENV_OFFSET
  784. -#elif defined(CONFIG_CMD_ONENAND)
  785. -#define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  786. -#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  787. -
  788. -#define CONFIG_ENV_IS_IN_ONENAND
  789. -#define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  790. -#endif
  791. -
  792. -#define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  793. -
  794. -#if defined(CONFIG_CMD_NET)
  795. -
  796. -/* Ethernet (SMSC9115 from SMSC9118 family) */
  797. -#define CONFIG_NET_MULTI
  798. -#define CONFIG_SMC911X
  799. -#define CONFIG_SMC911X_32_BIT
  800. -#define CONFIG_SMC911X_BASE        0x2C000000
  801. -
  802. -/* BOOTP fields */
  803. -#define CONFIG_BOOTP_SUBNETMASK        0x00000001
  804. -#define CONFIG_BOOTP_GATEWAY       0x00000002
  805. -#define CONFIG_BOOTP_HOSTNAME      0x00000004
  806. -#define CONFIG_BOOTP_BOOTPATH      0x00000010
  807. -
  808. -#endif /* CONFIG_CMD_NET */
  809. -
  810. -/* Support for relocation */
  811. -#define CONFIG_SYS_SDRAM_BASE      PHYS_SDRAM_1
  812. -#define CONFIG_SYS_INIT_RAM_ADDR   0x4020f800
  813. -#define CONFIG_SYS_INIT_RAM_SIZE   0x800
  814. -#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_INIT_RAM_ADDR + \
  815. -                    CONFIG_SYS_INIT_RAM_SIZE - \
  816. -                    GENERATED_GBL_DATA_SIZE)
  817. -
  818. -/* -----------------------------------------------------------------------------
  819. - * Board specific
  820. - * -----------------------------------------------------------------------------
  821. - */
  822. -#define CONFIG_SYS_NO_FLASH
  823. -
  824. -/* Uncomment to define the board revision statically */
  825. -/* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
  826. -
  827.  #endif /* __OMAP3EVM_CONFIG_H */
  828. diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
  829. new file mode 100644
  830. index 0000000..baa74bf
  831. --- /dev/null
  832. +++ b/include/configs/omap3_evm_common.h
  833. @@ -0,0 +1,287 @@
  834. +/*
  835. + * Common configuration settings for the TI OMAP3 EVM board.
  836. + *
  837. + * Copyright (C) 2006-2011 Texas Instruments Incorporated - http://www.ti.com/
  838. + *
  839. + * This program is free software; you can redistribute it and/or
  840. + * modify it under the terms of the GNU General Public License as
  841. + * published by the Free Software Foundation; either version 2 of
  842. + * the License, or (at your option) any later version.
  843. + *
  844. + * This program is distributed "as is" WITHOUT ANY WARRANTY of any
  845. + * kind, whether express or implied; without even the implied warranty
  846. + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  847. + * GNU General Public License for more details.
  848. + */
  849. +
  850. +#ifndef __OMAP3_EVM_COMMON_H
  851. +#define __OMAP3_EVM_COMMON_H
  852. +
  853. +/*
  854. + * High level configuration options
  855. + */
  856. +#define CONFIG_OMAP            /* This is TI OMAP core */
  857. +#define CONFIG_OMAP34XX            /* belonging to 34XX family */
  858. +#define CONFIG_OMAP3430            /* which is in a 3430 */
  859. +
  860. +#define CONFIG_SDRC            /* The chip has SDRC controller */
  861. +
  862. +#define CONFIG_OMAP3_EVM       /* This is a OMAP3 EVM */
  863. +#define CONFIG_OMAP3_MICRON_DDR        /* with MICRON DDR part */
  864. +#define CONFIG_TWL4030_POWER       /* with TWL4030 PMIC */
  865. +
  866. +#undef CONFIG_USE_IRQ          /* no support for IRQs */
  867. +
  868. +/*
  869. + * Clock related definitions
  870. + */
  871. +#define V_OSCK         26000000    /* Clock output from T2 */
  872. +#define V_SCLK         (V_OSCK >> 1)
  873. +
  874. +/*
  875. + * OMAP3 has 12 GP timers, they can be driven by the system clock
  876. + * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  877. + * This rate is divided by a local divisor.
  878. + */
  879. +#define CONFIG_SYS_TIMERBASE       OMAP34XX_GPT2
  880. +#define CONFIG_SYS_PTV         2   /* Divisor: 2^(PTV+1) => 8 */
  881. +#define CONFIG_SYS_HZ          1000
  882. +
  883. +/* Size of environment - 128KB */
  884. +#define CONFIG_ENV_SIZE            (128 << 10)
  885. +
  886. +/* Size of malloc pool */
  887. +#define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + (128 << 10))
  888. +
  889. +/*
  890. + * Stack sizes
  891. + * These values are used in start.S
  892. + */
  893. +#define CONFIG_STACKSIZE   (128 << 10) /* regular stack 128 KiB */
  894. +
  895. +#ifdef CONFIG_USE_IRQ
  896. +#define CONFIG_STACKSIZE_IRQ   (4 << 10)   /* IRQ stack 4 KiB */
  897. +#define CONFIG_STACKSIZE_FIQ   (4 << 10)   /* FIQ stack 4 KiB */
  898. +#endif
  899. +
  900. +/*
  901. + * Physical Memory Map
  902. + * Note 1: CS1 may or may not be populated
  903. + * Note 2: SDRAM size is expected to be at least 32MB
  904. + */
  905. +#define CONFIG_NR_DRAM_BANKS       2
  906. +#define PHYS_SDRAM_1           OMAP34XX_SDRC_CS0
  907. +#define PHYS_SDRAM_1_SIZE      (32 << 20)
  908. +#define PHYS_SDRAM_2           OMAP34XX_SDRC_CS1
  909. +
  910. +/* SDRAM Bank Allocation method */
  911. +#define SDRC_R_B_C
  912. +
  913. +/* Limits for memtest */
  914. +#define CONFIG_SYS_MEMTEST_START   (OMAP34XX_SDRC_CS0)
  915. +#define CONFIG_SYS_MEMTEST_END     (OMAP34XX_SDRC_CS0 + \
  916. +                       0x01F00000) /* 31MB */
  917. +
  918. +/* Default load address */
  919. +#define CONFIG_SYS_LOAD_ADDR       (OMAP34XX_SDRC_CS0)
  920. +
  921. +/* -----------------------------------------------------------------------------
  922. + * Hardware drivers
  923. + * -----------------------------------------------------------------------------
  924. + */
  925. +
  926. +/*
  927. + * NS16550 Configuration
  928. + */
  929. +#define V_NS16550_CLK          48000000    /* 48MHz (APLL96/2) */
  930. +
  931. +#define CONFIG_SYS_NS16550
  932. +#define CONFIG_SYS_NS16550_SERIAL
  933. +#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
  934. +#define CONFIG_SYS_NS16550_CLK     V_NS16550_CLK
  935. +
  936. +/*
  937. + * select serial console configuration
  938. + */
  939. +#define CONFIG_CONS_INDEX      1
  940. +#define CONFIG_SERIAL1         1   /* UART1 on OMAP3 EVM */
  941. +#define CONFIG_SYS_NS16550_COM1        OMAP34XX_UART1
  942. +#define CONFIG_BAUDRATE            115200
  943. +#define CONFIG_SYS_BAUDRATE_TABLE  {4800, 9600, 19200, 38400, 57600,\
  944. +                   115200}
  945. +
  946. +/*
  947. + * I2C
  948. + */
  949. +#define CONFIG_HARD_I2C
  950. +#define CONFIG_DRIVER_OMAP34XX_I2C
  951. +
  952. +#define CONFIG_SYS_I2C_SPEED       100000
  953. +#define CONFIG_SYS_I2C_SLAVE       1
  954. +#define CONFIG_SYS_I2C_BUS     0
  955. +#define CONFIG_SYS_I2C_BUS_SELECT  1
  956. +
  957. +/*
  958. + * PISMO support
  959. + */
  960. +#define PISMO1_NAND_SIZE       GPMC_SIZE_128M
  961. +#define PISMO1_ONEN_SIZE       GPMC_SIZE_128M
  962. +
  963. +/* Monitor at start of flash - Reserve 2 sectors */
  964. +#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
  965. +
  966. +#define CONFIG_SYS_MONITOR_LEN     (256 << 10)
  967. +
  968. +/* Start location & size of environment */
  969. +#define ONENAND_ENV_OFFSET     0x260000
  970. +#define SMNAND_ENV_OFFSET      0x260000
  971. +
  972. +#define CONFIG_SYS_ENV_SECT_SIZE   (128 << 10) /* 128 KiB */
  973. +
  974. +/*
  975. + * NAND
  976. + */
  977. +/* Physical address to access NAND */
  978. +#define CONFIG_SYS_NAND_ADDR       NAND_BASE
  979. +
  980. +/* Physical address to access NAND at CS0 */
  981. +#define CONFIG_SYS_NAND_BASE       NAND_BASE
  982. +
  983. +/* Max number of NAND devices */
  984. +#define CONFIG_SYS_MAX_NAND_DEVICE 1
  985. +
  986. +/* Timeout values (in ticks) */
  987. +#define CONFIG_SYS_FLASH_ERASE_TOUT    (100 * CONFIG_SYS_HZ)
  988. +#define CONFIG_SYS_FLASH_WRITE_TOUT    (100 * CONFIG_SYS_HZ)
  989. +
  990. +/* Flash banks JFFS2 should use */
  991. +#define CONFIG_SYS_MAX_MTD_BANKS   (CONFIG_SYS_MAX_FLASH_BANKS + \
  992. +                       CONFIG_SYS_MAX_NAND_DEVICE)
  993. +
  994. +#define CONFIG_SYS_JFFS2_MEM_NAND
  995. +#define CONFIG_SYS_JFFS2_FIRST_BANK    CONFIG_SYS_MAX_FLASH_BANKS
  996. +#define CONFIG_SYS_JFFS2_NUM_BANKS 1
  997. +
  998. +#define CONFIG_JFFS2_NAND
  999. +/* nand device jffs2 lives on */
  1000. +#define CONFIG_JFFS2_DEV       "nand0"
  1001. +/* Start of jffs2 partition */
  1002. +#define CONFIG_JFFS2_PART_OFFSET   0x680000
  1003. +/* Size of jffs2 partition */
  1004. +#define CONFIG_JFFS2_PART_SIZE     0xf980000
  1005. +
  1006. +/*
  1007. + * USB
  1008. + */
  1009. +#ifdef CONFIG_USB_OMAP3
  1010. +
  1011. +#ifdef CONFIG_MUSB_HCD
  1012. +#define CONFIG_CMD_USB
  1013. +
  1014. +#define CONFIG_USB_STORAGE
  1015. +#define CONGIG_CMD_STORAGE
  1016. +#define CONFIG_CMD_FAT
  1017. +
  1018. +#ifdef CONFIG_USB_KEYBOARD
  1019. +#define CONFIG_SYS_USB_EVENT_POLL
  1020. +#define CONFIG_PREBOOT         "usb start"
  1021. +#endif /* CONFIG_USB_KEYBOARD */
  1022. +
  1023. +#endif /* CONFIG_MUSB_HCD */
  1024. +
  1025. +#ifdef CONFIG_MUSB_UDC
  1026. +/* USB device configuration */
  1027. +#define CONFIG_USB_DEVICE
  1028. +#define CONFIG_USB_TTY
  1029. +#define CONFIG_SYS_CONSOLE_IS_IN_ENV
  1030. +
  1031. +/* Change these to suit your needs */
  1032. +#define CONFIG_USBD_VENDORID       0x0451
  1033. +#define CONFIG_USBD_PRODUCTID      0x5678
  1034. +#define CONFIG_USBD_MANUFACTURER   "Texas Instruments"
  1035. +#define CONFIG_USBD_PRODUCT_NAME   "EVM"
  1036. +#endif /* CONFIG_MUSB_UDC */
  1037. +
  1038. +#endif /* CONFIG_USB_OMAP3 */
  1039. +
  1040. +/* ----------------------------------------------------------------------------
  1041. + * U-boot features
  1042. + * ----------------------------------------------------------------------------
  1043. + */
  1044. +#define CONFIG_SYS_PROMPT      "OMAP3_EVM # "
  1045. +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
  1046. +#define CONFIG_SYS_MAXARGS     16  /* max args for a command */
  1047. +
  1048. +#define CONFIG_MISC_INIT_R
  1049. +
  1050. +#define CONFIG_CMDLINE_TAG         /* enable passing of ATAGs */
  1051. +#define CONFIG_SETUP_MEMORY_TAGS
  1052. +#define CONFIG_INITRD_TAG
  1053. +#define CONFIG_REVISION_TAG
  1054. +
  1055. +/* Size of Console IO buffer */
  1056. +#define CONFIG_SYS_CBSIZE      512
  1057. +
  1058. +/* Size of print buffer */
  1059. +#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
  1060. +                       sizeof(CONFIG_SYS_PROMPT) + 16)
  1061. +
  1062. +/* Size of bootarg buffer */
  1063. +#define CONFIG_SYS_BARGSIZE        (CONFIG_SYS_CBSIZE)
  1064. +
  1065. +#define CONFIG_BOOTFILE            uImage
  1066. +
  1067. +/*
  1068. + * NAND / OneNAND
  1069. + */
  1070. +#if defined(CONFIG_CMD_NAND)
  1071. +#define CONFIG_SYS_FLASH_BASE      PISMO1_NAND_BASE
  1072. +
  1073. +#define CONFIG_NAND_OMAP_GPMC
  1074. +#define GPMC_NAND_ECC_LP_x16_LAYOUT
  1075. +#define CONFIG_ENV_IS_IN_NAND
  1076. +#define CONFIG_ENV_OFFSET      SMNAND_ENV_OFFSET
  1077. +#elif defined(CONFIG_CMD_ONENAND)
  1078. +#define CONFIG_SYS_FLASH_BASE      PISMO1_ONEN_BASE
  1079. +#define CONFIG_SYS_ONENAND_BASE        ONENAND_MAP
  1080. +
  1081. +#define CONFIG_ENV_IS_IN_ONENAND
  1082. +#define CONFIG_ENV_OFFSET      ONENAND_ENV_OFFSET
  1083. +#endif
  1084. +
  1085. +#define CONFIG_ENV_ADDR            CONFIG_ENV_OFFSET
  1086. +
  1087. +#if defined(CONFIG_CMD_NET)
  1088. +
  1089. +/* Ethernet (SMSC9115 from SMSC9118 family) */
  1090. +#define CONFIG_NET_MULTI
  1091. +#define CONFIG_SMC911X
  1092. +#define CONFIG_SMC911X_32_BIT
  1093. +#define CONFIG_SMC911X_BASE        0x2C000000
  1094. +
  1095. +/* BOOTP fields */
  1096. +#define CONFIG_BOOTP_SUBNETMASK        0x00000001
  1097. +#define CONFIG_BOOTP_GATEWAY       0x00000002
  1098. +#define CONFIG_BOOTP_HOSTNAME      0x00000004
  1099. +#define CONFIG_BOOTP_BOOTPATH      0x00000010
  1100. +
  1101. +#endif /* CONFIG_CMD_NET */
  1102. +
  1103. +/* Support for relocation */
  1104. +#define CONFIG_SYS_SDRAM_BASE      PHYS_SDRAM_1
  1105. +#define CONFIG_SYS_INIT_RAM_ADDR   0x4020f800
  1106. +#define CONFIG_SYS_INIT_RAM_SIZE   0x800
  1107. +#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_INIT_RAM_ADDR + \
  1108. +                    CONFIG_SYS_INIT_RAM_SIZE - \
  1109. +                    GENERATED_GBL_DATA_SIZE)
  1110. +
  1111. +/* -----------------------------------------------------------------------------
  1112. + * Board specific
  1113. + * -----------------------------------------------------------------------------
  1114. + */
  1115. +#define CONFIG_SYS_NO_FLASH
  1116. +
  1117. +/* Uncomment to define the board revision statically */
  1118. +/* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
  1119. +
  1120. +#endif /* __OMAP3_EVM_COMMON_H */
  1121. --
  1122. 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!