Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 44bd26fa99fb6d7c1d98c9e8d0bc0c5ac51c04bf

Authored by Alexander Holler
Committed by Tom Rini
1 parent ecd1446fe1
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

omap3_beagle: handle import of environments in files with CRLF as line endings 

Use the new option -r for env import.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

include/configs/omap3_beagle.h
Diff comments   View file @ 44bd26f
1 /* 1 /*
2 * (C) Copyright 2006-2008 2 * (C) Copyright 2006-2008
3 * Texas Instruments. 3 * Texas Instruments.
4 * Richard Woodruff <r-woodruff2@ti.com> 4 * Richard Woodruff <r-woodruff2@ti.com>
5 * Syed Mohammed Khasim <x0khasim@ti.com> 5 * Syed Mohammed Khasim <x0khasim@ti.com>
6 * 6 *
7 * Configuration settings for the TI OMAP3530 Beagle board. 7 * Configuration settings for the TI OMAP3530 Beagle board.
8 * 8 *
9 * SPDX-License-Identifier: GPL-2.0+ 9 * SPDX-License-Identifier: GPL-2.0+
10 */ 10 */
11 11
12 #ifndef __CONFIG_H 12 #ifndef __CONFIG_H
13 #define __CONFIG_H 13 #define __CONFIG_H
14 14
15 #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ 15 #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
16 16
17 /* 17 /*
18 * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM 18 * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
19 * 64 bytes before this address should be set aside for u-boot.img's 19 * 64 bytes before this address should be set aside for u-boot.img's
20 * header. That is 0x800FFFC0--0x80100000 should not be used for any 20 * header. That is 0x800FFFC0--0x80100000 should not be used for any
21 * other needs. We use this rather than the inherited defines from 21 * other needs. We use this rather than the inherited defines from
22 * ti_armv7_common.h for backwards compatibility. 22 * ti_armv7_common.h for backwards compatibility.
23 */ 23 */
24 #define CONFIG_SYS_TEXT_BASE 0x80100000 24 #define CONFIG_SYS_TEXT_BASE 0x80100000
25 #define CONFIG_SPL_BSS_START_ADDR 0x80000000 25 #define CONFIG_SPL_BSS_START_ADDR 0x80000000
26 #define CONFIG_SPL_BSS_MAX_SIZE (512 << 10) /* 512 KB */ 26 #define CONFIG_SPL_BSS_MAX_SIZE (512 << 10) /* 512 KB */
27 #define CONFIG_SYS_SPL_MALLOC_START 0x80208000 27 #define CONFIG_SYS_SPL_MALLOC_START 0x80208000
28 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 28 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
29 29
30 #include <configs/ti_omap3_common.h> 30 #include <configs/ti_omap3_common.h>
31 31
32 /* 32 /*
33 * Display CPU and Board information 33 * Display CPU and Board information
34 */ 34 */
35 #define CONFIG_DISPLAY_CPUINFO 1 35 #define CONFIG_DISPLAY_CPUINFO 1
36 #define CONFIG_DISPLAY_BOARDINFO 1 36 #define CONFIG_DISPLAY_BOARDINFO 1
37 37
38 #define CONFIG_MISC_INIT_R 38 #define CONFIG_MISC_INIT_R
39 39
40 #define CONFIG_REVISION_TAG 1 40 #define CONFIG_REVISION_TAG 1
41 #define CONFIG_ENV_OVERWRITE 41 #define CONFIG_ENV_OVERWRITE
42 42
43 /* Status LED */ 43 /* Status LED */
44 #define CONFIG_STATUS_LED 1 44 #define CONFIG_STATUS_LED 1
45 #define CONFIG_BOARD_SPECIFIC_LED 1 45 #define CONFIG_BOARD_SPECIFIC_LED 1
46 #define STATUS_LED_BIT 0x01 46 #define STATUS_LED_BIT 0x01
47 #define STATUS_LED_STATE STATUS_LED_ON 47 #define STATUS_LED_STATE STATUS_LED_ON
48 #define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) 48 #define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2)
49 #define STATUS_LED_BIT1 0x02 49 #define STATUS_LED_BIT1 0x02
50 #define STATUS_LED_STATE1 STATUS_LED_ON 50 #define STATUS_LED_STATE1 STATUS_LED_ON
51 #define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) 51 #define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2)
52 #define STATUS_LED_BOOT STATUS_LED_BIT 52 #define STATUS_LED_BOOT STATUS_LED_BIT
53 #define STATUS_LED_GREEN STATUS_LED_BIT1 53 #define STATUS_LED_GREEN STATUS_LED_BIT1
54 54
55 /* Enable Multi Bus support for I2C */ 55 /* Enable Multi Bus support for I2C */
56 #define CONFIG_I2C_MULTI_BUS 1 56 #define CONFIG_I2C_MULTI_BUS 1
57 57
58 /* Probe all devices */ 58 /* Probe all devices */
59 #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} 59 #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}}
60 60
61 /* USB */ 61 /* USB */
62 #define CONFIG_MUSB_GADGET 62 #define CONFIG_MUSB_GADGET
63 #define CONFIG_USB_MUSB_OMAP2PLUS 63 #define CONFIG_USB_MUSB_OMAP2PLUS
64 #define CONFIG_MUSB_PIO_ONLY 64 #define CONFIG_MUSB_PIO_ONLY
65 #define CONFIG_USB_GADGET_DUALSPEED 65 #define CONFIG_USB_GADGET_DUALSPEED
66 #define CONFIG_TWL4030_USB 1 66 #define CONFIG_TWL4030_USB 1
67 #define CONFIG_USB_ETHER 67 #define CONFIG_USB_ETHER
68 #define CONFIG_USB_ETHER_RNDIS 68 #define CONFIG_USB_ETHER_RNDIS
69 #define CONFIG_USB_GADGET 69 #define CONFIG_USB_GADGET
70 #define CONFIG_USB_GADGET_VBUS_DRAW 0 70 #define CONFIG_USB_GADGET_VBUS_DRAW 0
71 #define CONFIG_USBDOWNLOAD_GADGET 71 #define CONFIG_USBDOWNLOAD_GADGET
72 #define CONFIG_G_DNL_VENDOR_NUM 0x0451 72 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
73 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 73 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022
74 #define CONFIG_G_DNL_MANUFACTURER "TI" 74 #define CONFIG_G_DNL_MANUFACTURER "TI"
75 #define CONFIG_CMD_FASTBOOT 75 #define CONFIG_CMD_FASTBOOT
76 #define CONFIG_ANDROID_BOOT_IMAGE 76 #define CONFIG_ANDROID_BOOT_IMAGE
77 #define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR 77 #define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
78 #define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000 78 #define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000
79 79
80 /* USB EHCI */ 80 /* USB EHCI */
81 #define CONFIG_CMD_USB 81 #define CONFIG_CMD_USB
82 #define CONFIG_USB_EHCI 82 #define CONFIG_USB_EHCI
83 83
84 #define CONFIG_USB_EHCI_OMAP 84 #define CONFIG_USB_EHCI_OMAP
85 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 85 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147
86 86
87 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 87 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
88 #define CONFIG_USB_HOST_ETHER 88 #define CONFIG_USB_HOST_ETHER
89 #define CONFIG_USB_ETHER_ASIX 89 #define CONFIG_USB_ETHER_ASIX
90 #define CONFIG_USB_ETHER_MCS7830 90 #define CONFIG_USB_ETHER_MCS7830
91 #define CONFIG_USB_ETHER_SMSC95XX 91 #define CONFIG_USB_ETHER_SMSC95XX
92 92
93 /* GPIO banks */ 93 /* GPIO banks */
94 #define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */ 94 #define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */
95 #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ 95 #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */
96 96
97 /* commands to include */ 97 /* commands to include */
98 #include <config_cmd_default.h> 98 #include <config_cmd_default.h>
99 99
100 #define CONFIG_CMD_ASKENV 100 #define CONFIG_CMD_ASKENV
101 101
102 #define CONFIG_CMD_CACHE 102 #define CONFIG_CMD_CACHE
103 103
104 #define MTDIDS_DEFAULT "nand0=nand" 104 #define MTDIDS_DEFAULT "nand0=nand"
105 #define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\ 105 #define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
106 "1920k(u-boot),128k(u-boot-env),"\ 106 "1920k(u-boot),128k(u-boot-env),"\
107 "4m(kernel),-(fs)" 107 "4m(kernel),-(fs)"
108 108
109 #define CONFIG_USB_STORAGE /* USB storage support */ 109 #define CONFIG_USB_STORAGE /* USB storage support */
110 #define CONFIG_CMD_NAND /* NAND support */ 110 #define CONFIG_CMD_NAND /* NAND support */
111 #define CONFIG_CMD_LED /* LED support */ 111 #define CONFIG_CMD_LED /* LED support */
112 #define CONFIG_CMD_SETEXPR /* Evaluate expressions */ 112 #define CONFIG_CMD_SETEXPR /* Evaluate expressions */
113 #define CONFIG_CMD_GPIO /* Enable gpio command */ 113 #define CONFIG_CMD_GPIO /* Enable gpio command */
114 #define CONFIG_CMD_DHCP 114 #define CONFIG_CMD_DHCP
115 115
116 #define CONFIG_VIDEO_OMAP3 /* DSS Support */ 116 #define CONFIG_VIDEO_OMAP3 /* DSS Support */
117 117
118 /* 118 /*
119 * TWL4030 119 * TWL4030
120 */ 120 */
121 #define CONFIG_TWL4030_LED 1 121 #define CONFIG_TWL4030_LED 1
122 122
123 /* 123 /*
124 * Board NAND Info. 124 * Board NAND Info.
125 */ 125 */
126 #define CONFIG_SYS_NAND_QUIET_TEST 1 126 #define CONFIG_SYS_NAND_QUIET_TEST 1
127 #define CONFIG_NAND_OMAP_GPMC 127 #define CONFIG_NAND_OMAP_GPMC
128 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ 128 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
129 /* devices */ 129 /* devices */
130 130
131 #define CONFIG_EXTRA_ENV_SETTINGS \ 131 #define CONFIG_EXTRA_ENV_SETTINGS \
132 "loadaddr=0x80200000\0" \ 132 "loadaddr=0x80200000\0" \
133 "rdaddr=0x81000000\0" \ 133 "rdaddr=0x81000000\0" \
134 "fdt_high=0xffffffff\0" \ 134 "fdt_high=0xffffffff\0" \
135 "fdtaddr=0x80f80000\0" \ 135 "fdtaddr=0x80f80000\0" \
136 "usbtty=cdc_acm\0" \ 136 "usbtty=cdc_acm\0" \
137 "bootfile=uImage\0" \ 137 "bootfile=uImage\0" \
138 "ramdisk=ramdisk.gz\0" \ 138 "ramdisk=ramdisk.gz\0" \
139 "bootdir=/boot\0" \ 139 "bootdir=/boot\0" \
140 "bootpart=0:2\0" \ 140 "bootpart=0:2\0" \
141 "console=ttyO2,115200n8\0" \ 141 "console=ttyO2,115200n8\0" \
142 "mpurate=auto\0" \ 142 "mpurate=auto\0" \
143 "buddy=none\0" \ 143 "buddy=none\0" \
144 "optargs=\0" \ 144 "optargs=\0" \
145 "camera=none\0" \ 145 "camera=none\0" \
146 "vram=12M\0" \ 146 "vram=12M\0" \
147 "dvimode=640x480MR-16@60\0" \ 147 "dvimode=640x480MR-16@60\0" \
148 "defaultdisplay=dvi\0" \ 148 "defaultdisplay=dvi\0" \
149 "mmcdev=0\0" \ 149 "mmcdev=0\0" \
150 "mmcroot=/dev/mmcblk0p2 rw\0" \ 150 "mmcroot=/dev/mmcblk0p2 rw\0" \
151 "mmcrootfstype=ext3 rootwait\0" \ 151 "mmcrootfstype=ext3 rootwait\0" \
152 "nandroot=ubi0:rootfs ubi.mtd=4\0" \ 152 "nandroot=ubi0:rootfs ubi.mtd=4\0" \
153 "nandrootfstype=ubifs\0" \ 153 "nandrootfstype=ubifs\0" \
154 "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \ 154 "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
155 "ramrootfstype=ext2\0" \ 155 "ramrootfstype=ext2\0" \
156 "mmcargs=setenv bootargs console=${console} " \ 156 "mmcargs=setenv bootargs console=${console} " \
157 "${optargs} " \ 157 "${optargs} " \
158 "mpurate=${mpurate} " \ 158 "mpurate=${mpurate} " \
159 "buddy=${buddy} "\ 159 "buddy=${buddy} "\
160 "camera=${camera} "\ 160 "camera=${camera} "\
161 "vram=${vram} " \ 161 "vram=${vram} " \
162 "omapfb.mode=dvi:${dvimode} " \ 162 "omapfb.mode=dvi:${dvimode} " \
163 "omapdss.def_disp=${defaultdisplay} " \ 163 "omapdss.def_disp=${defaultdisplay} " \
164 "root=${mmcroot} " \ 164 "root=${mmcroot} " \
165 "rootfstype=${mmcrootfstype}\0" \ 165 "rootfstype=${mmcrootfstype}\0" \
166 "nandargs=setenv bootargs console=${console} " \ 166 "nandargs=setenv bootargs console=${console} " \
167 "${optargs} " \ 167 "${optargs} " \
168 "mpurate=${mpurate} " \ 168 "mpurate=${mpurate} " \
169 "buddy=${buddy} "\ 169 "buddy=${buddy} "\
170 "camera=${camera} "\ 170 "camera=${camera} "\
171 "vram=${vram} " \ 171 "vram=${vram} " \
172 "omapfb.mode=dvi:${dvimode} " \ 172 "omapfb.mode=dvi:${dvimode} " \
173 "omapdss.def_disp=${defaultdisplay} " \ 173 "omapdss.def_disp=${defaultdisplay} " \
174 "root=${nandroot} " \ 174 "root=${nandroot} " \
175 "rootfstype=${nandrootfstype}\0" \ 175 "rootfstype=${nandrootfstype}\0" \
176 "findfdt=" \ 176 "findfdt=" \
177 "if test $beaglerev = AxBx; then " \ 177 "if test $beaglerev = AxBx; then " \
178 "setenv fdtfile omap3-beagle.dtb; fi; " \ 178 "setenv fdtfile omap3-beagle.dtb; fi; " \
179 "if test $beaglerev = Cx; then " \ 179 "if test $beaglerev = Cx; then " \
180 "setenv fdtfile omap3-beagle.dtb; fi; " \ 180 "setenv fdtfile omap3-beagle.dtb; fi; " \
181 "if test $beaglerev = C4; then " \ 181 "if test $beaglerev = C4; then " \
182 "setenv fdtfile omap3-beagle.dtb; fi; " \ 182 "setenv fdtfile omap3-beagle.dtb; fi; " \
183 "if test $beaglerev = xMAB; then " \ 183 "if test $beaglerev = xMAB; then " \
184 "setenv fdtfile omap3-beagle-xm-ab.dtb; fi; " \ 184 "setenv fdtfile omap3-beagle-xm-ab.dtb; fi; " \
185 "if test $beaglerev = xMC; then " \ 185 "if test $beaglerev = xMC; then " \
186 "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ 186 "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
187 "if test $fdtfile = undefined; then " \ 187 "if test $fdtfile = undefined; then " \
188 "echo WARNING: Could not determine device tree to use; fi; \0" \ 188 "echo WARNING: Could not determine device tree to use; fi; \0" \
189 "validatefdt=" \ 189 "validatefdt=" \
190 "if test $beaglerev = xMAB; then " \ 190 "if test $beaglerev = xMAB; then " \
191 "if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \ 191 "if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \
192 "setenv fdtfile omap3-beagle-xm.dtb; " \ 192 "setenv fdtfile omap3-beagle-xm.dtb; " \
193 "fi; " \ 193 "fi; " \
194 "fi; \0" \ 194 "fi; \0" \
195 "bootenv=uEnv.txt\0" \ 195 "bootenv=uEnv.txt\0" \
196 "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ 196 "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
197 "importbootenv=echo Importing environment from mmc ...; " \ 197 "importbootenv=echo Importing environment from mmc ...; " \
198 "env import -t $loadaddr $filesize\0" \ 198 "env import -t -r $loadaddr $filesize\0" \
199 "ramargs=setenv bootargs console=${console} " \ 199 "ramargs=setenv bootargs console=${console} " \
200 "${optargs} " \ 200 "${optargs} " \
201 "mpurate=${mpurate} " \ 201 "mpurate=${mpurate} " \
202 "buddy=${buddy} "\ 202 "buddy=${buddy} "\
203 "vram=${vram} " \ 203 "vram=${vram} " \
204 "omapfb.mode=dvi:${dvimode} " \ 204 "omapfb.mode=dvi:${dvimode} " \
205 "omapdss.def_disp=${defaultdisplay} " \ 205 "omapdss.def_disp=${defaultdisplay} " \
206 "root=${ramroot} " \ 206 "root=${ramroot} " \
207 "rootfstype=${ramrootfstype}\0" \ 207 "rootfstype=${ramrootfstype}\0" \
208 "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ 208 "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
209 "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ 209 "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
210 "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ 210 "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
211 "mmcboot=echo Booting from mmc ...; " \ 211 "mmcboot=echo Booting from mmc ...; " \
212 "run mmcargs; " \ 212 "run mmcargs; " \
213 "bootm ${loadaddr}\0" \ 213 "bootm ${loadaddr}\0" \
214 "mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \ 214 "mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \
215 "run mmcargs; " \ 215 "run mmcargs; " \
216 "bootz ${loadaddr} - ${fdtaddr}\0" \ 216 "bootz ${loadaddr} - ${fdtaddr}\0" \
217 "nandboot=echo Booting from nand ...; " \ 217 "nandboot=echo Booting from nand ...; " \
218 "run nandargs; " \ 218 "run nandargs; " \
219 "nand read ${loadaddr} 280000 400000; " \ 219 "nand read ${loadaddr} 280000 400000; " \
220 "bootm ${loadaddr}\0" \ 220 "bootm ${loadaddr}\0" \
221 "ramboot=echo Booting from ramdisk ...; " \ 221 "ramboot=echo Booting from ramdisk ...; " \
222 "run ramargs; " \ 222 "run ramargs; " \
223 "bootm ${loadaddr}\0" \ 223 "bootm ${loadaddr}\0" \
224 "userbutton=if gpio input 173; then run userbutton_xm; " \ 224 "userbutton=if gpio input 173; then run userbutton_xm; " \
225 "else run userbutton_nonxm; fi;\0" \ 225 "else run userbutton_nonxm; fi;\0" \
226 "userbutton_xm=gpio input 4;\0" \ 226 "userbutton_xm=gpio input 4;\0" \
227 "userbutton_nonxm=gpio input 7;\0" 227 "userbutton_nonxm=gpio input 7;\0"
228 /* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */ 228 /* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */
229 #define CONFIG_BOOTCOMMAND \ 229 #define CONFIG_BOOTCOMMAND \
230 "run findfdt; " \ 230 "run findfdt; " \
231 "mmc dev ${mmcdev}; if mmc rescan; then " \ 231 "mmc dev ${mmcdev}; if mmc rescan; then " \
232 "if run userbutton; then " \ 232 "if run userbutton; then " \
233 "setenv bootenv uEnv.txt;" \ 233 "setenv bootenv uEnv.txt;" \
234 "else " \ 234 "else " \
235 "setenv bootenv user.txt;" \ 235 "setenv bootenv user.txt;" \
236 "fi;" \ 236 "fi;" \
237 "echo SD/MMC found on device ${mmcdev};" \ 237 "echo SD/MMC found on device ${mmcdev};" \
238 "if run loadbootenv; then " \ 238 "if run loadbootenv; then " \
239 "echo Loaded environment from ${bootenv};" \ 239 "echo Loaded environment from ${bootenv};" \
240 "run importbootenv;" \ 240 "run importbootenv;" \
241 "fi;" \ 241 "fi;" \
242 "if test -n $uenvcmd; then " \ 242 "if test -n $uenvcmd; then " \
243 "echo Running uenvcmd ...;" \ 243 "echo Running uenvcmd ...;" \
244 "run uenvcmd;" \ 244 "run uenvcmd;" \
245 "fi;" \ 245 "fi;" \
246 "if run loadimage; then " \ 246 "if run loadimage; then " \
247 "run mmcboot;" \ 247 "run mmcboot;" \
248 "fi;" \ 248 "fi;" \
249 "fi;" \ 249 "fi;" \
250 "run nandboot;" \ 250 "run nandboot;" \
251 "setenv bootfile zImage;" \ 251 "setenv bootfile zImage;" \
252 "if run loadimage; then " \ 252 "if run loadimage; then " \
253 "run loadfdt;" \ 253 "run loadfdt;" \
254 "run mmcbootz; " \ 254 "run mmcbootz; " \
255 "fi; " \ 255 "fi; " \
256 256
257 /* 257 /*
258 * OMAP3 has 12 GP timers, they can be driven by the system clock 258 * OMAP3 has 12 GP timers, they can be driven by the system clock
259 * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). 259 * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
260 * This rate is divided by a local divisor. 260 * This rate is divided by a local divisor.
261 */ 261 */
262 #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ 262 #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
263 263
264 /*----------------------------------------------------------------------- 264 /*-----------------------------------------------------------------------
265 * FLASH and environment organization 265 * FLASH and environment organization
266 */ 266 */
267 267
268 /* **** PISMO SUPPORT *** */ 268 /* **** PISMO SUPPORT *** */
269 269
270 /* Configure the PISMO */ 270 /* Configure the PISMO */
271 #define PISMO1_NAND_SIZE GPMC_SIZE_128M 271 #define PISMO1_NAND_SIZE GPMC_SIZE_128M
272 #define PISMO1_ONEN_SIZE GPMC_SIZE_128M 272 #define PISMO1_ONEN_SIZE GPMC_SIZE_128M
273 273
274 #if defined(CONFIG_CMD_NAND) 274 #if defined(CONFIG_CMD_NAND)
275 #define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE 275 #define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
276 #endif 276 #endif
277 277
278 /* Monitor at start of flash */ 278 /* Monitor at start of flash */
279 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE 279 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
280 #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP 280 #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
281 281
282 #define CONFIG_ENV_IS_IN_NAND 1 282 #define CONFIG_ENV_IS_IN_NAND 1
283 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ 283 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
284 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ 284 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
285 #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ 285 #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
286 286
287 #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ 287 #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
288 #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET 288 #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
289 #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET 289 #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
290 290
291 #define CONFIG_OMAP3_SPI 291 #define CONFIG_OMAP3_SPI
292 292
293 #define CONFIG_SYS_CACHELINE_SIZE 64 293 #define CONFIG_SYS_CACHELINE_SIZE 64
294 294
295 /* Defines for SPL */ 295 /* Defines for SPL */
296 #define CONFIG_SPL_OMAP3_ID_NAND 296 #define CONFIG_SPL_OMAP3_ID_NAND
297 297
298 /* NAND boot config */ 298 /* NAND boot config */
299 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 299 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16
300 #define CONFIG_SYS_NAND_5_ADDR_CYCLE 300 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
301 #define CONFIG_SYS_NAND_PAGE_COUNT 64 301 #define CONFIG_SYS_NAND_PAGE_COUNT 64
302 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 302 #define CONFIG_SYS_NAND_PAGE_SIZE 2048
303 #define CONFIG_SYS_NAND_OOBSIZE 64 303 #define CONFIG_SYS_NAND_OOBSIZE 64
304 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) 304 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
305 #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 305 #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
306 #define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\ 306 #define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\
307 10, 11, 12, 13} 307 10, 11, 12, 13}
308 #define CONFIG_SYS_NAND_ECCSIZE 512 308 #define CONFIG_SYS_NAND_ECCSIZE 512
309 #define CONFIG_SYS_NAND_ECCBYTES 3 309 #define CONFIG_SYS_NAND_ECCBYTES 3
310 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW 310 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW
311 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 311 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
312 312
313 #endif /* __CONFIG_H */ 313 #endif /* __CONFIG_H */
314 314