Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 63865278dae47ad19527d9f9b6e0dad6cb01f401

Authored by Kevin Hao
Committed by York Sun
1 parent 16c8c1709d
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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-n7.1.2_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

mpc83xx: make it bootable with the latest kernel 

Due to the blow up of the latest kernel size, the default gnuzip
size (8M) seems too small. The yocto kernel size I built for
mpc8315erdb board is 5294393, and it can't be boot by using the
latest u-boot. So expand gnuzip buffer for all the mpc83xx boards
to fix this issue.

Robert P. J. Day also pointed that the kernel partition on the NAND
flash is also too small, fix it at the same time.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Reviewed-by: York Sun <york.sun@nxp.com>

Showing 9 changed files with 11 additions and 2 deletions Side-by-side Diff

include/configs/MPC8308RDB.h
Diff comments   View file @ 6386527
... ... @@ -452,6 +452,7 @@
452 452 * the maximum mapped by the Linux kernel during initialization.
453 453 */
454 454 #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Initial Memory map for Linux */
  455 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
455 456  
456 457 /*
457 458 * Core HID Setup
include/configs/MPC8313ERDB.h
Diff comments   View file @ 6386527
... ... @@ -268,7 +268,7 @@
268 268 #define CONFIG_CMD_MTDPARTS
269 269 #define MTDIDS_DEFAULT "nand0=e2800000.flash"
270 270 #define MTDPARTS_DEFAULT \
271   - "mtdparts=e2800000.flash:512k(uboot),128k(env),3m@1m(kernel),-(fs)"
  271 + "mtdparts=e2800000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
272 272  
273 273 #define CONFIG_SYS_MAX_NAND_DEVICE 1
274 274 #define CONFIG_CMD_NAND 1
... ... @@ -502,6 +502,7 @@
502 502 */
503 503 /* Initial Memory map for Linux*/
504 504 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)
  505 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
505 506  
506 507 #define CONFIG_SYS_RCWH_PCIHOST 0x80000000 /* PCIHOST */
507 508  
include/configs/MPC8315ERDB.h
Diff comments   View file @ 6386527
... ... @@ -241,7 +241,7 @@
241 241 #define CONFIG_CMD_MTDPARTS
242 242 #define MTDIDS_DEFAULT "nand0=e0600000.flash"
243 243 #define MTDPARTS_DEFAULT \
244   - "mtdparts=e0600000.flash:512k(uboot),128k(env),3m@1m(kernel),-(fs)"
  244 + "mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
245 245  
246 246 #define CONFIG_SYS_MAX_NAND_DEVICE 1
247 247 #define CONFIG_CMD_NAND 1
... ... @@ -489,6 +489,7 @@
489 489 * the maximum mapped by the Linux kernel during initialization.
490 490 */
491 491 #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Initial Memory map for Linux */
  492 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
492 493  
493 494 /*
494 495 * Core HID Setup
include/configs/MPC8323ERDB.h
Diff comments   View file @ 6386527
... ... @@ -359,6 +359,7 @@
359 359 */
360 360 /* Initial Memory map for Linux */
361 361 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)
  362 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
362 363  
363 364 /*
364 365 * Core HID Setup
include/configs/MPC832XEMDS.h
Diff comments   View file @ 6386527
... ... @@ -441,6 +441,7 @@
441 441 */
442 442 /* Initial Memory map for Linux */
443 443 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)
  444 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
444 445  
445 446 /*
446 447 * Core HID Setup
include/configs/MPC8349EMDS.h
Diff comments   View file @ 6386527
... ... @@ -508,6 +508,7 @@
508 508 */
509 509 /* Initial Memory map for Linux*/
510 510 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)
  511 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
511 512  
512 513 #define CONFIG_SYS_RCWH_PCIHOST 0x80000000 /* PCIHOST */
513 514  
include/configs/MPC8349ITX.h
Diff comments   View file @ 6386527
... ... @@ -544,6 +544,7 @@
544 544 */
545 545 /* Initial Memory map for Linux*/
546 546 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)
  547 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
547 548  
548 549 #define CONFIG_SYS_HRCW_LOW (\
549 550 HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\
include/configs/MPC837XEMDS.h
Diff comments   View file @ 6386527
... ... @@ -522,6 +522,7 @@
522 522 * the maximum mapped by the Linux kernel during initialization.
523 523 */
524 524 #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Initial Memory map for Linux */
  525 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
525 526  
526 527 /*
527 528 * Core HID Setup
include/configs/MPC837XERDB.h
Diff comments   View file @ 6386527
... ... @@ -533,6 +533,7 @@
533 533 * the maximum mapped by the Linux kernel during initialization.
534 534 */
535 535 #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Initial Memory map for Linux */
  536 +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
536 537  
537 538 /*
538 539 * Core HID Setup