Eric Lee / smarc-uboot

Download as
Browse Code »

Commit e139cb31d32a4f39241bfd83bf622a97d08f6c9d

Authored by Alexandre Belloni
Committed by Albert ARIBAUD
1 parent 2b3b1c668b
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

AT91SAM9*: Change kernel address in dataflash to match u-boot's size 

On at91sam platforms, u-boot grew larger than the allocated size in
dataflash, the layout was:
bootstrap  0x00000000
ubootenv   0x00004200
uboot      0x00008400
kernel     0x00042000
fs         0x00252000

u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
0x39C00 bytes anymore.

Now, the layout is:
bootstrap  0x00000000
ubootenv   0x00004200
uboot      0x00008400
kernel     0x00084000
fs         0x00294000

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>

Showing 8 changed files with 21 additions and 18 deletions Side-by-side Diff

board/atmel/at91sam9260ek/partition.c
Diff comments   View file @ e139cb3
... ... @@ -34,8 +34,8 @@
34 34 dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
35 35 {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
36 36 {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
37   - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
38   - {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
39   - {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
  37 + {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
  38 + {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
  39 + {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
40 40 };
board/atmel/at91sam9261ek/partition.c
Diff comments   View file @ e139cb3
... ... @@ -34,8 +34,8 @@
34 34 dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
35 35 {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
36 36 {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
37   - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
38   - {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
39   - {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
  37 + {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
  38 + {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
  39 + {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
40 40 };
board/atmel/at91sam9263ek/partition.c
Diff comments   View file @ e139cb3
... ... @@ -33,8 +33,8 @@
33 33 dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
34 34 {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
35 35 {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
36   - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
37   - {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
38   - {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
  36 + {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
  37 + {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
  38 + {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
39 39 };
board/atmel/at91sam9rlek/partition.c
Diff comments   View file @ e139cb3
... ... @@ -33,8 +33,8 @@
33 33 dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
34 34 {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
35 35 {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
36   - {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
37   - {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
38   - {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
  36 + {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
  37 + {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
  38 + {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
39 39 };
include/configs/at91sam9260ek.h
Diff comments   View file @ e139cb3
... ... @@ -187,7 +187,7 @@
187 187 #define CONFIG_ENV_OFFSET 0x4200
188 188 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
189 189 #define CONFIG_ENV_SIZE 0x4200
190   -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
  190 +#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
191 191 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
192 192 "root=/dev/mtdblock0 " \
193 193 "mtdparts=atmel_nand:-(root) " \
... ... @@ -201,7 +201,7 @@
201 201 #define CONFIG_ENV_OFFSET 0x4200
202 202 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
203 203 #define CONFIG_ENV_SIZE 0x4200
204   -#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
  204 +#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm"
205 205 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
206 206 "root=/dev/mtdblock0 " \
207 207 "mtdparts=atmel_nand:-(root) " \
... ... @@ -230,6 +230,7 @@
230 230 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
231 231 #define CONFIG_SYS_LONGHELP 1
232 232 #define CONFIG_CMDLINE_EDITING 1
  233 +#define CONFIG_AUTO_COMPLETE
233 234  
234 235 /*
235 236 * Size of malloc() pool
include/configs/at91sam9261ek.h
Diff comments   View file @ e139cb3
... ... @@ -189,7 +189,7 @@
189 189 #define CONFIG_ENV_OFFSET 0x4200
190 190 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
191 191 #define CONFIG_ENV_SIZE 0x4200
192   -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
  192 +#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
193 193 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
194 194 "root=/dev/mtdblock0 " \
195 195 "mtdparts=atmel_nand:-(root) " \
... ... @@ -203,7 +203,7 @@
203 203 #define CONFIG_ENV_OFFSET 0x4200
204 204 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
205 205 #define CONFIG_ENV_SIZE 0x4200
206   -#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
  206 +#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm"
207 207 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
208 208 "root=/dev/mtdblock0 " \
209 209 "mtdparts=atmel_nand:-(root) " \
... ... @@ -232,6 +232,7 @@
232 232 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
233 233 #define CONFIG_SYS_LONGHELP
234 234 #define CONFIG_CMDLINE_EDITING
  235 +#define CONFIG_AUTO_COMPLETE
235 236  
236 237 /*
237 238 * Size of malloc() pool
include/configs/at91sam9263ek.h
Diff comments   View file @ e139cb3
... ... @@ -318,7 +318,7 @@
318 318 #define CONFIG_ENV_OFFSET 0x4200
319 319 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
320 320 #define CONFIG_ENV_SIZE 0x4200
321   -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
  321 +#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
322 322 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
323 323 "root=/dev/mtdblock0 " \
324 324 "mtdparts=atmel_nand:-(root) "\
include/configs/at91sam9rlek.h
Diff comments   View file @ e139cb3
... ... @@ -155,7 +155,7 @@
155 155 #define CONFIG_ENV_OFFSET 0x4200
156 156 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
157 157 #define CONFIG_ENV_SIZE 0x4200
158   -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
  158 +#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
159 159 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
160 160 "root=/dev/mtdblock0 " \
161 161 "mtdparts=atmel_nand:-(root) "\
... ... @@ -182,6 +182,7 @@
182 182 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
183 183 #define CONFIG_SYS_LONGHELP 1
184 184 #define CONFIG_CMDLINE_EDITING 1
  185 +#define CONFIG_AUTO_COMPLETE
185 186  
186 187 /*
187 188 * Size of malloc() pool