Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit aa159e681ec22a19ee4dd68ad4ec08b748e14d10

Authored by Tom Rini
2 parents 6e7b7df4df 76a1e584e1
Exists in v2017.01-smarct4x and in 38 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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

Merge http://git.denx.de/u-boot-dm

Showing 3 changed files Side-by-side Diff

... ... @@ -3752,6 +3752,9 @@
3752 3752 Pre-relocation malloc() is only supported on sandbox
3753 3753 at present but is fairly easy to enable for other archs.
3754 3754  
  3755 + Pre-relocation malloc() is only supported on ARM at present
  3756 + but is fairly easy to enable for other archs.
  3757 +
3755 3758 - CONFIG_SYS_BOOTM_LEN:
3756 3759 Normally compressed uImages are limited to an
3757 3760 uncompressed size of 8 MBytes. If this is not enough,
arch/arm/include/asm/config.h
Diff comments   View file @ aa159e6
... ... @@ -7,7 +7,9 @@
7 7 #ifndef _ASM_CONFIG_H_
8 8 #define _ASM_CONFIG_H_
9 9  
  10 +#ifdef __aarch64__
10 11 #define CONFIG_SYS_GENERIC_GLOBAL_DATA
  12 +#endif
11 13  
12 14 #define CONFIG_LMB
13 15 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
... ... @@ -67,10 +67,22 @@
67 67 ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
68 68 #endif
69 69 bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
  70 + mov r2, sp
70 71 sub sp, sp, #GD_SIZE /* allocate one GD above SP */
71 72 bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
72 73 mov r9, sp /* GD is above SP */
  74 + mov r1, sp
73 75 mov r0, #0
  76 +clr_gd:
  77 + cmp r1, r2 /* while not at end of GD */
  78 + strlo r0, [r1] /* clear 32-bit GD word */
  79 + addlo r1, r1, #4 /* move to next */
  80 + blo clr_gd
  81 +#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_BUILD)
  82 + sub sp, sp, #CONFIG_SYS_MALLOC_F_LEN
  83 + str sp, [r9, #GD_MALLOC_BASE]
  84 +#endif
  85 + /* mov r0, #0 not needed due to above code */
74 86 bl board_init_f
75 87  
76 88 #if ! defined(CONFIG_SPL_BUILD)