Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 574fa1f02e195c892c4f2255480d925491f0de45

Authored by Aneesh V
Committed by Albert ARIBAUD
1 parent 56ccd36fa1
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, 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, v2017.01-smarct4x

omap1610inn: fix build breaks 

Provide SDRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

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

include/configs/omap1610inn.h
Diff comments   View file @ 574fa1f
1 /* 1 /*
2 * (C) Copyright 2003 2 * (C) Copyright 2003
3 * Texas Instruments. 3 * Texas Instruments.
4 * Kshitij Gupta <kshitij@ti.com> 4 * Kshitij Gupta <kshitij@ti.com>
5 * Configuation settings for the TI OMAP Innovator board. 5 * Configuation settings for the TI OMAP Innovator board.
6 * 6 *
7 * See file CREDITS for list of people who contributed to this 7 * See file CREDITS for list of people who contributed to this
8 * project. 8 * project.
9 * 9 *
10 * This program is free software; you can redistribute it and/or 10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as 11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of 12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version. 13 * the License, or (at your option) any later version.
14 * 14 *
15 * This program is distributed in the hope that it will be useful, 15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details. 18 * GNU General Public License for more details.
19 * 19 *
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
23 * MA 02111-1307 USA 23 * MA 02111-1307 USA
24 */ 24 */
25 25
26 #ifndef __CONFIG_H 26 #ifndef __CONFIG_H
27 #define __CONFIG_H 27 #define __CONFIG_H
28 28
29 /* 29 /*
30 * High Level Configuration Options 30 * High Level Configuration Options
31 * (easy to change) 31 * (easy to change)
32 */ 32 */
33 #define CONFIG_ARM926EJS 1 /* This is an arm926ejs CPU core */ 33 #define CONFIG_ARM926EJS 1 /* This is an arm926ejs CPU core */
34 #define CONFIG_OMAP 1 /* in a TI OMAP core */ 34 #define CONFIG_OMAP 1 /* in a TI OMAP core */
35 #define CONFIG_OMAP1610 1 /* which is in a 1610 */ 35 #define CONFIG_OMAP1610 1 /* which is in a 1610 */
36 #define CONFIG_INNOVATOROMAP1610 1 /* a Innovator Board */ 36 #define CONFIG_INNOVATOROMAP1610 1 /* a Innovator Board */
37 #define CONFIG_MACH_OMAP_INNOVATOR /* Select board mach-type */ 37 #define CONFIG_MACH_OMAP_INNOVATOR /* Select board mach-type */
38 38
39 /* input clock of PLL */ 39 /* input clock of PLL */
40 /* the OMAP1610 Innovator has 12MHz input clock */ 40 /* the OMAP1610 Innovator has 12MHz input clock */
41 #define CONFIG_SYS_CLK_FREQ 12000000 41 #define CONFIG_SYS_CLK_FREQ 12000000
42 42
43 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ 43 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
44 44
45 #define CONFIG_MISC_INIT_R 45 #define CONFIG_MISC_INIT_R
46 46
47 #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ 47 #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
48 #define CONFIG_SETUP_MEMORY_TAGS 1 48 #define CONFIG_SETUP_MEMORY_TAGS 1
49 49
50 /* 50 /*
51 * Size of malloc() pool 51 * Size of malloc() pool
52 */ 52 */
53 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) 53 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
54 54
55 /* 55 /*
56 * Hardware drivers 56 * Hardware drivers
57 */ 57 */
58 /* 58 /*
59 */ 59 */
60 #define CONFIG_NET_MULTI 60 #define CONFIG_NET_MULTI
61 #define CONFIG_LAN91C96 61 #define CONFIG_LAN91C96
62 #define CONFIG_LAN91C96_BASE 0x04000300 62 #define CONFIG_LAN91C96_BASE 0x04000300
63 #define CONFIG_LAN91C96_EXT_PHY 63 #define CONFIG_LAN91C96_EXT_PHY
64 64
65 /* 65 /*
66 * NS16550 Configuration 66 * NS16550 Configuration
67 */ 67 */
68 #define CONFIG_SYS_NS16550 68 #define CONFIG_SYS_NS16550
69 #define CONFIG_SYS_NS16550_SERIAL 69 #define CONFIG_SYS_NS16550_SERIAL
70 #define CONFIG_SYS_NS16550_REG_SIZE (-4) 70 #define CONFIG_SYS_NS16550_REG_SIZE (-4)
71 #define CONFIG_SYS_NS16550_CLK (48000000) /* can be 12M/32Khz or 48Mhz */ 71 #define CONFIG_SYS_NS16550_CLK (48000000) /* can be 12M/32Khz or 48Mhz */
72 #define CONFIG_SYS_NS16550_COM1 0xfffb0000 /* uart1, bluetooth uart on helen */ 72 #define CONFIG_SYS_NS16550_COM1 0xfffb0000 /* uart1, bluetooth uart on helen */
73 73
74 /* 74 /*
75 * select serial console configuration 75 * select serial console configuration
76 */ 76 */
77 #define CONFIG_SERIAL1 1 /* we use SERIAL 1 on OMAP1610 Innovator */ 77 #define CONFIG_SERIAL1 1 /* we use SERIAL 1 on OMAP1610 Innovator */
78 78
79 /* allow to overwrite serial and ethaddr */ 79 /* allow to overwrite serial and ethaddr */
80 #define CONFIG_ENV_OVERWRITE 80 #define CONFIG_ENV_OVERWRITE
81 #define CONFIG_CONS_INDEX 1 81 #define CONFIG_CONS_INDEX 1
82 #define CONFIG_BAUDRATE 115200 82 #define CONFIG_BAUDRATE 115200
83 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } 83 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
84 84
85 85
86 /* 86 /*
87 * Command line configuration. 87 * Command line configuration.
88 */ 88 */
89 #include <config_cmd_default.h> 89 #include <config_cmd_default.h>
90 90
91 #define CONFIG_CMD_DHCP 91 #define CONFIG_CMD_DHCP
92 92
93 93
94 /* 94 /*
95 * BOOTP options 95 * BOOTP options
96 */ 96 */
97 #define CONFIG_BOOTP_SUBNETMASK 97 #define CONFIG_BOOTP_SUBNETMASK
98 #define CONFIG_BOOTP_GATEWAY 98 #define CONFIG_BOOTP_GATEWAY
99 #define CONFIG_BOOTP_HOSTNAME 99 #define CONFIG_BOOTP_HOSTNAME
100 #define CONFIG_BOOTP_BOOTPATH 100 #define CONFIG_BOOTP_BOOTPATH
101 101
102 102
103 #include <configs/omap1510.h> 103 #include <configs/omap1510.h>
104 104
105 #define CONFIG_BOOTDELAY 3 105 #define CONFIG_BOOTDELAY 3
106 #define CONFIG_BOOTARGS "mem=32M console=ttyS0,115200n8 noinitrd \ 106 #define CONFIG_BOOTARGS "mem=32M console=ttyS0,115200n8 noinitrd \
107 root=/dev/nfs rw nfsroot=157.87.82.48:\ 107 root=/dev/nfs rw nfsroot=157.87.82.48:\
108 /home/a0875451/mwd/myfs/target ip=dhcp" 108 /home/a0875451/mwd/myfs/target ip=dhcp"
109 #define CONFIG_NETMASK 255.255.254.0 /* talk on MY local net */ 109 #define CONFIG_NETMASK 255.255.254.0 /* talk on MY local net */
110 #define CONFIG_IPADDR 156.117.97.156 /* static IP I currently own */ 110 #define CONFIG_IPADDR 156.117.97.156 /* static IP I currently own */
111 #define CONFIG_SERVERIP 156.117.97.139 /* current IP of my dev pc */ 111 #define CONFIG_SERVERIP 156.117.97.139 /* current IP of my dev pc */
112 #define CONFIG_BOOTFILE "uImage" /* file to load */ 112 #define CONFIG_BOOTFILE "uImage" /* file to load */
113 113
114 #if defined(CONFIG_CMD_KGDB) 114 #if defined(CONFIG_CMD_KGDB)
115 #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ 115 #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
116 #define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ 116 #define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */
117 #endif 117 #endif
118 118
119 /* 119 /*
120 * Miscellaneous configurable options 120 * Miscellaneous configurable options
121 */ 121 */
122 #define CONFIG_SYS_LONGHELP /* undef to save memory */ 122 #define CONFIG_SYS_LONGHELP /* undef to save memory */
123 #define CONFIG_SYS_PROMPT "OMAP1610 Innovator # " /* Monitor Command Prompt */ 123 #define CONFIG_SYS_PROMPT "OMAP1610 Innovator # " /* Monitor Command Prompt */
124 #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ 124 #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
125 /* Print Buffer Size */ 125 /* Print Buffer Size */
126 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) 126 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
127 #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ 127 #define CONFIG_SYS_MAXARGS 16 /* max number of command args */
128 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ 128 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
129 129
130 #define CONFIG_SYS_MEMTEST_START 0x10000000 /* memtest works on */ 130 #define CONFIG_SYS_MEMTEST_START 0x10000000 /* memtest works on */
131 #define CONFIG_SYS_MEMTEST_END 0x12000000 /* 32 MB in DRAM */ 131 #define CONFIG_SYS_MEMTEST_END 0x12000000 /* 32 MB in DRAM */
132 132
133 #define CONFIG_SYS_LOAD_ADDR 0x10000000 /* default load address */ 133 #define CONFIG_SYS_LOAD_ADDR 0x10000000 /* default load address */
134 134
135 /* The 1610 has 6 timers, they can be driven by the RefClk (12Mhz) or by 135 /* The 1610 has 6 timers, they can be driven by the RefClk (12Mhz) or by
136 * DPLL1. This time is further subdivided by a local divisor. 136 * DPLL1. This time is further subdivided by a local divisor.
137 */ 137 */
138 #define CONFIG_SYS_TIMERBASE 0xFFFEC500 /* use timer 1 */ 138 #define CONFIG_SYS_TIMERBASE 0xFFFEC500 /* use timer 1 */
139 #define CONFIG_SYS_PTV 7 /* 2^(PTV+1), divide by 256 */ 139 #define CONFIG_SYS_PTV 7 /* 2^(PTV+1), divide by 256 */
140 #define CONFIG_SYS_HZ ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV)) 140 #define CONFIG_SYS_HZ ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
141 141
142 /*----------------------------------------------------------------------- 142 /*-----------------------------------------------------------------------
143 * Stack sizes 143 * Stack sizes
144 * 144 *
145 * The stack sizes are set up in start.S using the settings below 145 * The stack sizes are set up in start.S using the settings below
146 */ 146 */
147 #define CONFIG_STACKSIZE (128*1024) /* regular stack */ 147 #define CONFIG_STACKSIZE (128*1024) /* regular stack */
148 #ifdef CONFIG_USE_IRQ 148 #ifdef CONFIG_USE_IRQ
149 #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ 149 #define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
150 #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ 150 #define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
151 #endif 151 #endif
152 152
153 /*----------------------------------------------------------------------- 153 /*-----------------------------------------------------------------------
154 * Physical Memory Map 154 * Physical Memory Map
155 */ 155 */
156 #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ 156 #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
157 #define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ 157 #define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */
158 #define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ 158 #define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */
159 159
160 #define PHYS_FLASH_1_BM1 0x00000000 /* Flash Bank #1 if booting from flash */ 160 #define PHYS_FLASH_1_BM1 0x00000000 /* Flash Bank #1 if booting from flash */
161 #define PHYS_FLASH_1_BM0 0x0C000000 /* Flash Bank #1 if booting from RAM */ 161 #define PHYS_FLASH_1_BM0 0x0C000000 /* Flash Bank #1 if booting from RAM */
162 162
163 #ifdef CONFIG_CS_AUTOBOOT /* Determine CS assignment in runtime */ 163 #ifdef CONFIG_CS_AUTOBOOT /* Determine CS assignment in runtime */
164 164
165 #ifndef __ASSEMBLY__ 165 #ifndef __ASSEMBLY__
166 extern unsigned long omap_flash_base; /* set in flash__init */ 166 extern unsigned long omap_flash_base; /* set in flash__init */
167 #endif 167 #endif
168 #define CONFIG_SYS_FLASH_BASE omap_flash_base 168 #define CONFIG_SYS_FLASH_BASE omap_flash_base
169 169
170 #elif defined(CONFIG_CS0_BOOT) 170 #elif defined(CONFIG_CS0_BOOT)
171 171
172 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1_BM0 172 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1_BM0
173 173
174 #else 174 #else
175 175
176 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1_BM1 176 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1_BM1
177 177
178 #endif 178 #endif
179 179
180 #define PHYS_SRAM 0x20000000
181
180 /*----------------------------------------------------------------------- 182 /*-----------------------------------------------------------------------
181 * FLASH and environment organization 183 * FLASH and environment organization
182 */ 184 */
183 #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ 185 #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
184 #define PHYS_FLASH_SIZE 0x02000000 /* 32MB */ 186 #define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
185 #define CONFIG_SYS_MAX_FLASH_SECT (259) /* max number of sectors on one chip */ 187 #define CONFIG_SYS_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
186 /* addr of environment */ 188 /* addr of environment */
187 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x020000) 189 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x020000)
188 190
189 /* timeout values are in ticks */ 191 /* timeout values are in ticks */
190 #define CONFIG_SYS_FLASH_ERASE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ 192 #define CONFIG_SYS_FLASH_ERASE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
191 #define CONFIG_SYS_FLASH_WRITE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Write */ 193 #define CONFIG_SYS_FLASH_WRITE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Write */
192 194
193 #define CONFIG_ENV_IS_IN_FLASH 1 195 #define CONFIG_ENV_IS_IN_FLASH 1
194 #define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ 196 #define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
195 #define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */ 197 #define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */
198
199 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
200 #define CONFIG_SYS_INIT_SP_ADDR PHYS_SRAM
196 201
197 #endif /* __CONFIG_H */ 202 #endif /* __CONFIG_H */
198 203